gentoo resync 31.01.2019

4696 files changed, 37029 insertions, 37446 deletions

diff --git a/Manifest b/Manifest
index cfb5446d6ce4..cf0f2cafc330 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28855 BLAKE2B 3ae6a2c6bbdbf1e3237e37130f9a7ace01366a6ddc78c2b166bf1cb96b047db3dce77fd867e4fe6577106981816850e365a85cff39295f1ded224214c204af5f SHA512 eaf5b620b0925ee65b84b91df8c62808b25285752a3f0b53fc914d225514029af26819758e2bad7c964b195444d31dc8d2ca5713e81f0e4bdd2e41497e4ec5ba
-TIMESTAMP 2019-01-25T07:08:48Z
+MANIFEST Manifest.files.gz 28845 BLAKE2B 661b92f44ad0c6c6b7ad06ba5cdf2928670a3b8384f9425f7c12f37417cfc065ba8e8f3e982f3feeac6b84222344c81898baf4237121bb7d8e70ef3be3ece623 SHA512 e2539fe7df90c7ff4e74229d7dae70014f715da0d149a7ea76d314f42e9f0a2db017dfc06f134639ecae56051c8794f1037d5211b55ce7684c08aca0591a7982
+TIMESTAMP 2019-01-31T15:08:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxKtgBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxTD3pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBOnQ/+NhBzTr8KOApBD74hKAfFOLibxxI3LXKgQaIVy2Sy4kgG/V+hOprvJoJg
-kNpgERp+bPRMGietEO1rwtnM8pPnJKS8AB7Giwk7YaZeok9ByF4cJGyKgy7yUyH5
-EboeBccGSBq/M8DT0Oao2pdvxBOyk2VkYgkLJhkSgulPEDRsyeIToTE9eLn8xQ2z
-YtkE11Fv2Xp/xKkoIJjMDXWLTmholJW2xt2X8/yEh57F0v1vkrZhC5orB0goHLLu
-nvlZCf4TYCPF7/5zBx1S+QBDYkxXdqU3zF3Wv+FCJmdssXeMcXzbtPdMBOshpOAl
-BSnX7QQXSPTs8liJHv7yH7WdTjBg/KtgGvw4uh3kXvJqx4o05eH7H9xxAaudMw/p
-Kt8WQxZS/gPwoKN/ycaKwZ1TgGZMzMsJIeACynTb3YA6K2nel44sbgUdOv9s/I9T
-N1sxjxU61oivzyoUPvG9cRsNvrV2DW5JzySO4U5pCJX6GNvT7MkVfEm5e67VhtBb
-cKaKyH0RPB/d77cz545WuJup8rfImXe54g7Rzp93m3umK2JzjejHx3tOy21dGq9o
-l96ouQhMi9I2/WJxnIBxrWv4l6sDtS0pZ67GDXuOSdI3b+eb3RHJzigeoSZDFa/q
-YOotuk87o6NMPByZW/DQhRzqN+rcNj2P4ZeshgZSVo/wGNIvPSw=
-=xRrq
+klC19xAAqY6+UMDrsFIlUiEQ7udjOsj1ceOp2Y3cwNaJ0W7onbLtQYjByLt0A3ne
+XAJxWx3G+8LDVa4wZowARoOFq7WtZ8sNoRpaPiFjKaR9alSIsYi/kaeYZDi/I8gU
+bFo4cf03EDB8vWd+7PdTxWWnIR3KaadZ7mrly8Dw6JAA6lSnV+DyTCbDpVkZtVYk
+Ee4wt2wKZo4np05pXFN4kC/6iFALoXrusc5sQ8DW1cYhqmpecc7/URyu/QX5NRhu
+zO+IFxZ5kG4c3Ki1t1ukpKOqvVbibWQZsraHLwpoHdr1LFNwcNH8k0KjjxAbdqlK
+4eb5di8qvXV0DaJ7HjFKgeEdq2RUL4/tXCTeF+hkOP4Q70vEbQ/OrLFf2r6FyX5F
+CFM7zVrZRzEi5DmyqOW2j87c4LmxIY9Kb5cgIcnnveUUQJ0vT9vZcirO1WlrLG6b
+FtUOPD9Scz2B15HBp9gij/Pr6VeScbEh3PmhyzD4OVRvABCowuml6ry3UnS017oc
+yXjWtjZPTRfwBSUxFrmDk+jeVPpO4OuGSPhVtdNtjJ+VCwEqW26xHJhmMNDUMEA6
+Xuo8aRHuzFfTwTASmCXT48+BjvYa6tLOApjC3sf+UJbTsjp9IhOJ7qzn5m3UWqF9
+L0tVFSY2BIsnpeWFciS8RynbIkqhuvAA31B8Yuj12k5FzDNJAcc=
+=xf6F
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index dc3d3440c586..c7ba2a22238e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cd00e92f0d6c..e10035fbf38c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 03e68ff65dfc..bd394949aaac 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-lint-3.4.23.tar.gz 36922 BLAKE2B a012155d9608ce0517f152837cc7f5f8330848f3e6b6b8b62b1985c9aae5260d3b8c2e9016f945a30b8433387549a9421970d9f56fc32ff9aac25a71dc150285 SHA512 4b2357327319f2cc2c0863ed74af3c799afa97f6e8e1885f9c621a9b0b4ed4b33c731f4a0e8557bf7d03f4e1680a06e60b8602b48fbb55c55325f1dda31a51e7
 DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
 EBUILD ansible-lint-3.4.23.ebuild 822 BLAKE2B f10c85470b7bd0e423f7e407ce4d3a7544950ba9572ed1bd6a120a75c6cd7d2ccdcbe9d5676cb8dde1277e1712eac63ed957964bf97b1e30d015d4775a6ff5bc SHA512 868a0367462ced7d09f3335fb28a2689df05b8cf2a1899314e57ecf09e30446195afe33e1369cf2e523f62a37a539873fd1462c083f8c76392302d4aa8bf1bfc
-EBUILD ansible-lint-4.0.1.ebuild 965 BLAKE2B 9a7d421bf56752152ca4b76a4a0731ec1c16180ebc175948de34c70ef81c7541dd3d59165509c0030310a6a387baaf264fb26afa1ed1165ccc16e1fa732860e2 SHA512 757f589847fcfd4d33d29eeb4ef5a56bb5996db4726aed95484ecad23cc584a21f4cf0cb20a064804e3a1ac6bd2956740e3e93c55c339db22923f02a11fde2db
+EBUILD ansible-lint-4.0.1.ebuild 971 BLAKE2B 2de53f3b709b83cdeef9b5f4df34ba72ca652ae5184ff207283e9bec1f28fe266baa6caa53a5d2865bd8154e9a6616a4238808029ede979fe92fd8d80f0135bf SHA512 ff76d074f577bc73f3ba1c7defbb18f2e4c7102b9869c6a271c050214b0d1fa9f990962aa5f3ee54dc226e317da7c6638b50770f4c6d55d9b8b5358bab13ccb0
 MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
index 6b0d14dccfe3..693eadaacd95 100644
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7c4fb7ebadb6..34180551e581 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -7,6 +7,6 @@ EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ff
 EBUILD ansible-2.6.11.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.12.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
 EBUILD ansible-2.7.5.ebuild 1626 BLAKE2B 1bdce86a17494f3be67aacfa001dcad3cc573bf5829bebb1b91503ccff18b7a612df7a7e384b630e3fc17ac0d40d2efb0a1f3ad6ade9642cf03d17b0d0ae0c97 SHA512 dd2d96a324a232b6aa8c903d7b890e434c2143c393409ded7da43931cb65544577f8cb6cc64fceb5dcefd5d9b0e3c7c9c60132af8e97c6aabaffc0e494791f9d
-EBUILD ansible-2.7.6.ebuild 1628 BLAKE2B 7d378d511ba2e0057f277185aea987022248e9c2c2f78e3424b92a3c6b35ae52ee0feacedb88d02f26742089a64a4b8afea1dba4241530a697adbd6de655aada SHA512 74c8acd86aa822edcd67a83b5ae4c19f27620ea22fb168575f6fa5bf993db795ebecc55a3a037a08bbcceeabd60ed0b938221631656dae579547095cd22710fb
-EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
+EBUILD ansible-2.7.6.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.6.ebuild b/app-admin/ansible/ansible-2.7.6.ebuild
index c32faea9ddfd..1363dee05e63 100644
--- a/app-admin/ansible/ansible-2.7.6.ebuild
+++ b/app-admin/ansible/ansible-2.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 7fa4fe6b36e9..5beb3f4d23f8 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 git-r3 eutils
 
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index a45d6d0e6759..196c7caf345d 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -4,5 +4,5 @@ AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd38
 AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
 DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
 EBUILD ccze-0.2.1-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
-EBUILD ccze-0.2.1-r4.ebuild 937 BLAKE2B aebde8aeef4e505ba0a4c78d534eff9756534cbba50eb75971b3d22e5d81d28b0fb8bbee63ccc1dbe8a690eed39cb3b9d8ea10e41ce8612b70716655ef816a1c SHA512 ae075f4af891bb67e0c8a48df96cc56592b6c32e0f62fddcaabb78b2acd1616e06c12bf7b97283ea6c019f0031784b02a050e6b4b5e9ba6f61d465eb4b51ceaf
+EBUILD ccze-0.2.1-r4.ebuild 936 BLAKE2B 391fe783a84fa3b770421cb4e854d244bd77a46857d0cf4adf2ce71824fe5763309a83ec1fc1b72bd730f735bf1c7deb9175c8d3dd9323ec37c495a3c730c3f2 SHA512 81d8915eef015f838c5cb347e489a36b1e4f1c96d985f2d49513f1ea17c721c59d7b2309820552fdd0d1f367f4d7b8ce49574d6edd7721efb913206410da7d80
 MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
index c493acb5da82..cf41a220b2ca 100644
--- a/app-admin/ccze/ccze-0.2.1-r4.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r4.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 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/libpcre
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
index c44b20b70343..7b3bb1f18aae 100644
--- a/app-admin/chroot_safe/Manifest
+++ b/app-admin/chroot_safe/Manifest
@@ -1,5 +1,5 @@
 AUX chroot_safe-1.4-ldflags.patch 399 BLAKE2B 3acacf5d552da06fd1907d988f113d96058efbd357cd4e6bbe514d8e8ed750b7931f3ea61a065cf605c42e3d7a21986da5d27e5b242cc0d594adcd6537b9893a SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753
 DIST chroot_safe-1.4.tgz 25886 BLAKE2B 62247d568240a93914e5c42c3bfefd2e8793a9b6bd27c13668ff3cc48ec396b622553764e934045c0c570eeff7b15c5ae9fb7b3623c5661be537e79ce9d93287 SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61
-EBUILD chroot_safe-1.4-r1.ebuild 752 BLAKE2B eb02065b18f0e11c6ee06d878aa5d942c28ba2427f0c0875b50c24f13e285793278043803497fc05a297b50ffd3069ee5cea75f753410b4137f5c78e228e25e1 SHA512 ed9177a1bb70f6b3e24d6c430474f2c56af71016b5d1d8651bd88df8ba0a51a0091ef6a87c8cc28f3f70e45f85e466ed2767008352ae2e8f3ee1c06c9eb64811
+EBUILD chroot_safe-1.4-r1.ebuild 751 BLAKE2B 825222628b786c4067aa2b3dce7d03fd83485e388c9de3c159f40f5067160bc789f7d4454c1781a4877eda35439c22f4bcea93e339adca96f12149f83a0e9c6e SHA512 58b66c42b8b874facf8f9fbfdd84d4aabd689b3738c6cc04022b6e127972c799cdd218e21298e56ce73c7d96a61039c958f4c5218a463aad31d1711f8d5e9b32
 EBUILD chroot_safe-1.4.ebuild 783 BLAKE2B acdc573b676ce35d9cf686f15f33231099361986209e15a28ac05c17a1b487dfa7d689ecd0ae2e474a23f089f50c63972aa4673c2e2e406a652f4ce4f2dca909 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364
 MISC metadata.xml 247 BLAKE2B 306b96b46dafe605c41d3111cf9bd2fc3ef659f9f66692d05f952f8c9606d5bf1b1dd8051cdf1cd2d4e41f01934e57ae3e55ae46d23ba5acc2314d2fef325a4f SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c
diff --git a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild b/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
index 1eb04bd3ccbc..e9ade8684f94 100644
--- a/app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4-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="mirror://sourceforge/${PN//_}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e8ed53db6175..5fe1d55fb223 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,6 +3,6 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6
-EBUILD conky-1.10.8-r4.ebuild 4723 BLAKE2B 93de51c63f3370998e3bb2f9904555108a07a2bd191631c4c52b191ec37acb2fd767a1bdcb7831af2b1a89965a29dfadf8588683f3fc8c7830f78271f002db99 SHA512 47692933de7e683ad3a7007ce01ce3497c0b204ca7773b4531dcd2ee41ef95d587a2f2cb7bd6c4f4128851283bf5536a05dd91f815ef7ce95b0b5a6c6a575ccf
+EBUILD conky-1.10.8-r4.ebuild 4722 BLAKE2B 0f387cc477e67908a28216a84434fb29cd746da72a974c7eef0c0b4bd7f4fd0d9945ff1e59ae418dabef11d25314dc176740e27f918acd0ab6476d32f3d0f890 SHA512 8b06fe217cdff402a67ea1f080056bfcca67147c4c1bfe8bedec2c75036b2caf24a091c64b20fd423ca35b456d3d12dbca8669bdb9f5fd320091ac30786bfae0
 EBUILD conky-1.10.8-r5.ebuild 4723 BLAKE2B f8cec52cb3d048a9ee66e3a73a938697fa6e15309d1a6e3750e95978c4d47e5574c384089e703688ebafbb86b6e20c855893be67db834de2ee63862c07451b9b SHA512 c94c6cc8f40c9e4ea59ad14b11a41a1c95d2ed817774ea6ccf2e72979b16d12ec5c570dc95de8fec98ad00fbd10e1e569aedc82806f38ecdea8208cf914dc98e
 MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55
diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild
index 44866c4ce035..a4bd23153b03 100644
--- a/app-admin/conky/conky-1.10.8-r4.ebuild
+++ b/app-admin/conky/conky-1.10.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ppc64 sparc x86"
 IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 969a5d17067c..b8d92e00539d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,12 +5,10 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
-DIST consul-1.2.3.tar.gz 18428593 BLAKE2B 14582bf9668e4f2a1c8c443cb01d7b9780c9bc414ff226907335f3873c135b77566898649d16b352ef21ee9300c290338f59672c5fb2b187694aea97b8735dec SHA512 71a7dbfc031df4a96faf2ddd829f289e96adefd0e0087208bbdd26e742a24e3da05fceea4181eb915703ad3323ed5b02bf74eb3fdfbed1e9a1afa2f74acb2a34
 DIST consul-1.3.0.tar.gz 19423317 BLAKE2B 1db4de2d24be31b2d889b6f49cae33f2719080cf35df15c12c09159a57b9930cbe7204f8a35bbfe0f77145f562e3fe7d224785dde1f7b0cc3f0086e95e1316ef SHA512 b05b0ed316e10f45b83839812fb3394153e8bed604d35f0a983d33fcad3012a3b1872411b3034dbba54dd0ba000e737f18f7f351ed57fe737b0f365bdfe92f2c
 DIST consul-1.4.0.tar.gz 19685523 BLAKE2B df999d29fdab59b41d8e7ea4ec977a35aa7ec5b7daa293a75a39f695e3a75b1748b5bb584be9d9d5b3e1f0adac9626613a04949ff711ac713e2741cd2f9ad127 SHA512 a9f253ef5baa4e43800a0982ecb6893bf9487775cdcbe3a17bc7c45d601b6dca4e4c398ae3b70cdc1880577dbe1504d1a1f0cb702a1dd8c98b108e059fc721a0
-EBUILD consul-1.2.2.ebuild 1550 BLAKE2B 83bbc84358ac1cd5854fd6325b62a517e6da51a0cb8d4cce6b5b94278ca4ffafaa74f3232d4d6556ebc6611b4d71608e028f931a72a10536698cec17a7322203 SHA512 bb60a8d056fe2dfbaff0eb0de014af536f9bdf8e5e8a76b17174acb19ca005530eb8811b8357097fb4a469acb0c6751337c8e81eb99fbbd156111aa1040fe4ee
-EBUILD consul-1.2.3.ebuild 1550 BLAKE2B 21eaf66415397eb834e6208082c58bca34e5e02d180503fcdb02d7727ca1d46e2fdbad86fd5c3b7d24961c2f16479c602b2e4ad42b5b6f98c4b48632d98558de SHA512 4ebefcbbd2d253d39c413b083feb0918e430ed27dbc38a728077ca16097729593f70576af0bd434109b3f2ec8ca17bc70cd74d09348c9e7dcc79a8dc1d0ed56e
+DIST consul-1.4.1.tar.gz 22517128 BLAKE2B a4091ad1c2d743693ec14e364bf610479cb6c6f33caeb601698ca37a98fa0ddb6417bbca4ca30e3941bdb1c8be18f0eb31b0e515498d7fea38c553ef2d0a1f46 SHA512 e5451a414878a2a9d3591d4ae2caf8a227035017a6b65cbacf272a1a14727d33cabb1a11bd0fa3b837195309ff77aa49d4087cb6faedddb8ea002ac46412bc90
 EBUILD consul-1.3.0.ebuild 1547 BLAKE2B d59397ef54fb8ed539558cb408a5501edec87db0fb1ae10634c652e16726c59413ad2b40be1f42f233c9dfee998db14e68e79f74ec3695421ecdac22999ea895 SHA512 57d60cc8bb7766a1bd82bd1941ea4cf6c34adb781d3876784d38115d686365a690d81ffbce7b2765c50e47a6dd67c858eac24435fdfb23a87901d8e41b895a81
 EBUILD consul-1.4.0.ebuild 1547 BLAKE2B 020b91abeebd82a60c7a60893996d29214c4456b4758a15cbf810a3582fe36bc6dc5950128f8653bf9eba3bac2458cb359e194b7c0e99a9be0f5712bb5be65e0 SHA512 9400fd01450d0543eb6b29f67fd40a41874961d6bdfc7d1492a24201e085b2fa829f1e1350e4c84c20ccdd6c18b8b9a54fd9b2e56981c9c2e8604e95be915db7
+EBUILD consul-1.4.1.ebuild 1548 BLAKE2B 4e3e87a0d75be8ba8fa8e5cdfa0a57a07dced2dc84fbf9282ac277b3808ec54c8c7face667f31deb96ad02249b1e0be9462c730921d81fb0e0faa198b822646c SHA512 54af81a5e1bf9eaaf58d2529620f7da2ede7f305588545e23960265ab34607c313e3a60bb9ebed51921d82b0ec0365f9d00240eac774d7bb255ea96ff392309f
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.2.2.ebuild b/app-admin/consul/consul-1.2.2.ebuild
deleted file mode 100644
index e754310e4c6a..000000000000
--- a/app-admin/consul/consul-1.2.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="e716d1b"
-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.9:=
-	>=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/consul/consul-1.2.3.ebuild b/app-admin/consul/consul-1.2.3.ebuild
deleted file mode 100644
index 5c900d4ab45d..000000000000
--- a/app-admin/consul/consul-1.2.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="48d287e"
-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.9:=
-	>=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/consul/consul-1.4.1.ebuild b/app-admin/consul/consul-1.4.1.ebuild
new file mode 100644
index 000000000000..86592d84b726
--- /dev/null
+++ b/app-admin/consul/consul-1.4.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="65d2c9b"
+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/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index fb7f0e23a37d..af93cbe213d8 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -15,5 +15,5 @@ DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd050
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
-EBUILD hddtemp-0.3_beta15-r27.ebuild 2997 BLAKE2B 3eaa5dd05ed2075d71fb3b52d18a1641fd5de5bbd740f37f1d41ef78af7f44ba6065682bc97f162d26d28e3fa553760e41e113f713d879480574bd1d95374f42 SHA512 455cf277c4faa3c281585a6fa63f030ea2078635b237cbd27a3e39aa5defc56c52e525a3b3f3b16676cb9d358c5c2d58c624d5bd340e8e2aca0bb5c3636c81d6
+EBUILD hddtemp-0.3_beta15-r27.ebuild 2994 BLAKE2B 677e5f404ada610f7ed0e284e503625d33b7048b10c28c84d9e5e3ef8ec57901a89ebeebeef5c08d2ae271eb2c7f5a7d2da6a351c627cd16d373ba286bd462a2 SHA512 7c2cca4c497711991556dc45f35e7cb18eb88c66a2aab762740dd210b338408a920c16da016d19017a976095c38eec983e99fcdd3337335ddea8cea95f0e3601
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
index 53a9a779e93a..51042e1ce1b7 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.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
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
index ead0b6dbe7ce..3106f7d4796d 100644
--- a/app-admin/ide-smart/Manifest
+++ b/app-admin/ide-smart/Manifest
@@ -1,5 +1,5 @@
 AUX ide-smart-1.4-fix-build-system.patch 280 BLAKE2B feac0eeafdc202a7f0074c6ca8c102f5602bcd1b9ec734e605d122464c9e782db1efd502677d415b1620090a82b5ee70755e25bf478700eb6b89d059a9ba5bf4 SHA512 7b27a8842d0ac7834d660f1ef46563a210a37e737c469cfae0ec07d18ae6fa523b6482f8fcba3f63247742c86215e01a35294ea664a416e7ffa92184c91b8c03
 DIST ide-smart-1.4.tar.gz 19739 BLAKE2B d9c94b53855628ea10ea563f709754e7f79e50d43e24f76ac3c6dc9b5bdee81a547e63c4583c3506cc899c7e761b59dfbea6bb121f39053cefcac20a984b8d3b SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660
 EBUILD ide-smart-1.4-r1.ebuild 691 BLAKE2B 365faf918071ed12a596f8cf029c6b9fdb5e76dee3e6dc0c0ba11fadf868aa2ab7c8ed8af06aa25b559e6a65f71dbecd606b9e3065aca481d8db49bfd679285e SHA512 6a54fb402a507937358b6ada716caf88e9335dd02c83cee489bb2c2dd026521361a2df821a1bea13dbd025929d318036ec1648135dbbee703b7c9e9d07f13ae1
-EBUILD ide-smart-1.4-r2.ebuild 578 BLAKE2B 3e2a0f1117551cf82bb72af0f43f942ecf50aaaf624f772860f290cd708c5c6da12fb30c7a3eba05cbed211da60d7dbff94ede73a4e6b37c240e78425240e830 SHA512 73367fa4439efb9d52688da838416762119314f7545cde96973c1e14cb090d0497f4f8391bd9398cbbff0d8a15ad9fe409fb77fe341b4dae1fd568cb805571a8
+EBUILD ide-smart-1.4-r2.ebuild 573 BLAKE2B 57cfe05fbfeb32bf53330832b088eac307aa7d7c06eebee48583e8a958fdba7b023707dcb74174c65bd2b4892484156cb8e16a88269b8424dd7ab55044745f05 SHA512 3b207fcb8a9157bbeac307c9d0804655fabbd1ed965b400a330ec3c42c633e28f6f6238321f507f16ffeed9bad7ff2e557fba77224f0fe7cb61983eb4c6fb12c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
index d6ec39958880..744a2b8863d8 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-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="http://www.linalco.com/ragnar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc ~x86"
 IUSE=""
 
 src_compile() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index d3e20f9d0fdb..a6e921123eff 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -9,7 +9,10 @@ DIST puppet-agent_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb773
 DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32
 DIST puppet-agent_6.1.0-1stretch_amd64.deb 17902402 BLAKE2B 4fb8a0e85fc4dcee0ad08ca45b90ddafca3ae3f605bc9b461be2e2b31a35412c23229f8ea58a7c2ce97df2f3951598529df874911bc446d7f5f41a1f36b0cc0d SHA512 6f5ae6ee3479021ff455c7b9344cd54a3d0a7ecf57b2403343297b1d1d017e995eacf0fed210976db799b9e833b26557917ca4319ffd01dffeb92d2a9418b7c9
 DIST puppet-agent_6.1.0-1stretch_i386.deb 18652482 BLAKE2B 42c03e6c1c6c86d54875a6fd79c4a67b9b83daef42415cd9c7f1fc445912f051be3c2cd21f804318779169eeabd1ec15b9a2fb5389601416aea44c2533c7a879 SHA512 d78e2fb3ec28bb60a46ba1dae8d4e1292ac9346a7471aa29af6cea1a249496c4d96e7ff006700482b08338d3155dbba653d86be0d65dc31c522dd8fb4b5b4dfa
+DIST puppet-agent_6.2.0-1stretch_amd64.deb 18705508 BLAKE2B dbe52e4babaa47a7ae6532765e8d544b0088374c2d9dc1f9a052a462199560b4a1b36b61e2e0953b54937d0672a66124e640ff44deac5491e28fec5f8c162e51 SHA512 7235c8d2212377768438b0703064ef81ea1fc96473a84b1275ae7ccb63d74ad89a6c5721a61d009276df5a84947484928fa05acea20bc40bf2179f9fe9683cbb
+DIST puppet-agent_6.2.0-1stretch_i386.deb 19232552 BLAKE2B 48000de3a47f6d9513cb33f5a9e4a889dcca5ab089680d0f03d85a6f96a8ec0dbe7610c0cb6e6ca5184d18ac8823602ca1fe56cdd6c48bee46faf19f0d775f55 SHA512 755f078d5e91982f6ab9c8b717e7635f533a40437b04a09ea097d87059d01a00120aaf31e6ca7d1cc32940be9491ba4fffc5f4fb82b0c4a263bf8638d5e1c15d
 EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
 EBUILD puppet-agent-5.5.8.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
 EBUILD puppet-agent-6.1.0.ebuild 2175 BLAKE2B 3aca5fd4bc6cde1b4198850d907ee3a0684497e3e0068e851a090351c4249d13426f673a101d244746846743015529283626f7f1500c0d12c5f7d6829b30a2fa SHA512 388e1c782ca0ba873108e0774110a7eed3b337b19dee4145a50c0b4ee8ecec689bee8bf27e67099c33f170e3c8105a856bca9ce10b893bf82649c0e466708ab7
+EBUILD puppet-agent-6.2.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.2.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.2.0.ebuild
new file mode 100644
index 000000000000..a72df734d6b1
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.2.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${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/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/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
+	systemd_dounit lib/systemd/system/puppet.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/puppet /usr/bin/puppet
+	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 2fd52e57d82f..986c3718453b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,10 +15,12 @@ DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8c
 DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332
 DIST puppet-6.0.5.tar.gz 2811469 BLAKE2B de25af69b387a02b68fbb31ae13a9fa4aea8f25dcef32bead662e708060909b2f10813c1e889372a9167cb7a10b084679c20b5fa8312d2e06e2b53ebd573082a SHA512 0b34a27a0c21d24cf22e442b495dcfc49ac8b78e40f83eb9eb7f8b82b29350be436a63c6c9c9e969fc3d16096ccb927ca3c4d11e64e51d1e50150001d015bdbc
 DIST puppet-6.1.0.tar.gz 2818606 BLAKE2B 4fb6b26e5c3711262ff2210c9a4e9a9df0f47f4a989526a79cc36f56fa939fd4e54e41f3afef818aacd4630daf559f1ded7e2f6e3cc258a005a848b4d49b64ae SHA512 b82d5f5b045e23543a26949d9faa7ced78f1413e7699d124dd43a56b8558232d6f151a9fdbe52e1959900eb8fff7d7e873fa7ce986206419a27a7627a56f91f6
+DIST puppet-6.2.0.tar.gz 2821615 BLAKE2B 88b8ec856cfc6dacba5dfe44da7abce56a351f514057d3c916ecb5f4188703713cf7981984c2a59cb8073da93eab91a815dc2f52ee4f621c9a412897e9387d5e SHA512 91540169d3c9c1715e78b416961f4f3957a01b0908c3b675fa75226361fb8161730ca47ed98a2e958d8841fd50086c75489c5ee53b41f933392f399d502bad9b
 EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
 EBUILD puppet-5.5.10.ebuild 3826 BLAKE2B 5c607670362e772e049e9c4789895145076fe3666abb893d4f5a862ce644c0434146f3bba0e4d84264c6796abc3c534f48ca3d3f7d34bdcb489b7b0a0f8981c4 SHA512 30546929c45f9eb178bdac4eca613ede8bf6ebdd677b1046b785ac540081dc98c8bab9f19782c815066e2daf591a882258f7af7dba4d240087eefda62992cdad
 EBUILD puppet-5.5.8.ebuild 3824 BLAKE2B 907719041ed40a583a9edc42a0e8cef3a3e9d6853bf0c9199f488d86aa04aca729eb9fc23c7ec13ada04c0c9b834763b7f2f342a3820140af2b904bfb989f2dd SHA512 5ef99a7afc0c99be4df265be02f107705236824226c7a681e8ccf96a566364025c1407d78ec99a0ae9a2c6de4988d730d4b0721ac293caa02106f1ad962c1d90
 EBUILD puppet-6.0.4.ebuild 3655 BLAKE2B ff22ce68512cbccbc58d07d2331c96382f512f926fe5e7e98d410d30bb053f54ac5502588d7caa965d3e2377a63967d5ada26e74a4a312f3db6c70564dd63a2b SHA512 d48c942a3205aa72ddb6b44afb46b86bde21ead50d58c9c5ab33b8f7d4a4f62f8d57932d022a0baedc903c753b19e2ee75dbde68dd261f4ede034747e4784cc0
 EBUILD puppet-6.0.5.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
 EBUILD puppet-6.1.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
+EBUILD puppet-6.2.0.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.2.0.ebuild b/app-admin/puppet/puppet-6.2.0.ebuild
new file mode 100644
index 000000000000..1d12aee25d2c
--- /dev/null
+++ b/app-admin/puppet/puppet-6.2.0.ebuild
@@ -0,0 +1,138 @@
+# 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="http://puppetlabs.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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 731523241490..465d11eddf97 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,7 +3,9 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 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.1.0.tar.gz 40448212 BLAKE2B fc12d7177eda99e755eddf33c7833b98a1567ac8675bd080720105709b44421b0293a3c8eb38c104104b0bade72f0dd8e2862a10d25f52c4ecbd0f914e66bd77 SHA512 185403b528099d6ef318cbbdd58228c31face25c540435e049585f68fabcc17f5850cc10eec342746c910ebfdcf2a1d99c7f9ca01b0baf2dd4585ccae1ede205
+DIST puppetdb-6.2.0.tar.gz 39922402 BLAKE2B 5d3c36bdeb902c7292d8da728ce225e3378bcb1283dbb2558f7aaa488e53351da41551606723d6c504118f5a653d92831cb55e0570dd7827c1be06f78592e0ef SHA512 33da6a7db688561d01302918cc0e85ff88f5490ac4007e4f20df6b0483aa1a7f65b2226f98966936333c7fa28060adca47f10ba7419a05d70c9c72bd8a40e8e5
 EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
 EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
 EBUILD puppetdb-6.1.0-r1.ebuild 2763 BLAKE2B 09a088412310f2de919ad26d13485135f791b1498640410304c96d6bb30712f61fb9afd0ed0e7ec4628d9079da2d33afd83eded15f4ae79deaffc25fcd702640 SHA512 b10d6d224b610a6478bfbfa66fa4ee96c4dfafd9188840815f2406872dda090334f22b090f110689e7e3d65a68be3ae19fc777f676a848331069d1b7ab64365c
+EBUILD puppetdb-6.2.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.2.0.ebuild b/app-admin/puppetdb/puppetdb-6.2.0.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.8.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-r2" 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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b6b72e1be042..63429448da96 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,7 +2,9 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
 DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b
 DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8
+DIST puppetserver-6.2.0.tar.gz 75582622 BLAKE2B 09c651c89e7440f3c79db8ddc98fef3844a80424291cb80cd031a7a9e26faf02b5d42d4ac1ccc6c88afa062f2a23ff393c0868f0fd0af19c7061af7a811c8b3c SHA512 865b605deeb5064e51a1414f735a034cf7a0694cf74fa7d657c5da6c3da2a3b6159f251f2a71a2f956a7abfe5bb0fb6a33fe3ff43c7c9b4e743100d2edd63ed3
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
 EBUILD puppetserver-5.3.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
 EBUILD puppetserver-6.1.0.ebuild 5322 BLAKE2B 87f32494b7697944dd5b03e55c5c5bdbb32b67cd718fcdbf19066e8bb3d1ff65e5f05c1bb1a068347be4d99f4a345a437fd4c1af169d7a8f632cd9495f26c6e9 SHA512 f18c43fc1aaa91de048fe1f810e1656ecc0c6b5ac0323e355b1aca2294168df6ddea2a9cb5e317564ece2bf2cb9529ac220d5c377ff0926051117142b1ffffd5
+EBUILD puppetserver-6.2.0.ebuild 5356 BLAKE2B 4ef4f776eaebfc8e127a2233321fd5377e103be0454cab7752be03c69f835f4dc80c87c9a51cfb6c2f229ddfbd034ab284bf8b362c0fe5ee4e1cdc7038ca512c SHA512 0c5c622cebbea427f97b8feb82b615c17d730747de09448aae1d083e078e428f3a97723664bda0c1abcc0b83a43f3270903ce028ffa85327042c7949bea31c6f
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.2.0.ebuild b/app-admin/puppetserver/puppetserver-6.2.0.ebuild
new file mode 100644
index 000000000000..04fc3966a1c0
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.2.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd 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
+	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/ca
+	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
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins 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 do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
+}
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index 5f1d4ef6ca12..a120848990d8 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -3,5 +3,7 @@ AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf8427
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
 AUX radmind-1.7.1-dnssd.patch 493 BLAKE2B 8c431769b3908b6961380d5da1b54a64cc10ed00c77900f08a680a5782df0b204cf63be9155ba62fea1d637e4ae7ffe84ce1e2745ae0488e4fcab2ff3faad6f1 SHA512 95577070b42d8abc754c1ae235a8d40bd15acbea71b560a8defd69f2becf8c89b592420d872b93409eb142731b7ea0a5180394218ed440d7d633a6e004b7aaa7
 DIST radmind-1.14.1.tar.gz 403553 BLAKE2B ea89c7c28714134df3d9f9ab522c4499590f5f08f3b5d6c0d02c750ee896922720d66e4f08dac70fe93933da0fa5d8776fdf0f7d32b926d76ece27cbcedb87ad SHA512 bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
+DIST radmind-1.15.1.tar.gz 449653 BLAKE2B 8a516ede28d561a60f7c51424c6e48ea030dd571528fd3422fab3b23b4448ee898d408136c4845ebe9c5f9088fb425ed67b341f4d1721747a415183687e6daa6 SHA512 3dd9477d00083cf9912e2143adff52f9bc127665ff6705bc200b7323e53390fb76ac125733596ba309905fca3db062c7b1bc1d1372b77a3044c3794bacb96e6c
 EBUILD radmind-1.14.1-r1.ebuild 827 BLAKE2B d2165ad597c05eb169f8ed4b45bf6e7baae6c02a5b4c463c39e5724ce34a5b1dfcb716faa42e52626b3305c29fd3147fa5a92d3bfcaeb6be45eef833aa2e736e SHA512 d98f6ad920a8fc0e0c61979af4414877a6a0318842e13c27337dd55229b4ee6137a425858881b7fa46e7b8f7cd06f6fcf9e343220a6e60a9df384af43b68780a
+EBUILD radmind-1.15.1.ebuild 742 BLAKE2B 5e952de47de2f77ae1efe984d86fe897425e1f3dddebe910828ac4465d688bcf7b0555f05e4ca0552e32cd0648728c7a50fd4d80ae5e7698e8ffb38859c0bd1a SHA512 0c9fb56f269c7506071c377679fc726d41da083f64dfaa1b2935f4309bed64f566aa1a2b9ae249e193ed3c5b7c54649cbae3f9df07b77411728a871b4db4be4a
 MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
diff --git a/app-admin/radmind/radmind-1.15.1.ebuild b/app-admin/radmind/radmind-1.15.1.ebuild
new file mode 100644
index 000000000000..6f595b238a99
--- /dev/null
+++ b/app-admin/radmind/radmind-1.15.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/ https://github.com/voretaq7/radmind"
+SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}
+	!dev-util/repo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.14.1-glibc225.patch
+)
+
+src_install() {
+	default
+	keepdir /var/radmind/{cert,client,postapply,preapply}
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 8324fa6261db..fcd782205e6a 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,13 +7,16 @@ AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
+DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb
 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.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 12428 BLAKE2B 049c856ae54e3d2423f8d3925572684980d4acaf2bb311965803f89b0fafb61dde003bce22fd3ec9fc38980d3d06d42ed9856bb3356d0e843d785039e26cc9c6 SHA512 db7eba6a3a1435b7bbb6815efe2bf3dff62e488e8cfdf3bf0494797c2d35eda41af20c6a783ca522853ac03eb63c33c91dfdaece1cc772dbe33db303fb7b12c4
 EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
 EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
 EBUILD rsyslog-8.40.0-r1.ebuild 12407 BLAKE2B fb4b459cd731ccdce9ac784cb11a618c19a0bba94711d079e1ec9d846f459949603b2c93d74dd316a72a10e00ffea64dd5ceee216ed29c2f826d30e02909e9dc SHA512 22b89e3194f4bc2419f9aafbdaf1aea548747c80790b33feddcde09f06721538e41aaa3bf7c9b190841ebe780d82b48783dad467b40b05edf56d4d05675492aa
-MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
+MISC metadata.xml 3967 BLAKE2B 1d88f39cd9c9f88b19d2b029afd3b3f80aa40b76661936f8981d2929136d918fc3f89c91d58b5aee4bdb97e648d7b2d24852f899badc576a5f5fa01b4246f79b SHA512 8a4a1e46d5aa71ef24a7dcece46d0902ba69abbd616a1c55d5a8709f64beea1fc1b0a2d12ebe5292f6f0a0b0199925ae64b321fae291c83cec43f346f90a019d
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index ba4e59d215c0..f888ecdbd35c 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Thomas Deutschmann</name>
 	</maintainer>
 	<use>
+		<flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
new file mode 100644
index 000000000000..d0ce2357078e
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,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 grok 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:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	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
+
+	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 grok mmgrok)
+		$(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/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 108875fb914e..8549f0d15016 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -32,8 +32,8 @@ DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.17.2.ebuild 4911 BLAKE2B d8e99d8068d8fe923af328f49c53fcbf9b861945f40e79df6de40201e38c9b3feecbb33385f3e7523ee51a996a0531b27f12b6a94c77005dd4e7aee8873507f0 SHA512 56f758b355e364f6efecca4c54ce8e02676d0e6fc56d4800b363eca92309ef0dcb4cb4678d0c87b0d1302f9e35b5d53b3b4c4a9b182391564dd022ec57bba139
-EBUILD syslog-ng-3.18.1.ebuild 4888 BLAKE2B 7c5354362dace4443e1a7137765cdce2a4c15891319370d4b0ee7edadda3a5438b546addedd85dfdd78255333b4231fde2beadbc6a1c60e588089b098e884eca SHA512 515d7bc671aa54c71da0910a75600d5c9a2f1a422699c86bc48a77c34172f55b39b7937879b88cf5faaf57459d5c68083276983ad8674432ac5605ece6dc9850
-EBUILD syslog-ng-3.19.1.ebuild 4905 BLAKE2B a09fd525ed80acd69e4a4ae6cbc4dc73d0588eaa18a2602c6ee7c0f75846cfa4db77356772cca43fa0782c5e1486e0f0f4459f7d1a99097750aad5f04422dc51 SHA512 153e9cf0044a6ddabf92aa58ed3d3a7a2f7746b6232cd85de6555056c21d7989d6a235847835ccf1d0324a2239646d6e3c018f8ace1b6469536f485a798dec26
+EBUILD syslog-ng-3.17.2.ebuild 4917 BLAKE2B 224c9a50a87fc9055d8fe7b091e26d33a93c66493d48a6d66ed951b4e794794b7f40242b0ed7327561a3b8b89af24e68cb456bbc14dcc4abfa301db7e7d32800 SHA512 ddabd9f06bfe953d249ce363806b4fbbd41bdd6d3d590b7ac661e32cd57244c6a467c260c115e190de527bb515f5cfe23c3fac856d8a27946c976f685f7ae351
+EBUILD syslog-ng-3.18.1.ebuild 4894 BLAKE2B 1fadf6171d09eb56dad0567d47fe59f822253cff01997b21cdc58a84cef1fc2af739dfe515bd4c9d6a18b649a0e05da91a142bf0621dc492de873e3bdda9a317 SHA512 e851d6aca09c317d7a36c772a492113d56d3d0624c367bf9a48bd3bbcaa6ec74e7b25cc6ecb80074e98929b7119a7b21b9bd35d206af60e687cac04825fb5743
+EBUILD syslog-ng-3.19.1.ebuild 4911 BLAKE2B 598c3f60d6dfcc2c3e536b0397231591b47e998f4495f3e27f0f065c5326b090459c4e5516263ec90b3fd021c2eef0e7bbade872dfe3ff9df2ba9630dda72d49 SHA512 cba3b33562d2f256eb78e815f50b7378685ef97a1fe35c30b12205939edbaf55c49afb62b87de49f731549831850ee6fc9021f305ac57bdb2ab1c423b6d2ae0f
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
index 61895ed44e57..198def344258 100644
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
index d684bfa986ab..5b32e80cc1aa 100644
--- a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.18.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
index 118e0c6c63ff..db4299782e41 100644
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index 2a24b408e73a..3b11eb91335b 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -3,5 +3,5 @@ AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d89
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
 EBUILD verynice-1.1-r2.ebuild 780 BLAKE2B ead43a3cb913646f7269b253f0f5c37951411aec437408c446d47018966d8f313fb5402244a174ef4ffce2819350d4b9fe1c55bacebed6cc828b3937399c9db7 SHA512 72074cefa72a8f125a9669ad35a7b1c240ed8dd4e05110c957a4b7733cc521897714a7d0035639664eb63af52f9ffc96df0160498f75133a5e9e88ab650c7aac
-EBUILD verynice-1.1-r3.ebuild 729 BLAKE2B 0b519f289c07ccda9c48765b88bf37bc184355ece6698a859dfd8e2fd9e2ab643dcbc9d6e255b9a7cb830fd1f19de080aa82d913e21d2c9f08999bab53f0549f SHA512 98a2149b7d39117b58f0fe6fee1b11808666390234b0f3e02b5944be1eb785991cc874b960861e168b92f3cb75ecc4d7687d43905bd170d5e9be20475546568f
+EBUILD verynice-1.1-r3.ebuild 725 BLAKE2B c6de124c19602df78e4228bea53dbebe1d9986f4fe896768daee630ddfcf2e4a74899fa28151f79954ef91844634a9f79a678c9dc3ec467559edf1f4ce1e889b SHA512 91b42cb64cb82b7d6ebe874ab65c1313df92cce98130d03989489029a3c96681ba9797673fd8cbff72fb5d31bbb467a6f25af78139d08e025728dcc948b62205
 MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index 7aba33fc8dc2..e2793e7572cc 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.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
@@ -11,7 +11,7 @@ SRC_URI="http://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 89d97d033c13..aa94270e39d5 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index 7ab27d994e42..3a257b0f4a15 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -2,5 +2,5 @@ AUX afio-2.5.1-control-file-warning-fix.patch 776 BLAKE2B 6502ffa8200ef12394fe68
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 EBUILD afio-2.5.1-r1.ebuild 687 BLAKE2B 8c2a97cccf64764bffcb2bc2f48f427f31d66b8a866629ec0e37f96196799bdf818c4afbd631a3d7caed2025d6a98b5897598b0f1afed133113e11d1453d4208 SHA512 f7a87a25cb38074faee92f6a6952b7060d73dd2311c7792f459b45419a995490a8686666525576c0a53300a003d51142fc50295ef105841369c2657cdd07c77e
-EBUILD afio-2.5.1-r2.ebuild 747 BLAKE2B f0e15e42aea6cde81bbec46cedff260505c10939d6710973cafe6733090790ba6336b591662bf46928ad8daedce763c56ddc8db99a629210a3f26073b0c78d5c SHA512 2c4e948401e1db29a8f80443a1c39941ec236db5c702f49d2621d107ea7953d2d3b2c84872f9525990dcf36b41d41141b5d9c1e17436fb1d945014652567fd00
+EBUILD afio-2.5.1-r2.ebuild 745 BLAKE2B fb53a2bb453f2d23e8dd72e358ecac813638da25d79ebc68142f5c66ed5e0dc13376ee9554a5d17c826ca20dc81172c1ea3c26194d2dbc306763a174b29b2d36 SHA512 d604672b2a45998a38d3b0da245a96812bb0ba3b033bc3ec185bcdce4293b55fd8131a77e9fb45b9f931c348401d2efedb05e01d5a0a8b38f9a55a3e89dcec2e
 MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild b/app-arch/afio/afio-2.5.1-r2.ebuild
index fced7417de80..c835101a27bd 100644
--- a/app-arch/afio/afio-2.5.1-r2.ebuild
+++ b/app-arch/afio/afio-2.5.1-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
@@ -10,7 +10,7 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index a09eb01d3468..819dfcc3a51c 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -6,5 +6,5 @@ DIST arj_3.10.22-13.debian.tar.xz 15904 BLAKE2B c70a27a8a0a00526d40346ded93f17ee
 DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
 DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
 EBUILD arj-3.10.22-r5.ebuild 1238 BLAKE2B e5cd5a3b226969309f70928aa3bde3734da71736d25ce7a0ffa96235971e1d40b15efd87cdef232d79025d33cb465f4c823bbc7f9d8c43cf01031553b0859607 SHA512 83445b8b7137fec38fd62cc534c94f69fd10463953396f35dd64070e7e7fabaf41405a8570743061d2a986c6c837daed23979f2468be84fd2329858b80dfaa66
-EBUILD arj-3.10.22-r7.ebuild 1217 BLAKE2B 112e979a5a92775ed4692e8ee0769077045887a4e5967e90bd9f4fe0d195713f41a81824d81bde389797504d897bbb7aff5e3bbde84303236d2c1fcc17b98728 SHA512 d21c7c20de99ce0b1101edaecb820d82ecd03d3d2f737713262e2f37f4203d589980853ca2b4713f8c09562be899ae6b68147ac8f41ad49f4a99b1e92ca49f48
+EBUILD arj-3.10.22-r7.ebuild 1212 BLAKE2B 892d3c1fb98264348c8dc76e2e5372fdbc705017b3a8b93d4d87388702dcf83d5e3249ee0012553b86e23329073f407da9ae46e2a715137df1f9241a643754c0 SHA512 9f675aba0536d5d82f90ec59d6faac9a4c899a8296002f5257a6873fb69dfb825fd1545e1804e4722d2ee975908a01fb35c53460ad1c8dd871003fe161ce5154
 MISC metadata.xml 240 BLAKE2B 1ec9da3b56dc6e923ce8cab2787b77c19b522e9e0e2048a56e8fff8c5d008b0e5e2e6fbe39f0633d1a3c945526dd66b0160d535ada00ceac5ab93b2f61576626 SHA512 64457fffc601ed1e5d4a9154d0fc977a489cc0f2dae35b4da56c78deb66e42e1f9ad33364e13472c33fba0769ee8908bf256a9568c448d3bc895a6a2e2aaffca
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild
index c69298f293b6..bc677bc25d45 100644
--- a/app-arch/arj/arj-3.10.22-r7.ebuild
+++ b/app-arch/arj/arj-3.10.22-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=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 3b87434895a8..684ef4ba3e4d 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -7,6 +7,6 @@ DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e
 EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
 EBUILD cabextract-1.7.ebuild 1155 BLAKE2B 0f93ea1453dae2141d540a11ca038cc8dec1443d93bb4b517735e3b2eab92ab5f56a94330cb442896808d500600fe78a19a83e32c2e167f49fed37eec9ae402c SHA512 d0503c4541eb6eaf93fb3dfa50a6a968b8355a17cdfe5d52af0ccf2187b886bd23e1db740fb0f3647b43c88f1537fc6d992fc0cb96eda675f4e45672a4856266
 EBUILD cabextract-1.8.ebuild 1152 BLAKE2B e4db9bd87b69f44a8be2e56462245531b639a6a4700ac087f8919319997dff2fc9c3267e21a763fa7607a678598b20bfdc6705eba76a19d268aa9e945460b5d2 SHA512 9da9c8b743b7eb5a091af81ffc9d010dbea4580e6b15a43c8e68c0638b14c397412b1f4c4d1fca8759cf3a18d033dccec351dafddf894cb888ee39948189a09b
-EBUILD cabextract-1.9-r2.ebuild 1671 BLAKE2B 47c3dab0593057e4a8a3f9eae0705f48e01c22fe1cc3fc64bb05b8cce8ff2429f4a96fea7a75b65cb072fa11a3c57970c93a412fb24cd9e056da2f58ed55acf6 SHA512 5dca1debf2499fbe91c561f7951a4885a54956d7678a73a5e97fe3574f654aa2e1374334cc3514abbca33d430358e6792277a6b861c71989ec0acb1b45109fe9
+EBUILD cabextract-1.9-r2.ebuild 1670 BLAKE2B 4472600bd7e89c2be27073b13d5012e52aaabb92418745f8796b76a54d3d1ec7858ce08d56d1200d88db845a90e730ab65c959c6ae0ab0a6366271992154da46 SHA512 6d11319f7af3a32bdca6f015b62678260812bcd44672d313ec007b18d5ff310e0a73686b87710e9a3d3e9e86dd1f0b4c59c2461d2eea1c2d2c9537d87b363441
 EBUILD cabextract-9999.ebuild 1566 BLAKE2B 79681bf62a5e3a14c21c7491e47e650b21e2fb518dd8a7df870da3afce17a74f79089c5b25981bc20e64a9044376b9bd77425d75c065acfdd0d03d2771d6d1bc SHA512 d6f9ce211b4114a29084decd6f56e7675b31115bf507518e1f4d07547e5c2d40ea71408f275da12b8723d47a1ed6280b31019b07112af9960d9b583862ba4832
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index b7fa46937f49..662d81bff7b9 100644
--- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 290765b54ea1..e6f705920d43 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -2,9 +2,9 @@ AUX dpkg-1.18.12-dpkg_buildpackage-test.patch 215 BLAKE2B 9890d9f9bf0f2229f73d56
 AUX dpkg-1.18.12-flags.patch 416 BLAKE2B c7fe40b28793420afa0b895585cc14a675f9be68784beef7965fe6e971f6b2d6ecaa7c8bae51bb9f774c9517a618bff85b723052360224952cbdd2b74759b42e SHA512 6c86e8519ab4a05a2c15a658f41c0da14429c4fba0fcd364426afce7db03cd886a69de3f04f167d0f7b6d36a05252455864c11b14f58baab0a4536249331369c
 AUX dpkg-1.18.12-rsyncable.patch 1245 BLAKE2B e1488cc6a6807d38ec7218ae6651b0d919fbc3ee5e2837540f91cf80229e669a6fe24d6de1c4bd1c1debdc34a0c04a2bbc6a21eb964032f24526986678eb1b14 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae
 DIST dpkg_1.19.0.5.tar.xz 4557428 BLAKE2B 99c31705bfad1cfa024366c788264f4e747a7143f87c581730797975303c1054003e41fd65ecf80df1dc053ba87c0e8449ec574ddcb158228b41ae57a23db18f SHA512 60d7198ffe6ea759c30ad82143b3107d41ce59224b853cb5a7beb79af0de6ba6a69414c365e6b3555a0a9c60e3cf9b543a3a448d80a734be38ccecb77ae963a9
-DIST dpkg_1.19.2.tar.xz 4607868 BLAKE2B 4c191fb3dbe64bb3a515dadbb5f81bb32a0ae3b7267603978f7aee34f6baa02bacb818600759fe4bac0c3470ce2d6409c778a408833af796fe65f27fe910713f SHA512 244a6ef6aad935aee649503d6ce3238e34f4fae3f57ca79e99c1890140d913c29255bc9d0e90b50e96d2cf44ab0e44d6c3675a7bed306213fe5fe31710324cf7
 DIST dpkg_1.19.3.tar.xz 4644312 BLAKE2B 42a906c5603cc36e53591d0f33c54930fcb0f0848b53cd1908ff5c018f3a4ab823c71408982247f61e0810f223124853fc181994853f39786563ddbf6228ba54 SHA512 6a53b68bc51b9c700618ad379d4f314f0058479d068ae7bb842388e57b6393f87c4990c1d71ed085e76314d0e29295a5344a0ea78f62ef8657df2d53124bbe8f
+DIST dpkg_1.19.4.tar.xz 4645784 BLAKE2B 2c8a76686ece182b7c87b1fcf3ed81a7bbc9616475e2003847fe9a35b574a814873b183ab5984bb66f725a8e92f3a000bf9250f3f9d1e6b338f6620b3011a067 SHA512 e07538bac0645bf7d49b30f4fb3b59602f304f346437faaea6b4bffbeb59f05471c5e834d6c7e98c869e5466a66c39a0d9e9c05da1cc52a10b5fc60875be218e
 EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
-EBUILD dpkg-1.19.2.ebuild 1989 BLAKE2B 9f08a2f7c54911b2e23823182c39878be7f995998cf554b505d567a2625c5a1a86b2acbcd4ca842fd6ab936e6284a66a3b582eccd3ea5de78c08c48c981ad71e SHA512 424d802939e7385298204eeb14142fe751e0ca57c013a4d05f2974034641879fc9ac37ed68d945790a3ee530d08b012bf4e5f3078dc69e713a2b448cd4702654
 EBUILD dpkg-1.19.3.ebuild 1989 BLAKE2B 4b0233a469f6be8d1e19e00603bdef347749b6578495832873842761e4e930aba416f3db665dde4835f54d207696f597e2fa16ca220586a02bcac80ab8693cfc SHA512 d14d29b5cea16e2d87eac15334d541422f7892b590acd52ab2496fcf80d568a996d592d2fa30a793f8eca103c5a6efeee4df939031d1e7cd4e59afb40d028406
+EBUILD dpkg-1.19.4.ebuild 1989 BLAKE2B 4b0233a469f6be8d1e19e00603bdef347749b6578495832873842761e4e930aba416f3db665dde4835f54d207696f597e2fa16ca220586a02bcac80ab8693cfc SHA512 d14d29b5cea16e2d87eac15334d541422f7892b590acd52ab2496fcf80d568a996d592d2fa30a793f8eca103c5a6efeee4df939031d1e7cd4e59afb40d028406
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.2.ebuild b/app-arch/dpkg/dpkg-1.19.2.ebuild
deleted file mode 100644
index ad8a5cb3b4f4..000000000000
--- a/app-arch/dpkg/dpkg-1.19.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
-
-RDEPEND="
-	>=dev-lang/perl-5.14.2:=
-	bzip2? ( app-arch/bzip2 )
-	libmd? ( app-crypt/libmd )
-	lzma? ( app-arch/xz-utils )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-DOCS=(
-	ChangeLog
-	THANKS
-	TODO
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
-)
-
-src_prepare() {
-	use nls && strip-linguas -i po
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(use_enable update-alternatives) \
-		$(use_with bzip2 libbz2) \
-		$(use_with libmd) \
-		$(use_with lzma liblzma) \
-		$(use_with selinux libselinux) \
-		$(use_with zlib libz) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
-
-	prune_libtool_files
-}
diff --git a/app-arch/dpkg/dpkg-1.19.4.ebuild b/app-arch/dpkg/dpkg-1.19.4.ebuild
new file mode 100644
index 000000000000..dce613b7e3f3
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.19.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
+
+RDEPEND="
+	>=dev-lang/perl-5.14.2:=
+	bzip2? ( app-arch/bzip2 )
+	libmd? ( app-crypt/libmd )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+DOCS=(
+	ChangeLog
+	THANKS
+	TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+	"${FILESDIR}"/${PN}-1.18.12-rsyncable.patch
+)
+
+src_prepare() {
+	use nls && strip-linguas -i po
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 libbz2) \
+		$(use_with libmd) \
+		$(use_with lzma liblzma) \
+		$(use_with selinux libselinux) \
+		$(use_with zlib libz) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+#		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
+
+	prune_libtool_files
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 7b7eecb8b1e9..f1992444e389 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -4,6 +4,6 @@ AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 EBUILD rpm-4.14.1-r1.ebuild 3381 BLAKE2B 2879ce331def5838c70d1103afb61b3ed033f30b90538d0455f27e314d89627b9ac293aaddb1ccd29893118b18ed1eb7e23f8f1386cf8b408847388457e1f648 SHA512 bef11e5de295892100f8005739550960c73c2d6f31f56eaca404761c90f7bfb9eae675b0d97bc465548d049ecee6e241875b703940f43b1d02aa97d133b5ec8c
-EBUILD rpm-4.14.1.ebuild 3239 BLAKE2B c1067b0afa91bc5902c1f9b0390e5234fb2af252c31ee90a841cfd2cb6b498d7af7dfc438f963fdfb1d6b5fc8f516d7562fd0e3d6d2005edc723098268363a59 SHA512 8f9f4cf67e8b4a389cbe9d78b2a7fea004f96f8e1b15e0243df2d51a5a0c61ba0f356d0c36ea06c8e01e230a171f3e4efdb344253a80358d2a826bbc756b9408
+EBUILD rpm-4.14.1.ebuild 3235 BLAKE2B dc139004dab0f0ed6908e26f62abe156459e4600ef40c263f77f4689971c8c44c6ece7c1fbf5b62f601ff106d550318a70edb973412a8b6433e7c4551e007ced SHA512 2e0dfd327c6c50575bcac7b414d9149accbbd5c3bb5bd04c13ffb748eec681762958cf341dd89546839b3c4b49cfb82d55bcddabf3a8931b97f113bf9fab0abb
 EBUILD rpm-4.14.2.1.ebuild 3434 BLAKE2B ff78e40955a55544325a4c9c9fa49cae5ff607534d3d32767b0de794628d7eb6936818d9549c7437b4241fa9571bb9e61ce1d5069e81f16aa36244285b56b52e SHA512 39e238ee2fae8d062c04e6fb02160681a200c767c9aac246c83eafa6ff65a4d7e9f3270f9f4e2b2270d3c8a3363532c7d9d44ae3808c8f85502d5533ec36f78f
 MISC metadata.xml 446 BLAKE2B 7d96be70d67580be8b2f1726dc905d9ff4a6d291c6fe72e52bd5c7a4614cc0b61bc3c6dfe12c715558a89554878b20a5df7cd02414275728be15e3bb6f0eec66 SHA512 9a426e6ce042ecd050c19adadfe10c53d72c1ecbf313673c8a5cd66096aa05bf54d0f67b9659ec07be2367f90f9b43028d3b3302fead2fe8f8f55764e17d9dc6
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index c3bc58da7ed4..05513ac2d37a 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.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
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index f8260281aa2e..fb360423ebb2 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -7,5 +7,5 @@ DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85e
 DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6
 EBUILD tar-1.30-r1.ebuild 2256 BLAKE2B 14041fd4a3c198894c8d470869d52eb94c332cc227fc6f7786145b569f299bc50021c9736dcc4c0b17d7b634b98c2f3318010e53ef6a7e8fa42b2719eee44e67 SHA512 bc06e1350a7df2b30c05d14a78e3de305382206de857b83ec98cd0e376fc832af37d3a2ce0c9ced072da45a6cb981e0438e36d610d63475db1c65cc7c71dd778
 EBUILD tar-1.30.ebuild 2187 BLAKE2B cb952591e27678df72ad53da254bb901d355bf9af7dbe0e22b59a92d3b49fc90c20a9f170154a3ff77bc5aa3cbb2962930cf9258feb5f0f11de3b4dbe2d76f7c SHA512 89fa12ce7849917a85402d98e6532205b294a1793f8f563af952736f282a13ac52f982c0ed87d55a65c7e04f2d150ce5a348bd178ff10512eab822401cee81b2
-EBUILD tar-1.31-r1.ebuild 2270 BLAKE2B a743c9db84423e884331e11e9c537edcb24150980e3989d5098b5068367b8cd14f19a1154de550c0c93a167769e33a592eb055423c5889f5bca06031d0bb995f SHA512 a6010e02253c01fdcf17ba6045c586def83b66a1c321579fc01ecce3b32208039ed363ad4f8904fa246399d4377247e247fed3e52c222a5cedd5424fe205e8e0
+EBUILD tar-1.31-r1.ebuild 2269 BLAKE2B 7cdb121cda49c6156ae5c90bb4f15134521058c6d7352c6e253998f0d4a953ae551ead3a58ee4689d81dd0aab678afe7bb54b76a5b1373f56dd769d933290be4 SHA512 eec3e287701de600e32d5c36331c66f4d6889fcb819877d4e76a217cc4db265040779586fe94de065a05cb3d3c8b58b463bf7a31bd4a55c78b1ede8f0a2107db
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild
index d4920b09f2c7..4ffa7630641a 100644
--- a/app-arch/tar/tar-1.31-r1.ebuild
+++ b/app-arch/tar/tar-1.31-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="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="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 4b5b64028aa3..3bd6f7a76b11 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,9 +1,9 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
-DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
 DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d00a463da1c6fbb714856ffb275defbe400a0d56a21850c754f06eda615fcab983a206f335422503d76f11427 SHA512 1e1e9dc2ed104ab7819d11ad2249780a4320cb30f3c427ea1669c3769fa3a8369841711a2d46d918049659bc67b2cd7dc7560a12127d810a57614293c24fe25a
 DIST unrar-5.6.8.tar.gz 226647 BLAKE2B a3f4f791d2527d13003b7d57506e61723312bb0537066c72fa5ea27e4e9de18644f5445b69e9f66ec479402f6d944ce76b17ad9192b3f835ff9781f0902e03c9 SHA512 5410308d7f462824bc10087cdc4515c58aaad776cc09eb6491864a338ae00ff35e3b54d1e7250c0a9576554ea382383155be718a0b95d7af00f27d5df04f4f56
-EBUILD unrar-5.5.8.ebuild 1851 BLAKE2B 68be65e1df26e7a21690e7f2fae539cb2314fec884ea62be47e8f7008cfdddc47e8ef097b41017e8c68c2a7fbc385bbada86715b3bc06a61e5635d3201fe0627 SHA512 dee6fd8a3d7dc51a1162aab23d9031b5524b74aa9fa1b50275a8b4a5b0524439277daffbfa062bec4c6622356232882eca023542da766db4af57789a853a4e4d
+DIST unrar-5.7.1.tar.gz 228011 BLAKE2B d37a461e8d3faf80931d73eda8f95196068faa2f4fbd3fc86a6bf23729aee67c8236201d31dd555d17dc70ced848d42436b4a810ab952edc23f27ba45250e227 SHA512 6d8a18e44453dbfb610ad4fdc9bac6fc1469f8e04fbf6faf0a119c1a582e60cb51e68aec4552316717cc2133473120973c97a71806e30ef45f1d39070edaf610
 EBUILD unrar-5.6.6.ebuild 1840 BLAKE2B ad0e12315c013ba41e6157da0a8be8ed5dddceef617fc8cfd71c6e639f008988e1af80e11a8fabaa81f25090230e65eae342a913ee9fbb971f0a14f0919e2c6d SHA512 3ebcab78750c4bd802369cb91efbd482d52a3f71f0a234f4d94118897161a1465dc33796625baad03dbfa87dbceec070c7573b4ba43b40a3d4ecdf1c136f2e7d
-EBUILD unrar-5.6.8.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
+EBUILD unrar-5.6.8.ebuild 1848 BLAKE2B c09a41f7ffcfb97ca14a7e7bf0da2e8672e8a7984242a79342854f28f7b1fcc6c97447e81d1fa9a8428fc73f54eb29fd4ac68c3ecabd3b6de89abc41fd308885 SHA512 76651d0fb814363b6e5a9b0fabce323dfa9358cebff33229f4f163b3963765c278790d02f646c561e63ed3a20ba57aea13d07d5be57643ed798db1c05562cbea
+EBUILD unrar-5.7.1.ebuild 1894 BLAKE2B ae6393adfbe7039dde87cbb0245ca5a331a532eceecba5714edec1141638e64dc4630cfcc70dd53f96b7f698d949be12ca1a1012869ec95bdc22cc3259ec6fea SHA512 078cee1baa547c9f151beeb15424ab39f9bad8697828f6a5528925eacad3d87ae00d73db6c60faaa71089a5ec0f168b01a292a65bb618b8db0a0ba56e2a9d224
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
deleted file mode 100644
index 0bd9dab45c6b..000000000000
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.5-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.6.8.ebuild b/app-arch/unrar/unrar-5.6.8.ebuild
index 384033090666..0dd366fdcf72 100644
--- a/app-arch/unrar/unrar-5.6.8.ebuild
+++ b/app-arch/unrar/unrar-5.6.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"
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-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=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.7.1.ebuild b/app-arch/unrar/unrar-5.7.1.ebuild
new file mode 100644
index 000000000000..5f9fd5ccc82f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.7.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 6133f36de26f..270672596afa 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index a5b655c94ae3..3c4a680db2f1 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,10 +2,10 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.3.0-Linux.tar.gz 71075837 BLAKE2B 9d278654d44a43577f252a0a2842e3b9a34bf6b9a0f605b0a053354bff845f5ae5c029b8ff22b3b3f4f66581c60d46a4643207f042ba020515b74a01fa56a37e SHA512 d76c2f0a93ad06afa250c32633c27d5718ca9c2abca7eaa050f967a63d279bde9e220e20677af1433d531bce176d70ed15eee16d020b41aff0b817fde966a0c6
-DIST Geekbench-4.3.2-Linux.tar.gz 71101956 BLAKE2B cae81dca9bdd58c8785dfb62746356d48f8e56a5ba7b22bc30c28f6da20a398a913d673c706f430ac479143f3ae317edbe4a6d3ea44513400093df89e3df4ad1 SHA512 62c673e4a268700cda908354a91c99d0df1478d4f2ee11ecb35a1aa0a59b635a96c3efdb7f5c5626ac2e64cb0e7e3217d2aa05bc6f395492ba143d2454227869
+DIST Geekbench-4.3.3-Linux.tar.gz 71101735 BLAKE2B f7e784a624f558711e7ebc5fc502de0cae5be489154f3d7d20bfccb624269644ff90867c96ce9f8136609f4911b6764bcfb7ecfb037ebddac56e450b3baa2415 SHA512 8c4bdc51f215f6c84ef955d012d3ba81fab542716cb7dd9e2b05d15c68e678955817fd25032ec659028a769312b5bc04d2d3b9832c9f2fa46d55784446e31b49
 EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1c534e1fad2b37458ddca39ef1f1372ec8d3727c69ecc0c462ec2514abea33a48aedf35c7eee5444dbea8e9ddf96 SHA512 663d11705c70d7a082678b7ee74802651734fe367458a7e10974f33b7c22930d78eddee7a1c56993e11a856da0efeef0412e02696485d7def3e4a6e0464b39f5
 EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
 EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
 EBUILD geekbench-4.3.0.ebuild 1110 BLAKE2B 75bed80d0373b6ebdf8db6a1c469f743b58df189b5d3bb049cd8ceaf49a68927d1c03ae1353b1a6539705fd759a1a9028f5908dbdd148905e7a51ad453ce183e SHA512 82a80408f62efa96b5a233b5e92604c9c512fe3ec633097fd64f2a54d293446068f539d7822b41b2dcba9bcaa9dfdbc172d13496d30951940920d46186c864ed
-EBUILD geekbench-4.3.2.ebuild 1115 BLAKE2B 5721b725e147bf2c8e54be77a8388e591d8f37c2ae5f954f79dc1bca53600390076c48b3f6b38836ff2b41fae7c73ef28d3929a3c1540bed22f101effa62baeb SHA512 695d089a2168c25684b9452f03b6ed6960ce385b3bb3c37b7fc976d17f5545573fbc6d00b8ce7abe32c11f344a85e64dd2f2e7fda5cfe0db22d47d817f89d31f
+EBUILD geekbench-4.3.3.ebuild 1115 BLAKE2B 5667d9ce9e1ed9c33f3065d98bce49ca2fb162d843a0460784d1993013af943da3c05523234d9046eb17397880bcc9ee81beb0912495d86953bf0681289ebb4c SHA512 4718961d26a778515f1790b39efb24ace997dc35c1ae77ae64c3e60d443f4a979b0712ceaac50a7d6d6179bad8d7c5d9a1f491b0feef917ac199a2401f0bcd2d
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.3.2.ebuild b/app-benchmarks/geekbench/geekbench-4.3.2.ebuild
deleted file mode 100644
index ada39abc6ed6..000000000000
--- a/app-benchmarks/geekbench/geekbench-4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="geekbench"
-SLOT="4"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-QA_PREBUILT="
-	opt/geekbench4/geekbench4
-	opt/geekbench4/geekbench_x86_32
-	opt/geekbench4/geekbench_x86_64
-"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	exeinto "/opt/geekbench4"
-	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
-
-	insinto "/opt/geekbench4"
-	doins "geekbench.plar"
-
-	dodir "/opt/bin"
-	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench4 -r <email address> <license key>"
-}
diff --git a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild b/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
new file mode 100644
index 000000000000..e9e4197b56ba
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="geekbench"
+SLOT="4"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="
+	opt/geekbench4/geekbench4
+	opt/geekbench4/geekbench_x86_32
+	opt/geekbench4/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto "/opt/geekbench4"
+	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
+
+	insinto "/opt/geekbench4"
+	doins "geekbench.plar"
+
+	dodir "/opt/bin"
+	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench4 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index ed2d9109b64b..d19a5e4b40b8 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,6 +1,4 @@
 AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cced8174a65e09f6196fb4fa50128199d462ee62f17c7c8c55e20aabafca1edec2d3ca7edb508dd5e8ac63ed SHA512 26a4f55ac8d57231d9cc137ac8243da4cc33a3efb6b5366891230087c3e4d7555bcf8c20a7608479142589254a8c049f3165807ecf9c0eba0eb72422e04279e8
-DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
 DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
-EBUILD siege-3.1.4.ebuild 1189 BLAKE2B a72e0f000ae78e38e026666e23c7839e57109f8cfeaba90e476bbd34f880da9debd5f904c4e2a9482bb983573af72682fa7ba572a57575155771a8362bc7c640 SHA512 9a4d62ea2072f180eb99195c319f0b1546b31e4a50918db0bbaec8fa9cb9424afc8e18c03d258c7e37d4945046bba18890d68aa931c1d99db6f64195eb1e8c25
 EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-benchmarks/siege/siege-3.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild
deleted file mode 100644
index 46104f68a615..000000000000
--- a/app-benchmarks/siege/siege-3.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#WANT_AUTOMAKE=1.9
-
-inherit eutils bash-completion-r1 libtool autotools
-
-DESCRIPTION="A HTTP regression testing and benchmarking utility"
-HOMEPAGE="https://www.joedog.org/siege-home/"
-SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~mips ppc x86 ~x64-macos"
-SLOT="0"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_prepare() {
-	# bundled macros break recent libtool
-	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
-	rm *.m4 || die "failed to remove bundled macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
-		doc/siegerc doc/urls.txt
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "An example ~/.siegerc file has been installed in"
-	elog "${EPREFIX}/usr/share/doc/${PF}/"
-}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 04205df5eb1f..73e4a5c23462 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,7 @@
 AUX stress-ng-0.09.47-makefile.patch 1719 BLAKE2B ec889073ac77ee3109d9abbd039388acb2c3924af141a9111b2411e6ca5a721af2f331be03009913bae7aea39044fc1fc5ed7f2cff83b386df8a15c7edab8162 SHA512 f5a567ab766ef4bd473e0e2324cada9b4d63601ce27c310fcf1f24ca051286c72b8f41e666f148542e97ca95691828bd66ee55cbc801e4b8effcf0be46c976d6
+AUX stress-ng-0.09.50-makefile.patch 1714 BLAKE2B 214f285b898da3b004ccd2fb8e7bdee328509aa1a9254aeb196ac836b0fdd04942968f639948a5a2a5d2c18066b6d426020135e11d3663acaaedf12c6fe153b7 SHA512 c83d5e216a5cdd568be1755836b4a385ead1136500c4b4704ad338472de483b5aeb8234f1a9ed184de067e6ec42b864013aec7300a5256bfd953ee7153ac0aca
 DIST stress-ng-0.09.49.tar.xz 369304 BLAKE2B 48b11df90563ec7d09e84e441039366bfca9788af5079ce9bc921370d78371638ff9a9fbaa7e623eefb343b5c19b55a5e4b9bb9688898733c0452b3e2b9549e4 SHA512 b4eb93dc2d015766da1361840e4880db83a9e9297d4272383abdfcaeb26dc8437c3dc0b007efa5c12585bfaacaa2ae255ed52c693f9e8f6595a7294db48bc68a
+DIST stress-ng-0.09.50.tar.xz 372592 BLAKE2B 430e4e8feefb358d6e9445d2418356d306c978ae0e6521a8fa6f216cd2fd031569ce9359236080784682991d81a3d9aacc4cef54709fbed2d9a99d7154d9e6b0 SHA512 b52a2e52011d6fcc7c72ad12c6173c7e7e77028e6c90d2aef170235bfb5b9b0ffe7422b178e58d68c0239dc85cce59edb6a58b9edfea84aba2b24c995321d5d4
 EBUILD stress-ng-0.09.49.ebuild 681 BLAKE2B ae6167f649744ffde0c24168023506856601640532b063802f7e43579dbc050fcd5a0e5c1c758e52043ea22d45ffc970b51def5bdd2585a60ceb76975a7455c2 SHA512 e3ffbbed36df0df4f13dfa3a4feb71dfbda201f235cbbdb581074d772a4340a1ee019a5a2559a7e034995893a8955a5694cb5d46d1f1b3dadcabd649ad19c61c
+EBUILD stress-ng-0.09.50.ebuild 674 BLAKE2B 9ac6e39b960870a705e4649e41aa27aa74de5330c5691672adef956177cbf93943a1d7f8fc43dd17dcf4b4b4c0c30004d5a5be840ea8cb0ec8b157809583b62a SHA512 3ada71e65666907a5ac925323021a47d0d91c5560a8cd21c99fcc7e36641c493538819579edd592f029254ae5b666982ee20e8bdf94e5a788ac54c4fac19d82c
 MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
new file mode 100644
index 000000000000..791f599118b7
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
@@ -0,0 +1,60 @@
+--- a/Makefile	2019-01-02 18:19:15.000000000 +0100
++++ b/Makefile	2019-01-27 15:09:56.000000000 +0100
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -g
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -344,12 +344,10 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
+ 	@sync
+ 
+ makeconfig:
+@@ -370,7 +368,7 @@
+ 		sed '$$ s/.$$//' >> apparmor-data.c
+ 	@echo "};" >> apparmor-data.c
+ 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+-	@echo "CC $<"
++	echo "CC $<"
+ 	@$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+@@ -386,12 +384,12 @@
+ perf.o: perf.c perf-event.c
+ 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	echo CC $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	echo CC $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+@@ -439,6 +437,6 @@
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp stress-ng ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++	cp stress-ng.1 ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+ 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
new file mode 100644
index 000000000000..13f9d61038e8
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	net-misc/lksctp-tools
+	sys-apps/attr
+	sys-apps/keyutils
+	sys-libs/libapparmor
+	sys-libs/libcap
+	sys-libs/zlib:=
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	"README"
+	"README.Android"
+	"TODO"
+	"syscalls.txt"
+)
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 8861e40fafb2..b5f0a80fd7ec 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
index 18320008d9fa..da7906515a8b 100644
--- a/app-cdr/extract-xiso/Manifest
+++ b/app-cdr/extract-xiso/Manifest
@@ -2,5 +2,5 @@ AUX extract-xiso-2.7.1-headers.patch 437 BLAKE2B fbfcfe1d84c25bbb51fc60a20e1a374
 DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6
 DIST extract-xiso_v2.5_src.tgz 207052 BLAKE2B 36363ac23bff01c28ddfee46990cae5e193841a294549b1b9f29c401f833e42e5f92e0157aa07d1cb2bfe272eb25a0f96e3e285b6a06abc3a7d06868258cf649 SHA512 ae73d5814167894f60530f9cb88485a9bcc39a60da87ed20b8b579f8e3f91542df102c2f9cb868ce61ff61c1a5add63d4bec66097f039c906353762358760dec
 EBUILD extract-xiso-2.5.ebuild 766 BLAKE2B 372750ef7d28f4ef2a5a8753e73e2c63b81bbde68105192a87103c9673741a79d2d6c86e9bc759d4fc4d9a0179a916648542bdd1f145d7e3973405d24d10f6ed SHA512 e7de249b74bd03c75deb690237d761de455186875a98bdb0b5bd98ef2a3db78b43bf4de1c56f42bd7be2a3b66837543c933cc64eedb7d8a8ed9bea68ca6984da
-EBUILD extract-xiso-2.7.1.ebuild 847 BLAKE2B 915254e5ebc48cebc29fcc69bcfe23ba680c7a4cf2de9080bb2639d2f28d22d77afcab55ef9362bed93aa1bce2a34f753c85e8fdd2632269b1bb1136bef4ccfb SHA512 edbc8000e5646d31ed1449e1a8b092fcf298302ab41aae26d9d021b12572f6671c802682c3da883b559e5b22657f1f0503ec401bd320cffc4ea937475667b0be
+EBUILD extract-xiso-2.7.1.ebuild 843 BLAKE2B ac1e5f61e316dacec8c01c1264c98b361bca3dd8140b99b7aa14ea438cbaa48f6d33f0e358ec995172a99b05203e836e37fd86c7bdebf45402c5cefe259319fb SHA512 c5c85b1a93357df326eb4e04efdb604eb04f606301d8777e717bfffcf96f12b1447de5410d5b3dcced2d119c9fdac1ff3faaf2b53da842087867a69b1fb8f051
 MISC metadata.xml 350 BLAKE2B 59afc13240ce011a9b7d746219ef7718dfb00a442af68856661e5db1c2c37c53a988c71e43e15a403ff4817761ac7030f153d3c0cf0ad269b87be533d2863da2 SHA512 e91c8fdfdc4f353e817d510e79ce773dd332cb821cfbce9c893b9cb53cb0c75f3c915e7a4db6355db039adf5b311685b94f244549698778dc010a6d1cf0ffcb4
diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
index d7d153a3aa9d..7b9f9757945a 100644
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d6de858ef013..f254a0306edd 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 2e6fc2927f86..b8eea31bd456 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD acme-0.28.0.ebuild 1263 BLAKE2B e735418ba3c1a93fb9c4303991fc90e77dcd41bd092c2f95c59043682e33af1fceef60ffab3635d2b02f47fe47ae9a9c7f9b2e25ded5a0825a3ed0d4dc9fcb01 SHA512 0f96754b57b8b0af5d3c0708ab5be361a2b2b3cab5002c2d27bce20e1d45433b0c56823d3f79eedbc2476887dfd2125ce44385bec0583c255cfcb7f299154e45
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD acme-0.29.1.ebuild 1263 BLAKE2B 1ba41c5fde55e0926d7b98a6ea8991fc7dcaf9285cda1cf9191ba78c6a423ab46954173e31d768e215d43df9066c8b9c2177bb71a11d81e4f21ccd58035a8fea SHA512 420bbef6273fd518680b7a292b7a28d69dc68c2979f94c415b5ee2eba8b5213967048ab1e03d619bbcab6e0b9d079aa4f8e153e737ce26704701330642c471d0
 EBUILD acme-0.30.0.ebuild 1265 BLAKE2B 393a9517fb9eafff45a66ccccb2d2d3d86ea94e412b86530c5882ee79056635efcf8696db972942981e9fa47af51b19d339500c0e7251ed71bcb84449adc7df7 SHA512 67d7e6f1e2850828fa523438a0a292ec36e7f403651fa4f865820982783d8310a6e7a6caaf22bc4a6c35bc005c6d5563c752fe19aa9672ec463b296a2279bcb1
-EBUILD acme-9999.ebuild 1268 BLAKE2B 67c4ba32f3d774554c6e10fc7e0e9a5044149b602e07c739f04db8ef14cfc2e9037ea2e2f14e48cbe6e0e0a987f8bbaf3f5096f918ac78c0b791194d48adfe4a SHA512 a65c13409ba08c7a97e4a856c6e2017f73b5eeb0a7a4d274c2501a67e265b0d68af7dac04ec0ba363a993a64c9670894eb2f532517ce043f95f7bbc2549363a4
+EBUILD acme-0.30.1.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
+EBUILD acme-9999.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.28.0.ebuild b/app-crypt/acme/acme-0.28.0.ebuild
deleted file mode 100644
index 4c81e8bdcdbf..000000000000
--- a/app-crypt/acme/acme-0.28.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.30.1.ebuild b/app-crypt/acme/acme-0.30.1.ebuild
new file mode 100644
index 000000000000..cc94bdaee734
--- /dev/null
+++ b/app-crypt/acme/acme-0.30.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index cc2960bf38c0..cc94bdaee734 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-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
@@ -24,10 +24,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index dbfef7ea99c5..ff8478eb6788 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-apache-0.28.0.ebuild 1078 BLAKE2B 27a1ca945009e85e65762e69b69c76edb574f64b53856e8ed285560d1585a62f25a6e0198905c5ad69115f40be0c37ec4bdf8687761ea0e936650334dd8a5001 SHA512 c29a7fcad1f9696d3c2d6a1a1e24d55d23849d726f8deb6858712e197527df72503f29cea7bac82171902609cd95b488870a80998ff984fb97454d0e619dd96a
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-apache-0.29.1.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
 EBUILD certbot-apache-0.30.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+EBUILD certbot-apache-0.30.1.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
 EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild
deleted file mode 100644
index 2ae0df4119f9..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
new file mode 100644
index 000000000000..b6c158fb2f52
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 8969de9d7d70..6b746174a536 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-nginx-0.28.0.ebuild 1012 BLAKE2B 3ce93c595046b07cdad135f1f32d63ef4fd651113c5fffe1308840d030065f568279fe20d709f39bbeaa7f6f9adf8699334f3296a88a42a447a22e399a9a9635 SHA512 48eefc48703ce39e925915ed0011ec3601f945ff675ea5fa09d09ba213bda5496337e4c4209c75c0b173ab0075737f564437ca3feff753f27350790f74237aa1
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-nginx-0.29.1.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
 EBUILD certbot-nginx-0.30.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
+EBUILD certbot-nginx-0.30.1.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 4b719b8703b3639e58ee36c5c0d03d6e5890a5b5c9848b1dc13eae93fb2bd542f8de9f3ddc1bb683d88481f851ee2594987868d519cc59fc8a4cfb8022aed212 SHA512 5beee8a666a3dd36a13b83e65616b6a0f3b11dd90d98a360447807e5b7e02b4a0029f4221dd0eee842a9106255c1d61958373b0c2a50a1d72cf707cd2ccd0e1d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild
deleted file mode 100644
index 6b6c1d3784c8..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.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
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
new file mode 100644
index 000000000000..b84d186a8cd7
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 56a26bb60552..84f5dde73394 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-0.28.0.ebuild 1262 BLAKE2B 10b0b4238f94daebe0f2beb7c51fd5a0e164745411f0ba139f41b60389370e5cadbb14e6863c9d200ff71bc460911b83588d87c428850c8e78d17b505125b7bd SHA512 978d9e2aa68a6c0d19812dab857bb5dce04c9aad45ad247a0e24a403799e8d348acfd2879061868016b3ef6b3ddd34b43bd7baf00c52c357783e3b121468f86f
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-0.29.1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
-EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B e4bd0cd95b5c26602e0b81ac96ff16fec065274b9be1991bd3422088ce49cc3574d7739bc9a701bc9025738d28f037419eb099f97bf96168b1e5d5774931231a SHA512 8b40d7de6b2140aad5d207b86327b16d70502bc0137c5035c2926c65d3a7bb205ca00b8143fa10d4d98457290f57a76600c7345740551874833afb9eb9db666b
-EBUILD certbot-9999.ebuild 1264 BLAKE2B 52ed04c95b7c55e6693acf9dd4699dc781d62d34344f5700b20b64d89ef26fd13c5dab56686e3c136068b86f6ff28804d96f146cd5e067455386b4c4fb86f3a4 SHA512 01de2ba9f1bef37e6d7383aff36af69fa5aa614862909b8a97f9d00708e5e1b4026499ffb04ba5052a363f35a260c7f177e2f221e9f7b5b173cdb011558dcb1c
+EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+EBUILD certbot-0.30.1-r1.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+EBUILD certbot-9999.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.28.0.ebuild b/app-crypt/certbot/certbot-0.28.0.ebuild
deleted file mode 100644
index 23369bbd4ef0..000000000000
--- a/app-crypt/certbot/certbot-0.28.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.30.0.ebuild b/app-crypt/certbot/certbot-0.30.0.ebuild
index f5ff7c45897b..7dcb4fadad64 100644
--- a/app-crypt/certbot/certbot-0.30.0.ebuild
+++ b/app-crypt/certbot/certbot-0.30.0.ebuild
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-0.30.1-r1.ebuild b/app-crypt/certbot/certbot-0.30.1-r1.ebuild
new file mode 100644
index 000000000000..7dcb4fadad64
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.30.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index f029016bfb6a..7dcb4fadad64 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-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
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 43d4b1c06d2e..99e9b5f74101 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 1893 BLAKE2B 0a79b21a6797ec4b833b2892632a6597b98db2a6d003abcb98e49cf6c27fa82c7d428ec6c2f63dbcad00a16d4aad52032b8539088bd784e9da8012645d693528 SHA512 cd974cf395b549c1b80a727c9d240fceb75783232fbfc864c9a823be43ffa38339ca40d32473ab29e44b2c1f60859dd5df8bba1d0f51057ebff097e180a08747
-EBUILD gcr-3.28.1.ebuild 1898 BLAKE2B 47fb703bf73521ae6793f28683f3f4308bc1f3097f19e236197a90929d49561bfca5533cdecd8945d3bc80100e90967879e8f866112626b7f4bf7299aba2f6c5 SHA512 3dfd706c254795d9e6ed3911d125d6950032c7ff6ab090b717089b4605975dbb5dca5947fa70bbee5a2864c35cbd9d9894b82049d4b714faca553023d7050790
+EBUILD gcr-3.28.1.ebuild 1900 BLAKE2B f5e119e17247567b57eb2e9b3bb0bf0fb9a0124f4225aa436ed31002a312a89660617ccd5599ee11de19ff30d24a3411e69f10c3b6811461983b95435d5c65f6 SHA512 ea0175fb3452ed095125cecabcb77c2645365ae21a6abcefae74575b970af7fa977616327fa0e9e6fb579a64ce9a703e135d84d3c4ccb55766a8c86962959f2b
 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 58b6d1814b0a..74a0d4fdb650 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit gnome2 python-any-r1 vala virtualx
 
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
diff --git a/app-crypt/openssl-tpm-engine/Manifest b/app-crypt/openssl-tpm-engine/Manifest
deleted file mode 100644
index 9361d775212e..000000000000
--- a/app-crypt/openssl-tpm-engine/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openssl-tpm-engine-0.4.2-build.patch 317 BLAKE2B e9467e78d4db86a19df11acf51ea479ea0bc41be9b11aa5d0f120fbda203c27efb15227ce5b2624f04a8933b4618b6f53068b61bb380039a67b8d89718fa6188 SHA512 ef62d70d83cd3251731686e6132cb287b02c1416f59bd1c4ca678f6702d61f505a8b10af387041ce569ea07e270e97983cbb7e00124b8ad4d7eaa1cf01d800a8
-DIST openssl_tpm_engine-0.4.2.tar.gz 528196 BLAKE2B a034c25df32db53775144ffcad74f421176e5abfee346dad3159e8d7a1fdc465421a549a71a5c2a5dc7b414e578fb8eb6b3522e4956a274f5c31635f5a52dcf5 SHA512 376f2aa87ab10d4a77bcc363865238a19e6dfcd548eb1f0780ee223d57d90ebfe7046308757836b76e7f33f4c30f98c0d82126b5e0e0534ec57087384e584f95
-EBUILD openssl-tpm-engine-0.4.2.ebuild 790 BLAKE2B 42e1f23e5838297a9e40068b4df4910622e4c79efe2a3645ad232f00a1da6cc4cc2834bb5411b32fbdb42c9105c0fc4c8ea1b303c2ecbe49e66076474ce3df41 SHA512 4f783c9188fdb340592098e68f595fecd220a44b855d8596bbc65ccd2e5f6ce9c3c8371cf20c1f05ba07acad0ada924a1cfae65f663772ada175604dd114dfd3
-MISC metadata.xml 318 BLAKE2B ed3850eec8c06dbecc55990dcf55c17afb0a4e0e4c3292008e96685c507efbc42797715b988d459fb9b42dfd69c7cb9092e62256b49c537ac74154bf09e4f5a6 SHA512 628ef47a6ad964f7b3ebd288e3ad423192970a060bfae6e95625056d6b1a49c1d36d3f8001ba066a356a9d63203fd4b40d0ee5c213f8735e0e8d736297e6a721
diff --git a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch b/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
deleted file mode 100644
index ed32ced1b3e5..000000000000
--- a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6695656..4932fae 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,4 +10,4 @@ libtpm_la_LIBADD=-lcrypto -lc -ltspi
- libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
- 
- create_tpm_key_SOURCES=create_tpm_key.c
--create_tpm_key_LDADD=-ltspi
-+create_tpm_key_LDADD=-lcrypto -ltspi
diff --git a/app-crypt/openssl-tpm-engine/metadata.xml b/app-crypt/openssl-tpm-engine/metadata.xml
deleted file mode 100644
index 7b14326dd1a6..000000000000
--- a/app-crypt/openssl-tpm-engine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">trousers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
deleted file mode 100644
index b82881e034e4..000000000000
--- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/-tpm-/_tpm_}"
-
-DESCRIPTION="This provides a OpenSSL engine that uses private keys stored in TPM hardware"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=app-crypt/trousers-0.2.8"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	openssl.cnf.sample
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 81bb6e587a15..88f39470e60f 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,7 +1,5 @@
-DIST osslsigncode-1.4.tar.gz 96512 BLAKE2B 8325153d16b7ad5d0701daf3d5d446bef498aaf45b88a78d5472d86c0899a73bff2350c224f9f3e35475d5dd72792fe24328f4710d25984ae23c5f83c6fef967 SHA512 89f82b5cbab5952b7bb0b1a3ea230db0c38d171924e5150e9cd157158e52d312cc10093ac719265d03a097f995bd3a438fe874c50263659859c625482ef0239f
 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.4.ebuild 569 BLAKE2B a65ef8297b8e864a0e6e9d429370dad60af3bace297e23ee651e26156fba8eef12d0f532f1720c0c5160d050f0f5e34915973372181e1723a32f7e7705ddbc18 SHA512 633f36d45f39c15a4534a36d7a3ddb946feaa72b5108fa7337473e96f3d8ea3580cb5d93d91fe3fb4c45f4e3db9bb8873c2f5bce152aa0e8ed0df8287f158d58
 EBUILD osslsigncode-1.7.1.ebuild 566 BLAKE2B b1c16506dc3f8bc5365de9f1012ad43e3f7d24c612b2f165b6a446531e240344a83d92485534e2e164f0c1f0bc4db1e5b339642e206dcce08bf9f9598a7e24e5 SHA512 00925defbd2447e2c4177624d39bcaf203f5600d73eaf6e15fc111119b6ae2a704bf53e7d020b88598ef7709d866b08affbdcac730430de9986440123e5dd1c5
 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.4.ebuild b/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
deleted file mode 100644
index 43d60cc9620a..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://sourceforge.net/projects/osslsigncode"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_with curl)
-}
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 133788f980cd..8d9cdc43ce89 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,7 +1,5 @@
-DIST paperkey-1.4.tar.gz 259446 BLAKE2B bdc011cfefb7fb6b6359bd1506825d4a65b0110ad302671aced6551bfd54fe4588d4adcb35159e9b29c0f056a1d7e0bc932ac1223b325ff4f04397c1a1d0b797 SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 DIST paperkey-1.6.tar.gz 271424 BLAKE2B 625a26bbae93122acf553036e902421ec630f6f92507b1f6dd231e970fc8d94a9d7017018bb783f934a37577de3e0c4f1fa68ca359c3de06f1a87590c188d266 SHA512 a07fc22bf56cd9524ecba61d1bf00102e6e97842e219682771187a2a2327c9daa885d457417bb2ea960f5ebd66bd711fa1d86687fda159647ff47980dee21b01
-EBUILD paperkey-1.4.ebuild 342 BLAKE2B f0d8636fc7b87828cf0b9c1c4e01ec5043f4cb7c53a6fcdb269e209cfd26e2c4e2f13d3053d89cbe093391d925219b46db3e91b5395501ac5b975caa71f4732e SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839
 EBUILD paperkey-1.5.ebuild 350 BLAKE2B 8476d7e01275eb1beb1ff2833c9d497ab229256e62e6778df478ad29eba3a54110257d22aac315b0f4bdbc3bfb4fa20f5384ef00a4898a7705775c1d110a4809 SHA512 215a9f17c548b6254d37a6f9d9faaa335916d37bd13ec262dcac2d663e66b4de8730b34c70bd1eb6108149afde67ded43571fe2e8e9c5b8950b4ba2c342b03a8
 EBUILD paperkey-1.6.ebuild 337 BLAKE2B 3f58078909d1f643b1920527e2680daf1cbc87a01e9c3bb4ba52dc20039e1d1bc13a734a467a83c697420f94eb3a812369ae4d2a75fc1858f458e31fdf5bfc30 SHA512 8e579362c86ef0b53c7c824ca1fa33916243580ccbdf4676e96fbf56433fc95c8d9a872c054bdb1ebbbe000c9c17a9a3355679486277b21e6324194ba2925b77
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/paperkey/paperkey-1.4.ebuild b/app-crypt/paperkey/paperkey-1.4.ebuild
deleted file mode 100644
index c9c2b53e63cb..000000000000
--- a/app-crypt/paperkey/paperkey-1.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key archiver"
-HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
-SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="README"
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index dadfe6583cec..e77204791e51 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -5,5 +5,5 @@ DIST pgpdump-0.32.tar.gz 65444 BLAKE2B baa7d9077799f6295adf2927933f1ccb466dd7afe
 DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
 EBUILD pgpdump-0.30.ebuild 552 BLAKE2B 7d1941dff7af58734a07664c8cb2ea84187ec8faaadee8a83118a5ecb1b552941858fcf1c6cbb5df83730ea481af2d37ab3189fa751030457874498bcd705cf2 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279
 EBUILD pgpdump-0.32.ebuild 528 BLAKE2B 77bc198cde30232d9d4b37928449b704857778f1b54dfc2bd4c23733afc05f19c7229f6a431ce0ac761e71a69d772575c316bc4ca8fbb49d298db85f96b1375b SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9
-EBUILD pgpdump-0.33.ebuild 528 BLAKE2B 50a12fcf48bbb498debe29c1ee57ba15d83fe7eb0d9d6488efb49a0da5d949e03696ef97d5bc3c320c34a7ab5504f65663b6772ef58f72970defd0cb0362aff1 SHA512 bbc1474b856606b888002043d231d2a1fb082c13020d2ab58a5064baca69f770e31a3a358fd049b62a12dfbbcf68073ee7014a39d51467b06a50bf29a8692183
+EBUILD pgpdump-0.33.ebuild 523 BLAKE2B fe7710582822ece84c4a828479bf47a76658833b62999c5175f76c84de7f475fd46c3c6e99696108590b5cad1da56bfb6b8e1413fa13db8b8659fa41632b9f4d SHA512 1c1398255e2a763749bb8fcfe2194aa3c15282eb8ca13e75c324c9a34f87a1b79ada228bec5f6417ba82eb7b6a61da4880930a378737ade2c0f335c46272b521
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
index 38fcf5506fc8..8ff83e09376f 100644
--- a/app-crypt/pgpdump/pgpdump-0.33.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.33.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://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 483d76cf0745..ca6abaec814a 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -2,5 +2,6 @@ AUX tpm-emulator-0.7.5-build.patch 1150 BLAKE2B ef771dc31982c3b288a61bd0537df254
 AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60c531e874ef6f3b4d00319d7962bd321f8530289c797ea110f6cde91bc6af338e38be7d96f71f6474cb SHA512 824d35e037f1036d53353bd0e2bf9136cd94d07a71df9ebdf32a513ff53a47b25e38e3b760e58c18909559f1adbea2faae615c25f2cf9f1df03eef8582648bcc
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
+EBUILD tpm-emulator-0.7.5-r1.ebuild 1714 BLAKE2B 9859186e9745a64ccb8cc65d4a3aec3c6cc16a4481e453cfa2e6611687892734be5d878a62039c3f99d00b515c7391e40bb86c5ed285d6063bb9c1d360cb19f7 SHA512 79d8f027b36b54433aad52c3fe8dbd8bfa3c2a2e16b811b9d3f78571c13e51a769816dcab6f44e75254da5f964e81ede9bc04f3915bfbc7bc72e6ba4402f0561
 EBUILD tpm-emulator-0.7.5.ebuild 1858 BLAKE2B 9f11f93bc01efaaeeca6f200b0705b9093c3b109e4af46502f187f079993ce735a1653d101561ca66b12444a63f67363198a9f890e7af954d2d6fdc47725f64e SHA512 2150882b2cfcd440ba40688683c045c25337c570059d11cc37be4fc88723ae5f617cf2de452355f79fb964e1cc66445271e8cc0bd9e10df8c25a212a5352854a
 MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..c4ca2397fd2e
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MODULES_OPTIONAL_USE="modules"
+inherit user linux-mod cmake-utils udev
+
+MY_P=${P/-/_}
+DESCRIPTION="Emulator driver for tpm"
+HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
+SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="mtm-emulator"
+RDEPEND="dev-libs/gmp:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
+	if use modules; then
+		CONFIG_CHECK="MODULES"
+		MODULE_NAMES="tpmd_dev(extra:tpmd_dev/linux:)"
+		BUILD_TARGETS="all tpmd_dev.rules"
+		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+		linux-mod_pkg_setup
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMTM_EMULATOR=$(usex mtm-emulator ON OFF)
+		-DBUILD_DEV=OFF
+	)
+	cmake-utils_src_configure
+
+	use modules && ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use modules; then
+		linux-mod_src_install
+		udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir /var/log/tpm
+	fowners tss:tss /var/log/tpm
+}
+
+pkg_postinst() {
+	if use modules; then
+		linux-mod_pkg_postinst
+
+		ewarn ""
+		ewarn "The new init.d script does not load the tpmd_dev any more as it is optional."
+		ewarn "If you use the tpmd_dev, please load it explicitly in /etc/conf.d/modules"
+		ewarn ""
+	fi
+
+	einfo "tpmd socket is located at /var/run/tpm/tpmd_socket:0"
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index daac842ad4e7..ffd273e5e469 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
index 56e9d5b13444..c6b0941b066f 100644
--- a/app-dicts/aspell-en/Manifest
+++ b/app-dicts/aspell-en/Manifest
@@ -1,7 +1,5 @@
 DIST aspell6-en-2016.11.20-0.tar.bz2 184650 BLAKE2B 2ece9532bb14243a1470048a16f29df2e90fa6f9399c9c66831f7f4a743be8d6c257a3cd36e5b506ccf8968f03cdd0dd785302e135007e9dd23f8c58767f1d39 SHA512 acf4c0bac9dba5b001481da159768ee65decea480c6c601ca0733091558406a84a7d8efb47c1806b032d8e22e96927787a29f8e4e93563a01361e4cfaf3a3519
-DIST aspell6-en-2017.01.22-0.tar.bz2 184409 BLAKE2B 8a2e214996f412943581a2ac31c315e585ba234484b44d7563b27338dfbbc2947d19854fcb5417736a1c32b7fd8d6b033efc86d2a6dd81256218a72df09eab86 SHA512 2721ffdc7f2823b9104a0d7cfa10d1ba9581432dcbb2584b9519e56a621520177eef55ea5bf9803503c429201141ce0ed4001e75c6b9385bca2fbf8986617a66
 DIST aspell6-en-2018.04.16-0.tar.bz2 185332 BLAKE2B 98b3d39463a26473450778d3f3763eb11739deb1d5d28db5f7bc0ef4dbfa977435fc0721d26a39ce2bfed9564985a62fd199ec2ba59154a327b6429109966d6e SHA512 70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2
 EBUILD aspell-en-2016.11.20.0.ebuild 618 BLAKE2B b92d6905d092d844450bd5bda9a6c7677a80d234035c2883a9e93d0c4f201b39f7e4b526bb252f098cce4d0759c19caaa1210a56b210020feb95aae9623ef2c3 SHA512 ff683fd05294622b8999eeec2524f64c2ca070ce501426e08fe1b1d5ad508bdcbcb9a86d722eafa8383b8c7e121a81b2f95a4bdcffe06d18ccaf8f380139a9a0
-EBUILD aspell-en-2017.01.22.0.ebuild 628 BLAKE2B f3fd0e118d12fd561ebb8aa9380f95106a5db2a5b67ded343c390e7dc97553cc9e0bf9449168e80bc1ef5192e412655677e6f4496af47b6a8a8d3677f9af8512 SHA512 1acc4bbb00700bcf2e555e742c419caface629647409263782f9ee0669499bca3822fa3913fea935998bf2f2df74bcda6d2cb38efe3b07669cce197c5b215836
-EBUILD aspell-en-2018.04.16.0.ebuild 628 BLAKE2B f3fd0e118d12fd561ebb8aa9380f95106a5db2a5b67ded343c390e7dc97553cc9e0bf9449168e80bc1ef5192e412655677e6f4496af47b6a8a8d3677f9af8512 SHA512 1acc4bbb00700bcf2e555e742c419caface629647409263782f9ee0669499bca3822fa3913fea935998bf2f2df74bcda6d2cb38efe3b07669cce197c5b215836
+EBUILD aspell-en-2018.04.16.0.ebuild 621 BLAKE2B d02c98ae11765e78915875045d8fdf14e5737585fc87657378a0ff787aac9c07d6c726ff0b3d482ef8df5481cc8aa22ddca06b8d0edde05639fb759477e4a523 SHA512 a900f8e22cebd111e7f25d125acf5af553aeee9a162a88ebcf1ea9c6ab98b6ee10929150fd1d6574819244519c1d7130c9b68a454940aaafb16061af005d0d23
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild b/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
deleted file mode 100644
index c97317a58443..000000000000
--- a/app-dicts/aspell-en/aspell-en-2017.01.22.0.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
-
-ASPELL_LANG="English (US, British, Canadian)"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1 versionator
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
-
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild b/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
index c97317a58443..d3d77afcb65c 100644
--- a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2018.04.16.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,5 +11,5 @@ inherit aspell-dict-r1 versionator
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
 LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
index 8cf198bb2245..af2513532b05 100644
--- a/app-dicts/dictd-vera/Manifest
+++ b/app-dicts/dictd-vera/Manifest
@@ -1,5 +1,5 @@
 DIST vera-1.22.tar.gz 229397 BLAKE2B ad3e195a10a03191292c0161b0ee98c591f80d1cae3b4432a2b953451f6257c5583c13aee14e6cac48551dc33bc171722ed202d3c231c68314f91464b7166a02 SHA512 3fe10ae52d8aa593bc4ce23eaffbf8d1cbc0127fcce3538508389335a9e1bc2964d1ca8915616b0711cc9da36f8ea231e050dbeddf75bef799f21e538731234a
 DIST vera-1.23.tar.gz 236439 BLAKE2B fdbecb4bf2abdac0a858be29fe544474dab69623967e2e9c8f8e02188ce7b8a8f39a099bcf7ff6e0d846afb0ec0cedd8e4ec64ba1b27a66eee963f3de088a4c1 SHA512 f16f2d24715131f60238c49f43d79bcd02b47c8e999de381c2139289f05859659a9f3ae79e3ed8d4b3dae447666cb8391ad7a072dff91275857b901fd0748c78
 EBUILD dictd-vera-1.22.ebuild 882 BLAKE2B 9b0658eca1928a339f695e2ea505948fe469562c714dfcc2c2a8364714be775d50075073f08aa4156e0a2e3b46b4d5312199aa08e16c09dfdd68ad644527b4e1 SHA512 3dd6091b4d7f4c13c98811c89b486eec2ffa7b5463f54bab784793c9d33ff1b266f3fd7ef2ae130a7d8408e0e0608e4d05e13f2e312ac425c4c68a8d4d3e336b
-EBUILD dictd-vera-1.23.ebuild 887 BLAKE2B a3f9a34da68241ed3545ad47447875f234852d5d1d01992cf5ed9983a0c5adbbe3a455cfcc9f110568d14e4ad1b67df2e933f3e2aa9df0c536569eb067750bcc SHA512 6772fa5fcbb49054362a02f1f8e549c7043268618acf4c911fef1e476ee2d5e97c0321246da11a54ba93b28ff81e7877f4d57927979a736f78573885da12ae83
+EBUILD dictd-vera-1.23.ebuild 882 BLAKE2B c9d863c4e819e15a70b0d8d35f0c64d0ee4714d0bfe36107e560a328c0d50b8832a47826c30baef8664757eebc0ff792918b195036d3b2c8ae80688a38cc302d SHA512 620168df461b803b51f8a4260bf59bd162919a2cfaa39a547daaa778e0eed368f96b9c4cf29b14378e1d7a0a80ef76f95012d3136bb6b8f8e96f52e242b56647
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-vera/dictd-vera-1.23.ebuild b/app-dicts/dictd-vera/dictd-vera-1.23.ebuild
index fb0b405a0537..59ec595634f8 100644
--- a/app-dicts/dictd-vera/dictd-vera-1.23.ebuild
+++ b/app-dicts/dictd-vera/dictd-vera-1.23.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="FDL-1.3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
 
 DEPEND=">=app-text/dictd-1.5.5"
 RDEPEND="${DEPEND}"
diff --git a/app-dicts/myspell-da/Manifest b/app-dicts/myspell-da/Manifest
index ae7604a5bb69..28ce4179f46c 100644
--- a/app-dicts/myspell-da/Manifest
+++ b/app-dicts/myspell-da/Manifest
@@ -1,5 +1,5 @@
 DIST dict-da-2-3.oxt 1861736 BLAKE2B 18c22f55012a9701cff1ecadc53dece7cdc2e59619c1704159343960951096c49ab970bb248d844eaf24379053ea7ac35bd89b4741aa54cfb4b711e99320b256 SHA512 28428096ba6d79801fdf47a61bedc06c9ee2d667ae32307bd57f9b7cdc1cb06e84ac2bd78fba11c87dd35dc88d78c5e0f81588e5145267577ca0992b35ea301a
 DIST dict-da-2.1.oxt 1695432 BLAKE2B 284129ac82ef9b2847b533caf80e8f26cf5a3e8a8e0b65b6c56f1c5fcde0b14f2b1fa717c5e1ddd1c2acfaf4e866f91fa8fa6820b5ea493ef7c67e73bc79a369 SHA512 4dab6e4dcb2cf782ddff11126e4eebda9281c45aaf480f6c8afb655f59c23bfb29f17d9698bcfaf04b0c95d20b897c1401e363337726947aedc2411927cf233b
 EBUILD myspell-da-2.1.ebuild 683 BLAKE2B bd850fa5cdcda80f8d25e1f24e5179a176798d724b645f06095360058ba6c3d87146982a71dc752f98290fc8338051c2475fa99721fe73647deb933cdaa3ee35 SHA512 581f58fbd7c5b4a7c21c4d0ff84a8642227ad80745db791bcc9d109a79c961da14ca3d974a79fa83ee7717ab02fb948398f3c06aa7cbf87c804157c28829dfc9
-EBUILD myspell-da-2.3.ebuild 827 BLAKE2B 341b8be8e9a1b03a06f5285622d205bd9212ce12be64916ddde8149d9c115c2f6138c1055a5490328199ce5d77a3660cd571c4755b0ad24cba29b52c85946a65 SHA512 dd96e171b193feddca7c607ff3dc1912038adda0c9be53a688336e524571495e4541938e23f369f4af43ba3d4fa0bbf25bbade15155f21cc16c73c002235ffa1
+EBUILD myspell-da-2.3.ebuild 821 BLAKE2B 8bf4a922277217875f24cdfd320bdb45ceb18b10c893e3ab864ca2b70c715318b2a360df202b980a04a56ecf20647480a652517b3d317fbda9323e40be46e6f8 SHA512 d46a10e23022f12164f165614ca307e6fba8322b015b02d3f8649f88492e37622b8c391f31da38b1c005851809aafe3fe572927e86c1ecce4483871fdbf60554
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-da/myspell-da-2.3.ebuild b/app-dicts/myspell-da/myspell-da-2.3.ebuild
index 4cf84f6b5f7d..d36f9e4d649a 100644
--- a/app-dicts/myspell-da/myspell-da-2.3.ebuild
+++ b/app-dicts/myspell-da/myspell-da-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
@@ -24,5 +24,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-di
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-ga/Manifest b/app-dicts/myspell-ga/Manifest
index abaa2e5ed99b..1ebeb2db2b27 100644
--- a/app-dicts/myspell-ga/Manifest
+++ b/app-dicts/myspell-ga/Manifest
@@ -2,5 +2,5 @@ DIST myspell-ga-20160213.oxt 8475451 BLAKE2B f8fbd0c763df5022142ec824eb7771ee14d
 DIST myspell-ga_IE-20060316.zip 256050 BLAKE2B 0cdbf120951fe300d10e0fecbe53041818fdbc5fa4a50a010eeabfb482042a2f9d1e3b68618df01d20eee0dcc5bcc799500d2efaa680116fb55e27d41be9d150 SHA512 6eb181b6869d25388951640757ded3fd44738486076ca16fd8c42f52691814471968de2d29b65bb41b9285d466ff3b2cc77d27d9ad38f1275d3309b20ecdee20
 DIST myspell-hyph_ga_IE-20060316.zip 20249 BLAKE2B ddefb1107ed50072d92571e188ecee855fbd49357160ffc9311fb0fb878759147fb1b975d0c93fb8df1a31e30d3fff8e383bbef0c8bd6a0c7b70af8659001a52 SHA512 edd314e32b39e08be9cd32d55af4289f74e1b6700b34a631f47174ef9c55cd809213d07e1e1b8646f7e1260ab408bcb5dfdb5a25d8da735596901b358d8b1dc1
 EBUILD myspell-ga-20060316.ebuild 584 BLAKE2B d226e7fb3a2586afa093e25eddbc35f5839d3e51652af174fe74645f4af521386025a2a6c9e2a5b87d8a84d0bd91860f455d352d0c5969014a4012ea49d7a32e SHA512 cfdb60a13821a198749589b7df27d8a9826e71f5d409d70a39d73a23874ac8d25184a26b8b7ff4876ac802f87599800abbcb0c55718308e5fdd8ba201af355bf
-EBUILD myspell-ga-20160213.ebuild 668 BLAKE2B 3a48c2eaacf36773c3779dbaa19cffcd106ac9bae6efa517dcf3a5e888d45c4e274ffa19c987d6d7b8fdce6b9ccd8532aae069dabb1be6497e10c1e5d16bf1ac SHA512 0e944d265cfc65169115f38702d6168524a7e22ce5849898b34613e2cd9540c0b3012e8b3a6ec510810c1eb20be3e55622033e9e180705b8efa804986ed401c6
+EBUILD myspell-ga-20160213.ebuild 662 BLAKE2B bcf13c8759cd679ffe5b832ae03cee061508ef897750a3fb489ac466138186fad6ec75e0db0da2926faf1afc22df288d07b37e57851fc1d9c8c5868eef1ad7ce SHA512 4f095ccfd46850b7b96d37ae1633041766a48fed3933e9cafe0f5ff248f844287632f60fd220cabe55e9db993f47a8e173d1dd3b3eb876968e9d925e23079227
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
index 29484ac3f0c3..3c254fd6cc33 100644
--- a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
+++ b/app-dicts/myspell-ga/myspell-ga-20160213.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
@@ -25,5 +25,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> ${P}.ox
 
 LICENSE="GPL-2"
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-gl/Manifest b/app-dicts/myspell-gl/Manifest
index 4e48d5804296..bb569c8580ae 100644
--- a/app-dicts/myspell-gl/Manifest
+++ b/app-dicts/myspell-gl/Manifest
@@ -1,4 +1,4 @@
 DIST myspell-gl-20131013.oxt 771221 BLAKE2B cee0815ae69d00334cca4341ed5c694c3d8f97a3904f5427b7deb94d706947e536adc890b2bfbff41c666b8ae6c5c277edc4843f4c4ef4131548145a42b2313d SHA512 ae13d7137e6b8e51570bcbeba00f73d9887a24556c2409249a39858d385168a03aff3ec2cf3222cad50686a4169debbe310a05ce3bd40aaab408de3ed01885ee
 EBUILD myspell-gl-20060316.ebuild 853 BLAKE2B 06bcb1ecbc191afd72455973fc6f0b555fb76a4a1e8da5b9842f73a248eadb7beb2b786d2329a09f8f0063cfa1389f64e2efd16506f11ae9d3a2f48e2b49455a SHA512 ebf0df5e7af2e436e5b0ad22bc6ea3805e917f226ea049ecac0843c41593024aa0acf6d0725361d70467331a8387318446cd43b41347a1f089827188d4e39482
-EBUILD myspell-gl-20131013.ebuild 655 BLAKE2B 03826f8e4cc9c4c06a8b788e956df4f0f9ff83f0a30ae5b9ae605a52ada9ef67142cf8f148fe74c578ba5627dc1c6cae5de3ded631d8909751e1f03108fa5f52 SHA512 1733472cc10c52939721610e7e36c89c96c8d39bc0911ab23b7d9e762a8ecfb3cf3f72f15daac773e0dbad6c51001cb569c8b1706861cf656d5710c992d93174
+EBUILD myspell-gl-20131013.ebuild 649 BLAKE2B eb77656057ec457d139a071a98cfd97aa14d44b352fb3b60163df2848ace615c7805915a5fe39c34a644ed79cacb2af28bf5dc9025a35cc9316c7b382c57ff2e SHA512 0a9a29b45d0e2f2be40b9d666d22c98cc047dcde4c90e848fe7dfc093db1ab504e74d3885c3d2591e9f1ab48f6b420e265ccc0f94e04bd5c12747461a67dbf6c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
index 8a64dfc62da8..0847d35b0aaf 100644
--- a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
+++ b/app-dicts/myspell-gl/myspell-gl-20131013.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
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/corrector-ortografico-hun
 SRC_URI="mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-he/Manifest b/app-dicts/myspell-he/Manifest
index 8944ce7cb098..063407ea2dce 100644
--- a/app-dicts/myspell-he/Manifest
+++ b/app-dicts/myspell-he/Manifest
@@ -1,5 +1,5 @@
 DIST dict-he-2012-08-15.oxt 882585 BLAKE2B 3cc76818f6f7cfb0cef72b5d944c2024ba7b3daa031b940965a850f0652f664a78039f29d8d7cc97a3b2dde0b67f203a5b6c6dcb80b2007de569f8524c6a2fa8 SHA512 418feb49dba0ec97b63c44909ca8d2192c4c78ed59b9440d3962d6e2095db11f03c3598533c8fecd9cf46f098e96008b8cc298172ab08cc6b24b7df5623438c7
 DIST myspell-he-2010.11.05.oxt 631099 BLAKE2B 8566a85b28da947896690620aae5b7d28eb430e421fe3e369c986996575b9b8806ab173468d47cbe5dad950f6d38cd4fd038e111c759d302d5552fb7ee6e038c SHA512 c6c4fe6a8b69b6898c441472ed91ecc8e03a02abe795895eb4dd4f06f2ae9a96ff809323922990d518a2f59218e04aaf931b278d0c76ee0b50e75af9a84aff4f
 EBUILD myspell-he-2010.11.05.ebuild 640 BLAKE2B fa49007a0e3d611f4711d3025c8b8f22aa118c48b47ed0f597d2e0ac25a3eba7cfe0c450a5ab06123b236afa82b003277a60faa8dfde1466a86f305050df1502 SHA512 b47e8e6ce1e20404ffa047165e74f4a0de83f7e87d694c244f90775ead4d62a3c9a22d409f3611fb85fa71f156c4092544b5cdbed8c00debfead49f03f4199e4
-EBUILD myspell-he-2012.08.15.ebuild 646 BLAKE2B 935b03383ca17c0d7c1585013492cb0eac69a150b6ebdcd9d06da5f9c848ac35bd780ce44012001cbcc16ac030916232bdad2e199f3f05e32aa6b3ab81fd823c SHA512 c39427ab08b956709d8734f9300797770d6a1891b4037976e4c6523cddab0c18be8dad4cf36a02daba7cf788c842c6aedec208e8a99e1d08b3bdf3a2fd332295
+EBUILD myspell-he-2012.08.15.ebuild 640 BLAKE2B e86d1500e20ce92f77f36f9fc60a9e33d2316b03726c52e1a707ba1d21e9f2ac23ea624817b447cdf6b847686122bc053488e79a57a9a186d343fd4f96b3ff9c SHA512 cf6ff591325c7081b8d409e4b11d8d60dd372c12f544a7409a21651af6aea1f6ad270584bbaa3e915a60f25b1330dce6e0b0be2c7d3e28422a24571a1b76763b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
index 5463360eecd5..cf4bd7d6033b 100644
--- a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
+++ b/app-dicts/myspell-he/myspell-he-2012.08.15.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
@@ -22,5 +22,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dic
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-hr/Manifest b/app-dicts/myspell-hr/Manifest
index cb789369ccc3..34df7ce2f69c 100644
--- a/app-dicts/myspell-hr/Manifest
+++ b/app-dicts/myspell-hr/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-hr-20080813.oxt 1808648 BLAKE2B f7944c0cfeb02c82dfeb82ceabd241dc192c1b16696b80d5e09aac2235d7d64e7a8184d52159678989e2f9fabb088d3d1ca2e4bf9915262ab6973e1680d48e0f SHA512 178a9e51ade7e54b5e32c9b0cb10bbb6e8da1913456d660f79a991f97c59aa965c2b17912f1910adfd6b8e47aaeb94ad9066bfad2e7ad038c0b739c57bd5c18a
 DIST myspell-hr_HR-20060316.zip 882838 BLAKE2B f3f15afcfcbb7e20e51208b6672d9c0005cc51ef347761970449a9c7384315fc02d754aac150e312cde548c4e6dc09bed8757edf3f0bcdee507052bd4cabd986 SHA512 48748d3bc3f796916ca53f4c106b1994c540952935643a2fa762099855d66ba5d5af1836762b3d86f6dcf28014f41806a23970bea98d08ec051f294bbf560496
 EBUILD myspell-hr-20060316.ebuild 514 BLAKE2B c7c5cf769006b7e09a840a99e8b2c5ec3e6ad5829df1350b6b74e1b9ef4fa749cb5fd8dde645cebabf13a237b2854d1b7881d72cd0d3233fb1be611e45c94970 SHA512 7a5b45f3352d094cdd22f0be8ceebd99085d739f8f0162941013fb6b1b8164d2469175e53cc5cfb3949fa0977f8d0cab342d0b352e501230059968bd8a64defd
-EBUILD myspell-hr-20080813.ebuild 601 BLAKE2B d4cf80a6bc819bb30663587b01e2575f5eb4ddecaa7514afe8f48672e9a61183adf9d3459bc430c0cb9899c397554aeed474a08e873ffcf5fab29c00f8ba0736 SHA512 56d537ca5e668f84b24727e01cc8d4d3af3067330925f5343547c168c210803f5e99c1ab2c169acd8be5929c8ec6beb87d77a328b85d78055786f132c25a32a8
+EBUILD myspell-hr-20080813.ebuild 595 BLAKE2B 50f8cc88bc3432e39cc0d84f533432e5c73828a2ef6ec3e387bf8abea3e268cf1e7abedd029eb645aac0aace16a57f1d125fed26e06efebe44a0bd6a1d432ec8 SHA512 e5d5f764ebff818a120a83eaf5aadee974ca7a0f4baa11ac389de215c1d2fd331e366ba8e291742a5e21b339824a1427a46ca035c5e9a0f853acb545907b7917
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
index 1b6e2ed545fc..cc0dd7884852 100644
--- a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
+++ b/app-dicts/myspell-hr/myspell-hr-20080813.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
@@ -23,5 +23,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/croatian-dictionary-and-h
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-hr.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-ia/Manifest b/app-dicts/myspell-ia/Manifest
index 2a16137a9f39..8dabcad89df3 100644
--- a/app-dicts/myspell-ia/Manifest
+++ b/app-dicts/myspell-ia/Manifest
@@ -2,5 +2,5 @@ DIST myspell-hyph_ia_ANY-20060316.zip 2364 BLAKE2B 0d71e8736900e51b2174dfc99dc33
 DIST myspell-ia-20140518.oxt 224790 BLAKE2B a35c1beb10858ef259f11766dda60b6311a25532e11c983cb75f6bcf9bd4bd21af34b9372ae1e9fc1f64228c3155433868d0388350b10ff47c096f4e11126a1c SHA512 12f0bb5f14f1a7931f04143a670782b5c4764dbf2540da144cd6f1343cd06eba030007108a399f550daaf1f2161831e8f20a7db363d6857639a23a03e644bc4b
 DIST myspell-ia_ANY-20060316.zip 182850 BLAKE2B 6e8c4adb78faf897dcf1deb529a2e8f2ecffbdfd9f06e945114de9bdbd1adafee89b27cc23b7ecf3172fe267872d318b7dd37046e693b0ba2a8d7088f2d93d8a SHA512 80be07c6ce8184c7005dba109ff089f888d653db2d2431dcadf296e9515ff91370380248405a579eaa410f101560e47cadf076533cda79e9e52f6fb12c98dda0
 EBUILD myspell-ia-20060316.ebuild 566 BLAKE2B 70a98e2f277ffa0cbe215b6224a5327fe57bb3941fda4d03550c81571dcd2f2a13b734691aea058d77ee8f5a8bedeae41226da60feeedf09129e8df38cb42712 SHA512 ff93fe1e8688535af7a9496d96e4c57ac202eebbd7a75a2ad3d9333f6e1ec42e75f8588d90a9126ee6e315ff83822496f25d2bc577ba475e93785640fb2d2113
-EBUILD myspell-ia-20140518.ebuild 663 BLAKE2B 93f6493f5c61e28b27936367936ffb5bd3fbc58c72f4acc88946190b7993b162787b9b7351ae0cb4f58b7f1b20433ddcbad1d82823d0a8f6a7a52e7cf52405a6 SHA512 c89916a7c59b5691bfb64db1e61b61f882fe0c7859baf3a303f378480b5fc5182d111ea2bb5539a3513aed43b7191bc386700f5272e9b9a28293b4e69e5e1f9a
+EBUILD myspell-ia-20140518.ebuild 657 BLAKE2B fcacbd3825899a2dc46eb413005ddf1481b4d6ef7af7cadb9f138fc511b8b639e6aae70b7ce7232e2b386f18a1b5d20deaad2b7f47d4b41b7b062c04e2cc6c93 SHA512 98c6b6158e8c9414741d4635cfa7b6dd00e38696784c03cc084264a3d771226a943f70697e1d8379f895657710e1e129d94ef538fb7305d56437e109eed1a62f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
index 3983ff9fc08a..3fb186887896 100644
--- a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
+++ b/app-dicts/myspell-ia/myspell-ia-20140518.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
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/interlingua-dictionario-o
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-ia-${MY_PV}.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-lt/Manifest b/app-dicts/myspell-lt/Manifest
index baf9442a4ccc..ce1569f29821 100644
--- a/app-dicts/myspell-lt/Manifest
+++ b/app-dicts/myspell-lt/Manifest
@@ -2,5 +2,5 @@ DIST hyph_lt_LT.zip 4839 BLAKE2B 01399d5e2d52b8654419a328e384287387ba7df1ac31592
 DIST lt_LT-1.2.1.zip 360373 BLAKE2B b9ccad4650c94e0a2ac8f07faab590de3781773b4936235741252daaed18c05ba1d3e58037d47d61e9faf3e0cf6284148f75155f9c2562e39fa62c141d99fb63 SHA512 ebc6e688bc94d3cfa4b872594775d6f62bfd9b1666765e189b7f47efa2c7ec27d32b4f49405cc9fb372ea071f5b2b685b800b949eec285a7d1fee52b74d82b31
 DIST myspell-lt-1.3.zip 339657 BLAKE2B 9549d1968d3b60a2b712360dab35fe696369afbdb34097eb7484ea0497b67becb43592878cec5e64691e0069babc9d56817b4d170dbb1ef092d50de64b076420 SHA512 e18f22efb665e3c4cfe0398bafc9e0626c4322009e4b056f3f5cb074778af851bd463be05c55e1bb0bfbc1a04d06d022a3aa37c89e7efac2aa38b525ab415cf2
 EBUILD myspell-lt-1.2.1.ebuild 556 BLAKE2B 655d97a618adff9e09be923d0bbc75148e1e2e4bbeb294ffbc6ca0fce7d68e0cfafcec8c169cea762e2ed6558d09e9c0041a7b2ab924a9424e8566cd0899f63b SHA512 5c396b6141732d03757a9a83d8e00057c486d248815f21db403608609eb3760e79ac40fc76f39a9616e1a1dbd7692b74d130562fc35d86e93e760b09c4829ecf
-EBUILD myspell-lt-1.3.ebuild 547 BLAKE2B 155b5a49bb8f77ace8b940fe6ffec80d83be0c91a198225538eaf89ad9cb8c8d8b6dc137c8525cc3607dff3e345ba6145681d8955d1b6ec4bd24bbd851eacd14 SHA512 8f446934ae295dd9aa1012b6023ebe49b1476b7d9cecf40adf3e6c06367990c0ca3521626109412925e7078e4a07b8205815df66565732034c1848b6c9c67048
+EBUILD myspell-lt-1.3.ebuild 541 BLAKE2B 66c03a90273f161257ce99ff9909a516ca19d3494bb64b532f8128391b61c118ebc3adfc6e2850ee04061c8c26a8f5474ca3de292cdc462f7c7e3695dfb2f864 SHA512 8eaa2f16c7f5e7076f0b09108e71c754e390595c21d1061d4a9e74df0cb4e44a6d0e21072df31aedbc2755316e4ffec64459024866b11e61dc4f49f124f28742
 MISC metadata.xml 244 BLAKE2B 1d2da72e348a40f2390d722aa2a081d633bb3f7c4269f9780eb6e092cc124abfe030e29f18ab119fd7df4c52cb2caee07d6d536bec2e9b84cd254bbddb28ed08 SHA512 e07e0b634f9300d3256fc47c9425afff7bbc9241f235830401002d55ce701e1bdfa1a45dd56c4c81307040560900a1768da3c82f0242c3b1d949446f259efa51
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
index 80b39b55093c..d54b0a43a3e4 100644
--- a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
+++ b/app-dicts/myspell-lt/myspell-lt-1.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
@@ -22,5 +22,5 @@ SRC_URI="https://launchpad.net/ispell-lt/main/${PV}/+download/${P}.zip"
 
 LICENSE="BSD LPPL-1.3b"
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-lv/Manifest b/app-dicts/myspell-lv/Manifest
index f5d10db3c816..3eb2eea87008 100644
--- a/app-dicts/myspell-lv/Manifest
+++ b/app-dicts/myspell-lv/Manifest
@@ -1,7 +1,3 @@
-DIST lv_LV-1.0.0.zip 369295 BLAKE2B cdff7bd2c595c8b349d4c44449d0b436cc7f83ae3dd95e19a3c19f96275ede59ab434d7f915ddf32c60d410cd0285dc70e19b5293f7f7722d76d87316492238b SHA512 c97509edc3e1c018f6a5237fe56d4fc4da4f18a69b3003284bbff6dbb13f57a575c59d0763266af2d83ec0cf51b0e8ae67b20a383f41251e0002cf01538b823d
-DIST lv_LV-1.1.0.zip 371240 BLAKE2B a8741b7ea9cb05e63bc297efa2f725469427e84c8448fec38faf501ac4b207c6a0ea4aa4d1d978f8426523bbde959c37159d12f1d46e3142f8570a85b4f61b6e SHA512 4083311c1f5afd315ba348f92a221155137f2d32c0cd3f8869ba43cbbdecb1375c8dc444ef2b70631a18265e5ec72517a9d6ca8cad7e5e39a570a98ee075bfe8
 DIST myspell-lv-1.3.0.zip 374356 BLAKE2B 6924d09c4a7f70e840dce48a0d5e7807bd3210a13d79c3c7daa6de89cf58acf9d38099b03f1c0bf0420144fd867d2b737167e248457cf4bccad505bc46c00e66 SHA512 fbb53475870cd0200403e75ea3f84c8534b4fac349093515821e98a8e1f3bd839fdec0543a2e4ded1bacab93052babbf8ffbee4742d291bfc91f2d768b4ac445
-EBUILD myspell-lv-1.0.0.ebuild 616 BLAKE2B a1bcb7a31270d5d2d6dddec373906dc9fb692af497cb8e6751a282ee8acb2f1e00eda7e287d78e08d9f5a9e1dbd8e82074099a6746e60df0f1cbba236a38d8bb SHA512 a903091fcca44ab32c489b04d0cadefb4212d4c6d06f2e5de1631269f96f6c9b62d36d1a127a54c2cc80f1e4df179e2f20d5fb860237cdf73c50a2865039b82f
-EBUILD myspell-lv-1.1.0.ebuild 650 BLAKE2B cbb4f8b248a4ece9639d62f113784c1b206eb10edaf3849702923ca63caf7b02cf30e524f769bbe942c279c355463888f3eb8c3b9ce4c16247c2f6664ac3d493 SHA512 15f0e174c44786a11db1d72204321c4e833dc2454483342a6d179e5cd1ccb5155d6fe1008283d88691cbcb1cba027e07c55ad554db17551a428d25bf639211cd
 EBUILD myspell-lv-1.3.0.ebuild 655 BLAKE2B ce0774b19db04b5d8fbbdc8698f55ad6be8f6fba086b90f8a2d93b1de9c4f52776ba261367608e5a14fabee31d99c06adeb85fe03fce81ab360348409792778e SHA512 ca4f2b74e118808763cc3b6919e39f3f9b0ae37513848a69247a0c01967645036e0beee2fa6d9e0e3cb57c96301e097e019c2c8bdec87c2c8812df27eb0235c3
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
deleted file mode 100644
index 3d0acfee6939..000000000000
--- a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
-	"lv_LV.aff"
-	"lv_LV.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_lv_LV.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Latvian dictionaries for myspell/hunspell"
-HOMEPAGE="http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis"
-SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild
deleted file mode 100644
index 452a7e1eac6e..000000000000
--- a/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
-	"lv_LV.aff"
-	"lv_LV.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_lv_LV.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Latvian dictionaries for myspell/hunspell"
-HOMEPAGE="http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis"
-SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/unzip"
diff --git a/app-dicts/myspell-mi/Manifest b/app-dicts/myspell-mi/Manifest
index 7c98d6842d4d..775cb3f9de07 100644
--- a/app-dicts/myspell-mi/Manifest
+++ b/app-dicts/myspell-mi/Manifest
@@ -1,4 +1,3 @@
 DIST myspell-mi_NZ-20060316.zip 78777 BLAKE2B 4e694d2ee35c86d677ec9abef3346e4c47364c80ae327178cab8556a514dc810f71af589349e5730367a9ac952165fe634545d426f8352bbe99096d22cf33e83 SHA512 391f70bbd7d66ede4c8df7f7d5544bc7f40c3e97b80b509ce887e74770f9183ca98475715dbf9e6ceecb3445d1d3c5c1de35d1ea540e13a3a17eef690c91925d
 EBUILD myspell-mi-20060316-r1.ebuild 518 BLAKE2B aa21115a9e10f95577de372957a35c9d3fe33693a4a793060662b825221095050ee2ee19ad04e52cb733f54a26f8704a78551befcbe8c7b2dc38e0df64a634aa SHA512 299e5b24c7b7ea2581de843fba146035fb2bb4254cf6e6f49047bcdfc07269b52760f08992b18e62415561d1f6776dc5994bc1d1f9b1ef484c4b262d67140283
-EBUILD myspell-mi-20060316.ebuild 504 BLAKE2B 23ff69938299a10ded2a22b49ecfd607f071f864e94ef515567214f342104551ed88f2b7c5af2fc8465b9540681852d3fed15c772305152f26a6c0763bb219a1 SHA512 de8e4858b92a0837a2e50705d289fd62b0283f15a543e8d85c212f23c2afaaddcf92161f322ab899dd038d72d566d3456bcbe5ba53878b1a39fe65cf13536644
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316.ebuild
deleted file mode 100644
index b3542b5a440e..000000000000
--- a/app-dicts/myspell-mi/myspell-mi-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"mi,NZ,mi_NZ,Maori (New Zealand),mi_NZ.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Maori dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-mk/Manifest b/app-dicts/myspell-mk/Manifest
index 7006574ba52d..5c544530952a 100644
--- a/app-dicts/myspell-mk/Manifest
+++ b/app-dicts/myspell-mk/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-mk-20091211.oxt 488927 BLAKE2B ef9f9178729dc1af3968583c96e96ca322f609cff91c5c9ae2b6b852e6d3bf5dc71d539eedbe3c88cb3e9028efe18442822746aa7d2dc134000d26ee17034b61 SHA512 7dab57512c208e705b122100b20fd93587d42dac95d9fa701477b5940d715964e6aa71b20abcf6b16eb4f7706d0c0026f1b01815f63b1b85b0a2e0ce0ac40376
 DIST myspell-mk_MK-20060316.zip 631595 BLAKE2B 6fb5f2ca224fbe3786eee3b2b748bd7fbc5e45b1dc544b37040bc8a847da4884c155aa942f4f62f8b5ac8478b61171e236ba2ff34ece0eeabfe9abca68a4a6bc SHA512 c6522c631d9416ca5b2102c7e616f8b7eac88f83002986a2f4e5bb159abd81aae718718fc49271ad4ba4e89657a90834c5de8ceec4f93313d27576b513debd22
 EBUILD myspell-mk-20060316.ebuild 509 BLAKE2B 83c126e6d9372651cd733d26f7ed15b31329fd7552ff1d2795ba411027c45453c4eaed8f5aef690830003a4d1bc326cbb710105db12a74c2556f80089c86e83e SHA512 a610787695f4dfdfa1baaa0f14842e98184b3ed06fe15a60943b2b2dad7e0d248efe71ff8484cab8c6afc7e8e7665d7deb4a5e8185e7eb90dd5232a4e901cc0a
-EBUILD myspell-mk-20091211.ebuild 575 BLAKE2B 26d5f374fc48583ef988f019d099e60d1c9d87a380cc7584617c5556d44787f2b85345e353e8ffee1e34d09c8443d9c0a54037f6364ca37d52e1708187c36162 SHA512 1147b01251b26bdd74760edb62def66f2220295bb08e91160077881579702f6f8603c8734b6ed7c60057dcf7aa94fb84f1bd77cf4694732abcd829dbc3c029d7
+EBUILD myspell-mk-20091211.ebuild 569 BLAKE2B 65d4b38613b0ae777053d61aa582be0a06f4b412a1f876d128229bfcca2278693883cec7bcfe5406589e196875d502a0fafb8efa946051ac48fb292d6f9df715 SHA512 f9ee96dcbfb7064f35a1caf94960b4a930fef8e8b355d7dc6628e1d35f391f9eac7b75b16471a41294148e182c7ed1e038dd4e490ca8273dd529f6d08b49768b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
index cf66024c1534..64fb2785a8ba 100644
--- a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
+++ b/app-dicts/myspell-mk/myspell-mk-20091211.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
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/macedonian-spellchecker-d
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-mk.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-ms/Manifest b/app-dicts/myspell-ms/Manifest
index 94c5ea644fa4..f6e0791e4fdc 100644
--- a/app-dicts/myspell-ms/Manifest
+++ b/app-dicts/myspell-ms/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-ms-20100407.oxt 79342 BLAKE2B dd66ab939c604003bf7cdd582ac02367a214c20f7314703d375c954e33a3cd8a00366eba66d11af97859ec756d2b3453edf09d3db5d8d90bba56b1681535c9f1 SHA512 9773766c8d2a0bee3d9f055b18449432dff4cf08417cece77fa76b016961f85073efe87baec13cea26c505a7438dbea60ae91909dacbd73c254606ea012a96dd
 DIST myspell-ms_MY-20060316.zip 87736 BLAKE2B 1435a5acf646cf2926f961ef04209273da4e5b678cadacf7a6b337b96441700138ecec0ec316daaef8ff058008417cc65dd1d75bb84e5664973d4514da126500 SHA512 93709c34991c9d72f4ed18f07ca15140c4398a2b1755b02f0e6131a167a82a08e8d4f9f9023bc8c8807324922b3563a37cbf14b772d291b04d7fe30ee66d0a3a
 EBUILD myspell-ms-20060316.ebuild 500 BLAKE2B 735b5da5cad8c514e37c1511921b9c653b8e5556d4d13591ae32aa174b9330eb1f380afacf813173d0db46c300a35867bf1dc930355128c090b009b85b70b40d SHA512 941db4b8fea388bb6a6578f98b0196ecda4fed29400c2d73082a239ecc7838d7e5407e38cbc48bc7c2b88c814cd367ceef571c63a6c8581541350b0fbdfce77a
-EBUILD myspell-ms-20100407.ebuild 574 BLAKE2B b5d1cef8fec16697cad2ed697879ad1531e359cf2dfb36598e5ecfba3b6f405f07d1e02929739ea60da0ed75f4592458118beef2cfc65cdcf1d443ffc55ca055 SHA512 63134934ab108b4d51bf4483b03ca25e50ac15b000d17ad4f12b5bc6c02d16230fc259a706a056ae4d9b2a4cce0699d067036730790c54c01f351f068792fa8d
+EBUILD myspell-ms-20100407.ebuild 568 BLAKE2B c972e5ec2ab8b344bbf37daf56b082a949bb6f255f60a672f67af11f6462ca9c1bbe7b4ef93b68a7a577254ba13f29f02b92fb7ba820fe01d8b9871d89630b04 SHA512 567453e1516f5d7007a3ecbe5d01d6185a31c5c6d890fc6e95439a61c20f02f0959c9877775a61de5df6bba5c74e5b8907bde54cff390b8395b74b8b35af8b57
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
index 7cc38da9fa71..bd6fe21343be 100644
--- a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
+++ b/app-dicts/myspell-ms/myspell-ms-20100407.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
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-mal
 SRC_URI="mirror://sourceforge/aoo-extensions/ms_my.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index 058edef70be5..373af62854e3 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
-EBUILD myspell-nl-2.10g-r1.ebuild 1100 BLAKE2B 0f75b0f3683ac5e4309f8fe2e1d319b554684eab7c2ffa265f18d04349bbdf1476bf69f3ad116e451dd2e025f771d91cbc40b185cf5e24640333281adefe21a9 SHA512 124c2bcbb7bf88f2a216649371f64a296d7dfffb4aca9167283d1b495812f96e2d82ae30aaf1607b54ad837bfd74d67de14aae632fd7430840ec750c9719c715
+EBUILD myspell-nl-2.10g-r1.ebuild 1097 BLAKE2B a7f87dbb6f9f5b71a11c8c6b0721511eabcc52e131c2ab5bfe3d87b7d71fd6f560a2cd1ac1830f7a931b4ad3fbf931e8d24f203a5ce1346db30474b87f0b671d SHA512 0cebc0895d10c5c89cd5307c9cf4f88be52c3ae07b82b607a9b3ef7fb54d5c21841ea6d9d9097dbdf4cedd975ae8d84fe4440353c08e5c7826dc286bce4e3272
 EBUILD myspell-nl-2.10g.ebuild 1093 BLAKE2B d37ef2480a0b9ca3ce3d64132f5ff46b43f13a216449093ab1fe793e3f79b44723e3342be7a9ce49e9e06a125569a9c83021fed395e0532f73750ba49cf175b3 SHA512 5de3e7c0283484b48cee4f775d1ed19774eb0177c32096c42a98e4b55618316c556a9154eaf66806a5a8a3a12a94ce9a62ea312e1417a8c6ad88c3f23bfdeaec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
index 896c93bf5d55..dcc4a58b4468 100644
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-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
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-3.0"
 SLOT="0"
-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=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-sw/Manifest b/app-dicts/myspell-sw/Manifest
index 6c9a5922a5db..aca6c910ea31 100644
--- a/app-dicts/myspell-sw/Manifest
+++ b/app-dicts/myspell-sw/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-sw-20110106.oxt 423064 BLAKE2B 32e74434714c62b4f5248775ac0ca0262d774a339c84899c822d0099ba1d90830620f748796d246373b566f5b1bbeddbb0b46fd3cf5d9c02168e2f0c18263dbf SHA512 734e760fb3ed95905f7ececc38ad3d4d87f77d5a953e5427d6d242ec73567a35311fea26d1298edb5d1650d6e07a6859c82bff8a6f309d226307873067cc7e98
 DIST myspell-sw_KE-20060316.zip 193118 BLAKE2B c71dc2b85a360e89f824b5df299c424ecc4f5dd198a6213a29f26d78e436fc899f1febc015700eaa63c13295a818633934af15f8cf874773ab01cd5f6d4d1121 SHA512 0ba002f3264ef66d1caa938640fb26709cf2ec45b65f73982311924b2a317bc8ed73bc8942569ab68d54bfe6b8a5f57e869473ea60de790707fe430eaa24b8d4
 EBUILD myspell-sw-20060316.ebuild 507 BLAKE2B 7271ff2741a6a495ee3ab7bee64b65b602a0870c91dce5dee49d9ed25edd7cbad3d3ba8b708a6ef52c168b0eca76f951e11d1827518eb98045bd8ad1b0376601 SHA512 e703b7638c65a942f501559283e752ad895b8857ac9fecf470244dcfe1381a89c7b63c320518fa7f1c10210b19db93299a91ccfea72b9d55548f00a1ff3080dc
-EBUILD myspell-sw-20110106.ebuild 588 BLAKE2B 220e35ce43d612052ce60c4eb9fb2034a98a5fb13032f615d253aa6542c86f6030b5f26f183feb5fa4cca48b9cea8ae55e12a1854089e6ffb333dfe589f7e55d SHA512 d07a9ac1cc51a403df299131ddffe08f50b8c8809cfc9afc18af5275b32c56d96265bac4f12b92d27d03589f4c34ce36f398e7ef8dce4508c6513d5ff174f096
+EBUILD myspell-sw-20110106.ebuild 582 BLAKE2B 69cab40675f422a1162e343bd540321cfdf0f4f733caee3e1cb196d7b44b9d53ab174710e32e3eded21c1de2dfcd1cf6b17b0d94bb24096a9127433e60462c87 SHA512 537b9f506535833ee443051c461be2df70ec207ee00743aad820210f5b2f3618ff14703c3d44725de13c08c6829d94b5f21312cec99dc2bcffc2de6e6add6d2f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
index e81657974645..bc36a77db219 100644
--- a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
+++ b/app-dicts/myspell-sw/myspell-sw-20110106.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
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/swahili-dictionary"
 SRC_URI="mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-dicts/myspell-zu/Manifest b/app-dicts/myspell-zu/Manifest
index 969186bf57e2..c860b4f225db 100644
--- a/app-dicts/myspell-zu/Manifest
+++ b/app-dicts/myspell-zu/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-zu-20100126.oxt 393165 BLAKE2B 0c31ab3746ffece8546415e051641c26f14cac80306e5326cd6616e953c34d810a6b3b9a44860450da720975e6e73bf0b1cc0661b92f95c3005ebdf8dabde3a9 SHA512 0eeafbcfff3459ec65d0fcd3b845d0cf7b1deecc1ce1364fb45cab092b17986971a3518190355e6ce863514df4bf822804cd9006fd40c0bd03eb5ad6129c3b8e
 DIST myspell-zu_ZA-20060316.zip 290607 BLAKE2B 24952faa606fd7477fdaac81915ad31486fba8ad47533036b578ec281ef6946f2d418442d161f75f69350f722e771a67c40567f74359bd0885b36bbcf80dbc62 SHA512 dd504ef7969657243eb59aa5b85dd988602b5045666cdbf0787d4ebe492ea34d42edd8e4f9b58136e80add420c9ecc577d3285755fff3e17e668580cd2b82937
 EBUILD myspell-zu-20060316.ebuild 569 BLAKE2B 587e5e210b9c48554b00f8a9e3a886cdeb08e22fa25bcc220707cdf9933d81c189c034b6f8d728b2d8115d14c6c9ca1d014bcdf39f1d309da1eeb6c5c15e076e SHA512 1fc317207c462e9edfd209ec390343ec6472d1dd4be6e94670f0ce34d58befee226216172446724121bd82ed73789b49fbb8b1ca2be19e9335b5a74ebdad26e2
-EBUILD myspell-zu-20100126.ebuild 602 BLAKE2B ee2082799e31ab35ce8ecb6dd9624e3abb0394ffba9cd937e445833b0b0cca4f33e694b7c96e566969bb51b08d145fc06ac3969658a434c380c3319f11ba5e50 SHA512 db2424bb61b616bda648aef4590286a4bbbd90441b41e9b3e7ddc691099b93c75062413efe07dae9e61d2800910ec98e71bdfc24a130b1d675da75b398a8a8a8
+EBUILD myspell-zu-20100126.ebuild 596 BLAKE2B bda2d6563b0c5ccb1252b52509c16c0073683ccfd3dc24685959eeccebf1bc3bc7aaa5fabad253ab7a05fe10ea35fc61dcb38b3a2d172102ea6b2018db5a820c SHA512 862870d4eafa000674b684856463fc6c279a4b4ac6061d1cd7cfd1b75a4f03495a78fac5adcadca6c2360de82ad3c0732f67848a9f097eadfd74367bb3699287
 MISC metadata.xml 246 BLAKE2B 4a746dc47f5e6f3ffcbaf1d8f66266a27edb57410ef7bc86230a8228e3ebb290202764649625f2e4e5cdd9b8308614714f9737a3225b42647237297194afbb2f SHA512 24064c771ba24adfc07416caded3b3863dc6f735e1c218fba431c289374755536e7664d021be8865fad9cd6508a824a82f4099ef93b84c93db4a32c1ce788a6f
diff --git a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
index 0ed05d879cf1..e27bf0bef0ac 100644
--- a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
+++ b/app-dicts/myspell-zu/myspell-zu-20100126.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
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/zulu-spell-checker"
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-zu_za-${MY_PV}.oxt -> ${P}.oxt"
 
 SLOT="0"
-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=""
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 90cf114fe6cf..ee14b758a74b 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 1fe553a88e99..b00eef4afe7c 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -13,5 +13,5 @@ DIST gimp-help-2.6.1-html-sv.tar.bz2 29462846 BLAKE2B d09f9a682dc787dc50300304dd
 DIST gimp-help-2.6.1-html-zh_CN.tar.bz2 28735285 BLAKE2B 7101fd5e627b7a145ec5e798ccda3928e179b8bf9f3c7dcdaa6f6d09a463d98fedf148ad6ef8ee8fcab2622f73977cd0d282b149a7e6f66fb260b1dac898bea2 SHA512 daa6fd365c04c3dc78c1955301f0544ec67e17ff156e6e10d6cad959b9a1121a976feff29e30008809bc1beb1b4868474c40e36a76ea45410e3b7f5aed719055
 DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
 EBUILD gimp-help-2.6.1.ebuild 1125 BLAKE2B 4a79129dcc0b0201e6013ee166b2e3fa6eb6459c81d2adc37f54cc886c6fc8b6f090893383706cb2724e17900e3cf6d197c137ccc308abdb26e67e0301c5f12c SHA512 65ed45dedf891eae72359739cae100b0a9d841a60ea3a60ec5b296ca8f89b8d28358f4c9b0747bebf398d54191f957b3ad0583e546bd4a2157083895bea24aa6
-EBUILD gimp-help-2.8.2.ebuild 579 BLAKE2B 2f6b8e7ac63cf7cdc5365a7407750da90d07aca990fcb78383f3cf7b5973ce27fded2721de5f0d745b781c9e43783a9965f56a983acde08685aba852c1c2514f SHA512 bc290200654692905c1fd83451c27fbddf497c58c9c59a6a44eef237cf3d696710638beb9bdedbdbad7496af7534b90e06d1d083d713e9709fc0d1925c4d37b0
+EBUILD gimp-help-2.8.2.ebuild 573 BLAKE2B a85a178528eb27f17ede685bda0c2ca35b419ee79abc2799c2f6b153fe50b1fe052be7b46e18604f1b6c3a7c649b982cba3a54abd6f7736d663593770c2da3a5 SHA512 2aa9948d23befe856b19adcc0f49c779e130b2c77e9de4990bbbbe82d6d80c1a83a0ecde0ef7c294f481e36d348161f537bea056fc2825ca18b546a96e84e50f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
index f1d6c10a7645..a53fadd8d8a4 100644
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.8.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gimp/help/${P}.tar.bz2"
 
 LICENSE="FDL-1.2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/app-doc/xmltoman/Manifest b/app-doc/xmltoman/Manifest
index ad06deafa07a..1c0b8399622f 100644
--- a/app-doc/xmltoman/Manifest
+++ b/app-doc/xmltoman/Manifest
@@ -1,4 +1,4 @@
 DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
-EBUILD xmltoman-0.4-r1.ebuild 745 BLAKE2B 54077535fbdf27f2108b320b7a085044b503ceb013b819888ecfd93fdccb499686814c98886b0b58ecff607a2c246aa1109548596fef29240d37b78cb2eb4f2f SHA512 3ee1e6adfda37a6ba790ea5a64f51f0a12b315a65ff58179e6ccec1b6bf422030bcf3a74e419f72bc16c88376add67ff38210939845eecef510d9f0241ff205f
+EBUILD xmltoman-0.4-r1.ebuild 739 BLAKE2B 437046fee1fd8678934dce4ea99baac1cb37fc601ec27eaf2e0250652e85cd5f6ebb14eb0b0f6c82d47643ecf4c9db1b117e465786abdc5930d724cc2860b5e7 SHA512 994c9f539d34fcdd86ce5498581e99b867e2ca8e5ef36366791f676db23791ee04f73dcb448057f71d603f0b6e4f86a90fe3920a7bc9f98316621b3300ed1253
 EBUILD xmltoman-0.4.ebuild 567 BLAKE2B 9142a6e356376250012e8504213ce720ce81458449051983d8661db1f111b24ce2b46a79d4c0f06e25b29c35cbbf4f9161f89b1b19200ff897f80b7d05827082 SHA512 0288c10e81f52a7ab3325480fb761c2244e5317907a160f251ac607fe60b4686545151d5b4e923184fdf69524e5f4a9bc54ff6b5ff5bc571f54281cdf8606819
 MISC metadata.xml 245 BLAKE2B e84a1330aec92254ae747019bf2573a814f3cd529a1bdada2c24e5ea462477b282a32440a839cba164f6f9633830e23c95117920d4593f67a97c0175fafaf25f SHA512 3af134c5e57fc7b4fc055162378739b18f3531620338c3b3475ee94c17817948e44c2fe91c58d544ee29d2fae237e5db80388ae1960b017b7991330603377060
diff --git a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
index 763b30e35edf..166013a2dc2b 100644
--- a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 346fd8a8bd33..ab5b87451beb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 90c68997bd7c..a7d0429739c5 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,10 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-DIST bluefish-2.2.6.tar.bz2 3793018 BLAKE2B f77b5e21a3289ebd2c9e3986476dca30e42ff489240adccba91a5aaa4a2e35282fb2b0a38137d249747e0496f410cd51159cdd7dc4e3b46a6affcb68d9b58099 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e
-DIST bluefish-2.2.8.tar.bz2 4097769 BLAKE2B f0e38841dde2e620fa2ea7390891f2c09f349d9861aeeef9b919dbdc67d7be15dd28852736590e99f0cd167feee3089df929e261e8a244f1301e130a3bad451b SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1
-DIST bluefish-2.2.9.tar.bz2 4082978 BLAKE2B a99db5acc2bce79aefccdf676a9ce965f682e99531790f20d6c67ad7f43c566009793efc4f3369aa425fc764dcf05f2a83b0260bf6531845cac2c707009c7967 SHA512 ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae
 EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 2b122e7bc7e3759e37b9e64ff4a618f5fff15d1931bf33ae4408c870758c61c99f28c7303ce0d3ea8f12a658f85bc4fff28422beb499ef764905121dec0a7bbf SHA512 29663a481073d4d158e0c529479464019d4edc5bb0d639f2755d439bb30e86c36d0935a4ae9f9694c737e9b96a326893f55df6358aa47325d19b70a8f644e61d
-EBUILD bluefish-2.2.6.ebuild 2340 BLAKE2B ffa844212337201b9a851f31b6b47f0e53a79df5624b1045074e729610af1d7a03752bfd6fe1f9559c6ddf557d3d8b3c33dd619aaa2569059322eeff9d9ff1b1 SHA512 d0ff8dd70461bcfe97888ad97bcf8fb4cf8cec932eeb0ca79614ac612ab04623cc928b988bce0f9c301482371d21ceaf093b9e70e2f854a824b18c3655503dba
-EBUILD bluefish-2.2.8.ebuild 2605 BLAKE2B 25c8fcd77c7b717e2625e5c59f20b443e710b92e44d0ac1b59416e410b5bff6b38cf444be6b4ef8249717dc5bc36189a300d17730cd9924918e3a31214bd2154 SHA512 3c096bbbdd8b77c18f5b92246f6d4ac6548c0499148c3562e9a308a45da602f236c1595a1534c8141f5d123c2c3d277eb6f9ff634a60054e852aaf9a7a7df065
-EBUILD bluefish-2.2.9.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
-MISC metadata.xml 542 BLAKE2B 0680cbbd32a85e3c53e10b4605e820d5eabc79761ef70bd41a5fe3cfb2a25a19251696c5b2e35f729e38c481728635cfbf8253ef07f15c656f8b164df905d3ef SHA512 7449eb863eecc8ed11167409f150847c628077e328f13481db6206498d15c7c6e148e7c309ed40eaf781f401147b7a757e8216324b2c01ea65202e39bf57fe5f
+MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98
diff --git a/app-editors/bluefish/bluefish-2.2.6.ebuild b/app-editors/bluefish/bluefish-2.2.6.ebuild
deleted file mode 100644
index 2e47961b2f0c..000000000000
--- a/app-editors/bluefish/bluefish-2.2.6.ebuild
+++ /dev/null
@@ -1,95 +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 gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.8.ebuild b/app-editors/bluefish/bluefish-2.2.8.ebuild
deleted file mode 100644
index 2ffd0fb8bb4f..000000000000
--- a/app-editors/bluefish/bluefish-2.2.8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="gtk2 +gtk3 gucharmap nls python spell"
-
-RDEPEND="
-	sys-libs/zlib
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gucharmap? ( gnome-extra/gucharmap:2.90 )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-REQUIRED_USE="
-	gtk2? ( !gtk3 !gucharmap )
-	gtk3? ( !gtk2 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_prepare() {
-	default
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with gtk2 ) \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.9.ebuild b/app-editors/bluefish/bluefish-2.2.9.ebuild
deleted file mode 100644
index 2e9a485511db..000000000000
--- a/app-editors/bluefish/bluefish-2.2.9.ebuild
+++ /dev/null
@@ -1,112 +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 autotools gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-# eautoreconf seems to no longer kill translation files.
-src_prepare() {
-	default
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 7e95699afd85..98078743b336 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 	<use>
-	<flag name="gtk2">Enable GTK2 instead of GTK3 even if GTK3 is available</flag>
 	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 	<flag name="python">Enable Python integration for zen-coding plugin</flag>
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 79f937c9918e..76c0900cc7be 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -3,5 +3,5 @@ AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd319
 AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
 EBUILD dav-0.8.5-r1.ebuild 880 BLAKE2B f3d671be06467efb4d791933855bea1f9e61631a2bfb2ecf77e7ef586c25e274abbc9ff69c28ba30321fdeeb34ffd14618ac95b2e24fc9353255b8c682af6fbf SHA512 d97f7b44ebe9536ac7be593e872cc6937e71c050235769a774fc2fdc681ab2ade2a716b98464f41e18ab9bb4f8c0d23f1c9d9f9cd8ddb08918075751ca284d92
-EBUILD dav-0.8.5-r2.ebuild 908 BLAKE2B b9c9ac48a570321892701333b18ff43a1f1f45cd58ca50c711925585841ab326a0d1bc5e47bfa64c9dd586362c41b4354599d6a2a80555c593385e2a37b2963e SHA512 3f3977945cd1fe80c9e862246cb1e9184e2d65eec63b7db912d2d32e298d7dc5dbb13c99ab0dad37e3cb2d2ce7fe8f5ad3cef3ac2eee152acc7bf2201973c139
+EBUILD dav-0.8.5-r2.ebuild 904 BLAKE2B add9b28fc27f558271af8ff4466f0fbfb2bf00286a095115764a5f844f2fd7edfc5988ffbd471180ea50f5a80697ca312849f0c20b586afa0c53f26e71f8276b SHA512 d96fbb74b3cdaf91dd2e9639c46212511f5812efd7eb0bdeeefb3c54b3ba25f70370a4b33e4eaca7458e569b5743c114e0daafebb745e5ddb7d877ae92f794d5
 MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index 01ee84f4222c..8b531ff8b3a0 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-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
@@ -13,7 +13,7 @@ SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 3a4695e7fd75..48bfb69c8918 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -9,5 +9,5 @@ DIST fte-20051115-src.zip 549216 BLAKE2B 0ec3eeea813380cb0c2cac55dc42beaeecb10ec
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
 EBUILD fte-20051115-r3.ebuild 2780 BLAKE2B 39ee917eca7bbf6172a1c550d900eaf9d8aef5db4cc325dc11c734560e2679cc0e2522bfeb8f5afcaae92042d3ee73505f89e7b76796dde5550932a58e5ffa2b SHA512 106f6eda464bb37d35d549e8c3a56c53a3571e259e748bf7f975d1e6fce4a4e1fa32ea85f8cc26f38ac5181cdd64af32012a8332594a74c09d4e064779a9778a
-EBUILD fte-20110708-r1.ebuild 2656 BLAKE2B f5894a82e98aaa1b9610bdf3320436de60d1a0cfa5f1d5e6f4a204082dfea885decb30f8835a83017fee9b5a34fc2156a55ba17c2d8dbbb211b85f05241b86fc SHA512 989ddf33022f0bd8b8d0e1d79bb1dcad111f8fbe3d7de329512feedbd4751a6790d5c08657ec83f110bf86547e05be5795fcfdbf2597ed172b11664a47bb38a0
+EBUILD fte-20110708-r1.ebuild 2652 BLAKE2B d34bf5ebceccb98c779143b0aa2d63be524855071a99c81ac5094eede5f67c0e21ad74ebf24a33378922403f80464ae56bef960327c77eeb389ec6fd3ad47fea SHA512 a07e6508dbe4dc1e9d4cca7b06935655154dcb5ea936e6fe8d3660cd8fa587200fedc9816317e4a0d1a346b6c2e54a65f465f4846acf7ccc43befc95fb0f1f82
 MISC metadata.xml 312 BLAKE2B 0092b7eaef6d8c1e8f1bd490c8d4e9f43909d86097fbf06692b2e92e7496332bac289bb40fc3cb9a7dc1d32a63ca19db01cc75e0a9014f1d2e8074816ed26a8b SHA512 3946924797105501c1388f172caf774488ebb480ff13664fffd75fb30ebdfba27d52c3e7d534e7dcad5204b6074ba28ee25a4724ed117748059fceeff9d23b60
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index e32fb0fe8861..af1ba1a960e6 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 60c4a5c26302..89a99d415d12 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,3 @@
-DIST ne-3.0.1.tar.gz 1193311 BLAKE2B a58afd00660a7266a37fb0626ddd326fa3366eede6d44cfdd3a002fa3c90db3cbfd852a414c9e8f091e1eac0786cb4d296d1b26144d8afd1d5118da29823603f SHA512 3750140a49c7424e92e509137d5f31d305b81d41939a2578f6a26065216ebd1aa444b0e8d7e79dd09cc525e1055cda4d756f21ec810f860063d2eec861ea8273
 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
-EBUILD ne-3.0.1-r1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
 EBUILD ne-3.1.1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
 MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/ne-3.0.1-r1.ebuild b/app-editors/ne/ne-3.0.1-r1.ebuild
deleted file mode 100644
index 9d68adc0f1a0..000000000000
--- a/app-editors/ne/ne-3.0.1-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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
index 9c09cb1f8f31..56ed013a8944 100644
--- a/app-editors/wily/Manifest
+++ b/app-editors/wily/Manifest
@@ -1,4 +1,4 @@
 DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
 EBUILD wily-1.0-r1.ebuild 809 BLAKE2B d78d084be0cda1dfa32453974846d2721ab700ed6b476e440d8f0d2b3a5401b2d8a2c084666db0267f7517dd10e6bac8c36506967844fd914948a9532d1607a0 SHA512 fb05e0ad34abf3b1a0a7a6949016da6ec0da8e8f52a2947bedc282f5499a70ba4b44e5dd5fe3ffb57941522035d40281aa7889246cb186278e9b48f4d9fc5336
-EBUILD wily-1.0-r2.ebuild 690 BLAKE2B 6fcb5dd31dc24b7e98c561b0c4aeaa82b9ab9c4ac52086605544188ca5229512ac1d25f0ad7742f510d651d09a94581dbc167b32ec1a5541e9e82cf07d6e0028 SHA512 57c61443e2ba44a649a384eaf240d6443fd40732515182cd33300476356a738edb36e091d13e025b9854d56f1f86c5357b0a496da2da715b2fb0383ad687c5d7
+EBUILD wily-1.0-r2.ebuild 694 BLAKE2B 0bd4505f79254267a4082fc8a369b2ca0280b4f9d00ffead5c2639fa28dc461f0d88a9d6c8b5654c882c4ddbc7faee04c02b39f3c7a6b71afce59a50c8a03fd5 SHA512 d257b0491aeb8d4d815a560856fba1986233c12d20366a86d094b7ff7a892cea957c211bf48d65af85bacea09aebac44546c3510ffed90f8e12c36759ea62949
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild
index 0266f79b98e6..2b2d12f280df 100644
--- a/app-editors/wily/wily-1.0-r2.ebuild
+++ b/app-editors/wily/wily-1.0-r2.ebuild
@@ -12,10 +12,10 @@ SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/9libs[X]
+	dev-libs/9libs
 "
 RDEPEND="
 	${DEPEND}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8b53fed8037b..7d92719a9d7c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index d374b465cb15..2badfa782267 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,9 +1,3 @@
-DIST kompose-1.13.0.tar.gz 5238799 BLAKE2B 8f51d9c4b162104636578b5b6b044060997d7c8fbd8a58fdf42d8db1e5fbce51cbfd2e010e84e80707462edc29603da3a6ac729f95873f2c84b7a43baeac8284 SHA512 6ec870f03762bde138e2c22e9b8a85a1e974897f3857f096e1fcd56bd402d1f3379936752b075ee57497e5d4f1c7c7d0c82b09d6c4e90860cc04aee434123419
-DIST kompose-1.14.0.tar.gz 5238716 BLAKE2B 27c054b58d2804fcb37627652d2d48ff377504203f9319c4321fcba08e9c8dd9c41f307ff599de3b65ae9a177370322d63314b70e5cb80edf1ce071eeaf15e24 SHA512 f356f2f38c99f0ca9d8f58a4dfa171ba0c41b3127b66ab887484c3bbc76b66470fbe8f52ca3eeba700b57a86e0ff264066ee92645f71a93bfe77077655f81e97
-DIST kompose-1.15.0.tar.gz 5239685 BLAKE2B fed8d978584e6f8006eac44c732476745520d28c83b122613baee24aba71723446c269b6e60197e0eec5f4e3cf481ed38756fb7c2c8840d3f885b9a790529f73 SHA512 55296b1227324e77c5febbb9a3701c8548049e8fb22b97c86e6a936024b00dcc55b7bc101469783656fdc05fdd72f8ba2282b3619e75e0f04ebe0d2446c1e245
 DIST kompose-1.16.0.tar.gz 5241785 BLAKE2B 9958b200827b70c94a499981880cc7a5d8137354205d96657d854aefebbd877e332ac3047f59e13b62dd6b9a9235d1ed83bb8b8de973d59f81906b3f376176a0 SHA512 267601ba51f5cfcbb95b9fbf52bbb99f9c810de8edb301b635a50936d7a714dc8410352ff3a4aa8819de1659a45cbb42caf5e552023cfa594a0eb8e99db57522
-EBUILD kompose-1.13.0.ebuild 914 BLAKE2B 3d7a24dac2a68fda2454e96b829dd4b8bfb330939cf136283fa52fe2ee5f9636077c08cc86d1aec9495faf18a99df4659435eaa2a473833858093ee727a7ad33 SHA512 4b245704d29c8ad0fda59264a777133b92b75bdc84813280afff3740cea4f1b53bcea556f0f55548f6cef3e81f0133d9faaed35392ceaec8994450bb96abfb89
-EBUILD kompose-1.14.0.ebuild 914 BLAKE2B 0136b088d67eb8856ed41190273942f699d8a1fa5867d763b40e3ad6070dde0ffd5a266bd730dd456ffabfcc335f334f1c0549696aadfefff71326f0c0615dee SHA512 709f2ea7683c4aa2011a1f618f0425eaf96eb99c7f5cd8f7c0ac5bf9451e1f1bae56d6a32fd4f3344c7fc7412b0fe75702494e9c3a2ed542aa6dc273ad88a251
-EBUILD kompose-1.15.0.ebuild 914 BLAKE2B 92200964849693ad38399ec431ec8586b0a4f62df0ac2fa6186b925f81e906526a9c54eb1bd9344c7a25e32d528b0a795d577281cafcfc5c1864da90b34279d6 SHA512 82ef8d3fdcc7b80854841e2bd91a77dc76ba076c3e887c46958038e29835fea8981235aa0ed610da79ae3ba05a9f71aa80d7290661007313e9a21ee0e8282709
 EBUILD kompose-1.16.0.ebuild 914 BLAKE2B 135028b699263569332cc9e7e1d9559ac448ddcae5517505bf170a17b591a581b3513eb9d29deda4d103a93b556ddc2bc77f052b80ab4f786f7f4003254f63e6 SHA512 ad339be916fe398edd62cab08a67c47b83eb91cd91603402520609e9e3dc4218d3ed5d206f386cad75c8b0b0b0a63efc13cf1514166b1eacab9b63663a2e6231
 MISC metadata.xml 250 BLAKE2B 7269bb56889c307f4610c9e7e3e2444b8e08cb953745cc674df9bbe1c1d9acfad6f542314a5770439c3bd65fc91f78e1e82a3bc5d14ecb158c4fde6dd5b8b062 SHA512 4f70d3e271588e217f8ec4e0acc7b86a70a4b5380405a0a3a4ffc923806e0d086327534de893e82e28b72d5616b8b0904626010aa3591bc46ccbc540523c7443
diff --git a/app-emulation/kompose/kompose-1.13.0.ebuild b/app-emulation/kompose/kompose-1.13.0.ebuild
deleted file mode 100644
index 7e7e3b6934b7..000000000000
--- a/app-emulation/kompose/kompose-1.13.0.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="84fa8267f38abbdaa9b46fbb6f800ccb5c246da3"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.14.0.ebuild b/app-emulation/kompose/kompose-1.14.0.ebuild
deleted file mode 100644
index e0d3bde8bce1..000000000000
--- a/app-emulation/kompose/kompose-1.14.0.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="fa706f2f1c715889cbfffdf7e4a65da4c58584cd"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.15.0.ebuild b/app-emulation/kompose/kompose-1.15.0.ebuild
deleted file mode 100644
index fdd2f4718dcc..000000000000
--- a/app-emulation/kompose/kompose-1.15.0.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
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="e3cd4d459e62697f15a6a655bf17269adfb3cf23"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 3a8a0901ed57..7bd068033b73 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,6 +6,7 @@ AUX libvirt-4.5.0-do_not_use_sysconf.patch 7417 BLAKE2B b1e6471a7b6a923a3ca4b630
 AUX libvirt-4.5.0-fix_typo_in_apparmor_rule.patch 556 BLAKE2B 78d99d6d1ae811e202ffdeb0f34e4b20d76d3b0ed90bdcb35fd79a1133e8cc88e237bbf22c5260cc6aecc7521470ad14807eaadcdf97ed38c0d77fc630d61d38 SHA512 d02a121c069c1661c2f3b5084e1ea260e6611ab9b209fc6575dcb08f68bf36175ab9d9ebb7d1cd2eb4cd707165fd8c4357ce5c036f4835df2d4af4c88964f934
 AUX libvirt-5.0.0-do-not-use-sysconf.patch 7333 BLAKE2B 3a23b047deb1388cb46f26a060bf9f601d9659e89881314bfef4beea121aaea73331993216637672ae0eaba5185d81205c1e1d63ea628173d30c6558f9990b7b SHA512 00dfcedf03de7a8070e19724b0ffc6a9ffc1697001946b7338183ee7d5e6757c1351e018f46311c43167714631f023c7e12a1e57523c2684e498dc1aec27277b
 AUX libvirt-5.0.0-fix-paths-for-apparmor.patch 4274 BLAKE2B 886fd5bdf37e672e761bde9bc5b3e4902b174019bb8efda127f7a08cb6752b67745c10a3e3953063c746380bcf8243807fd6e9a154f48b7bd02c61e85e90325e SHA512 efe4c4c940d720c467f44f405ac4ca4d3867dee0a7e2fa2a7a4fbc263198089098c48d1207c30123b6a55f6ec6bee04f3edd3f23724af46bcb1343f87ca94de6
+AUX libvirt-5.1.0-do-not-use-sysconf.patch 7329 BLAKE2B 9a264edf879ddb448444fc44540d64dd33d0e2527eda0468b1e6025abf5c74c78536bc7005d68f101537c493ad6de76e9306525050fac0864d5fbccb45546c43 SHA512 4ef618586433d452e27f2d9ef5650b3dac6aa3c7fa71b227f55b0cfc4306c57f0fd4205ade86182ae5069e87d21980e54c2e9007810ee2538ea075786a0bc71a
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r2 5411 BLAKE2B a14ecc1bb7188dbbe3d0f82f301a73b876da2d82475cb38a503ed115e894bc59a0466daec5dd7665b3f0656c84ab58e2ba9f8f52eb54a4f8684094f951659fde SHA512 273bcc248ab659bb0cef12c03187f1445c00d2736912f3b54911137352a48b6fcdc2e0c76c56db984501acc4b9e8c0a4cf453a90947c5e525d0746ac9afa8505
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
@@ -18,8 +19,10 @@ AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de78
 DIST libvirt-4.10.0.tar.xz 14841188 BLAKE2B b52f2ed1c4c65930339a6b6fc9e7b034c7661edc0defdd78642f305b97332c33247bfc552efc43aa75a8d360c0d721d1a58a22fa7a016e7cf14ee2219d70a762 SHA512 a4f97aed6299c7954518ab88738ab781cee0755bfd64094a44468f77f99cac5eb2bc74ecd6aec90177317606ebd073292f5b5d0056054d1d94973fa938589fbd
 DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0fda80852978f7c857943858cc45eed9b74a3d42668f872540be2637f26c4d9d7859594847e58e6fb4cd33350130 SHA512 26710c7e5219f007524e9f93a642e55e4e8ea197afa6b2ca6a4b67b7028313f4b0d82924ee9a1e91ff688a4d2b53f89f3655fbeef0fa99a34f8418f37d787984
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
+DIST libvirt-5.0.0.tar.xz 14832576 BLAKE2B 8839a10e4ec8de012ca17e348efd75cbd94cc3b1cf378c867d958b61079105d6eb4f98d8d4b89dd5a6a368a3d9ea41f30498e44b7e039cdf8931ae6de8fa47b3 SHA512 d93042f49d2550d14577b5257c548d7108462fe1ad69420c128acf094ffd3e80deb744db13d4c3d5fbe5e4c1826d13131be12e3413710711a2d8cba6cb5a9db9
 EBUILD libvirt-4.10.0.ebuild 9664 BLAKE2B 917ab8653ce95ed8321c30aa0ba55db9a1b35eea19fef22f3720d978549328c66ebe706188ab76535a93fbee28374c159670d1e21759af7ef68e1e2119b74231 SHA512 2197606640c27deaa98a5eed7436a18cdf0969b96455d3a5104fbbe3b31c0740878efb33d3f882d2fcc6f046d50536b2fe788c516308d71e2ff72d5388ec7321
 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
 EBUILD libvirt-4.9.0.ebuild 9605 BLAKE2B c191450fab9fdf673dc15bc308e4d7a1d8adfc7b90f3e6bd1683d35424c4755a56d75a18105f406724e062b9df98d39ccef4fbd64f05a80791b2f73006662b2e SHA512 151f0930d2500205e25753465910a4f5806fc102f536a6624b9d6de02806dfa592c2b4bc37a1f11481a50bb4b30c30955f21976d74a0a95b3ebbc424c057b3fe
-EBUILD libvirt-9999.ebuild 9641 BLAKE2B 782bc6ed905e1b9d09b102f04c726a0d216e26851cf415acaf2acda983f26764b677dc64ae9705b3583a0a803bb2e996cde755f27595811d1ff0bf221fb0a51b SHA512 d3fc92f9e733a56fde88b9c17c5e5deff26dc1dcc84411bdce90e85ba73d955aef6d11e10bcff35a951fb6273306f4e2c1e7ddce59ff4aaac8811337c82c08d8
+EBUILD libvirt-5.0.0.ebuild 9641 BLAKE2B 782bc6ed905e1b9d09b102f04c726a0d216e26851cf415acaf2acda983f26764b677dc64ae9705b3583a0a803bb2e996cde755f27595811d1ff0bf221fb0a51b SHA512 d3fc92f9e733a56fde88b9c17c5e5deff26dc1dcc84411bdce90e85ba73d955aef6d11e10bcff35a951fb6273306f4e2c1e7ddce59ff4aaac8811337c82c08d8
+EBUILD libvirt-9999.ebuild 9641 BLAKE2B cc9c28723e56e570f31081f6ae4484894a401c921dddc26ac3c0920b021ac1a258f2e2fbdd67059bd9b64a07de847f1da0174389f7613ffafdd95e20eaadc6a7 SHA512 32459525ce46f12e96ebb6b87824a5167d079f05fb5bbf78e2ab8799977a302afd28d50d26fd7093776050eb96ff41722eced1e5cde3dc7a503ece5cdf32548a
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch
new file mode 100644
index 000000000000..3c32ab81f1d6
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.1.0-do-not-use-sysconf.patch
@@ -0,0 +1,216 @@
+From cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27 Mon Sep 17 00:00:00 2001
+Message-Id: <cbc26250bcdc4eb3b1c4e7e09c824f3504d41b27.1548428073.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 26 Jun 2018 06:51:06 +0200
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/Makefile.am                  | 29 ++++++-----------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 17 ++++-------------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 21 insertions(+), 43 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8c8dfe3dcf..25ced3abf3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -756,23 +756,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
+-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-
+-uninstall-sysconfig:
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+-
+ SYSVINIT_FILES_IN += \
+ 	locking/virtlockd.init.in \
+ 	$(NULL)
+@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ initdir = $(sysconfdir)/rc.d/init.d
+ 
+-install-init: $(SYSVINIT_FILES) install-sysconfig
++install-init: $(SYSVINIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(initdir)
+ 	for f in $(SYSVINIT_FILES:%.init=%) ; \
+ 	do \
+ 	  $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
+ 	done
+ 
+-uninstall-init: uninstall-sysconfig
++uninstall-init:
+ 	rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
+ 	rmdir $(DESTDIR)$(initdir) || :
+ 
+@@ -862,14 +845,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ 
+@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
+ if WITH_LIBVIRTD
+ if LIBVIRT_INIT_SCRIPT_UPSTART
+ 
+-install-upstart: install-sysconfig
++install-upstart:
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
+ 	      $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
+ 	done
+ 
+-uninstall-upstart: uninstall-sysconfig
++uninstall-upstart:
+ 	for f in $(UPSTART_FILES:%.upstart=%); \
+ 	do \
+ 	  tgt=`basename $$f` ; \
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 3c9d587032..2449b201d9 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 3d9ae36150..43736191d5 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 7f689e08a8..239beeced9 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 613c9a77f0..224b511074 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
+ uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
+ 	uninstall-bash-completion
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-
+-uninstall-sysconfig:
+-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
+-
+ EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
+ 
+ install-initscript: libvirt-guests.init
+@@ -362,8 +353,8 @@ uninstall-initscript:
+ 
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+ BUILT_SOURCES += libvirt-guests.init
+-install-init: install-sysconfig install-initscript
+-uninstall-init: uninstall-sysconfig uninstall-initscript
++install-init: install-initscript
++uninstall-init: uninstall-initscript
+ else ! LIBVIRT_INIT_SCRIPT_RED_HAT
+ install-init:
+ uninstall-init:
+@@ -394,12 +385,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 491ca62138..f0f417bffb 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 669b046507..45b0b9ea46 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+ #URIS=default
+-- 
+2.19.2
+
diff --git a/app-emulation/libvirt/libvirt-5.0.0.ebuild b/app-emulation/libvirt/libvirt-5.0.0.ebuild
new file mode 100644
index 000000000000..158a315e310e
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-5.0.0.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
+	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+	+qemu rbd sasl selinux +udev +vepa virtualbox virt-network
+	wireshark-plugins xen zeroconf 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 )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-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 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-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 )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zeroconf avahi)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--with-html-subdir=${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	newbashcomp "${S}/tools/bash-completion/vsh" vsh
+	bashcomp_alias vsh virsh virt-admin
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 158a315e310e..52082872960b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -124,7 +124,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-5.1.0-do-not-use-sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-5.0.0-fix-paths-for-apparmor.patch
 )
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8859cc4d75aa..a2d027c328a1 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,6 +10,6 @@ DIST qemu-2.12.1-patches-r1.tar.xz 3648 BLAKE2B 07908004d0b56e60274cb59d41637702
 DIST qemu-2.12.1.tar.bz2 41192583 BLAKE2B ff903a5850e406ab542ad1a84300852599fa9c199e0f3290e4d6ddad5284192577351278a18dd5706463b08e817b49340989a35987a04672f7cede2097d1d18d SHA512 4c85e6180bf7ec61c0bdddb20e104a7c93fe6b1de27f6aa50d75633eb78491cb844798a9e3f536245eff7b4ebe9a6227f5f66b418ced44095b8e59c5cb33d4cd
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 EBUILD qemu-2.12.1.ebuild 24027 BLAKE2B f4e1bf430fec2697b1342a9396477f6a5cca96873d523a45a7f039d163cec756e63b6f3b20f5698333060cd28c9f16e60ba15709d8b6bc4f150a11a3d91bcc17 SHA512 283808f805122536242bcaccfa4921a4ade19258cae7367c7a3edfb4445e7c82ba72ddac3bbc331ee8b276f89ceb17f9f4cd8ccbf55af4de952cfa5548c5e10b
-EBUILD qemu-3.1.0.ebuild 23753 BLAKE2B 50d710788c9ed85e648ca15e1773a9d3f711a7e9436eb42872a2182bbd33032a4b17d60c36bea37759aa27c461b64fa26da60b72dddbfde2028b22dc6b7bcca0 SHA512 bfcd5972472a97d6269ffd03e8c2f20007515e38714f8bfa3fbb5a8ac4e3d345b30d3bde14b7d2982b27f7345db8dd58a8d8d6ecb5c0b925aa98c41c488033d2
-EBUILD qemu-9999.ebuild 23546 BLAKE2B 2b927a47edb2b6f162722d31c03b71cc5e8b90aa85c69f8f15cb1e3b7df8b4c204641b5a24aa6eb1f0b05a036d52bb985819cede8477449654e14d47deddd805 SHA512 7db8e030f29994fe2c5768d1c0b92dbcf41d014c82a789b669b8fc45a3c1fc602e39fe89a700ea0ec54ad35088fbb47c732118893ff109d36d52655a9963dc72
+EBUILD qemu-3.1.0.ebuild 23805 BLAKE2B ea3ede46395301b46a3038fa4f6cf03ed5390248e30f52c7282b61c8165c76a85f76a4119add0a0389f1aa1a0584e95ffc0884304ecd9223149f49e70843b207 SHA512 d9691ac2f47a0adcb78d526ae0515e560b387fc6bb0c15951b03f707d02ccbab7a279c6c27dd1295789d2620dded9cf086f37029aaf8f3cf7701fd8291b1b022
+EBUILD qemu-9999.ebuild 23598 BLAKE2B ab5b68a5c4b24e1bd0fa41657f972437dde7512792df9b832af44d8c75076108a05332180443e66b2fe46fcbc95eaf17fde91a68bd68d0e9bdf2413280bc6c0e SHA512 38b9678beb2a0b025cda0b7eb231f90101fc099d4ea05a4c9f5b9e9189327a02dd1160a80b4d65e0f7a1623900d5640dc989ebdee5eacf17a2c7a2b74371b99e
 MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b
diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild
index 328afccf3466..316cf8925059 100644
--- a/app-emulation/qemu/qemu-3.1.0.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0.ebuild
@@ -768,7 +768,8 @@ pkg_postinst() {
 		udev_reload
 	fi
 
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	[[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
 
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 1c99bc24161a..7561f0f611c0 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -760,7 +760,8 @@ pkg_postinst() {
 		udev_reload
 	fi
 
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	[[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
 
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 92537df0ad93..dd5dd28430c8 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,10 +1,9 @@
-AUX reg-0.15.4-listen-addr.patch 1519 BLAKE2B f25399e776125d433cfbc15b4e48167b7606e1c2e23604d3e68fe1e262b4c1304f12d7e3b9f3cb17de77a485a4be483f17dc3627ba7a19b350e2752ed2c23e68 SHA512 d1d3303ccdf272d8526184a5be1f28107762681cf796a568ff01249b0ff6dc5c9c5c9d6a9f47bb244cdadd42f3b24e9b21fbe3d6cdc8bc410a681d4b606f48d8
+AUX reg-0.16.0-config.patch 8488 BLAKE2B d1c60fe817ef722f522ecd7503a7000b065c01853a01c22c2c37b1c0d10f8062c73636b40565f65de885e8fb583d318230e0c0ed8ca8f958f48369d14595089d SHA512 05a30d6cd08ff823be993cba4089d2290f6f58272c50f79ed3d84c915cdf5154789f9f809e4225b39397eab16052d1a5f002e43794d992184bc9528c2d378ccf
 AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e
 AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
-DIST reg-0.15.7.tar.gz 4300839 BLAKE2B 67c9ca344e0a2984559c210cbdb4f5fc42f588f0c50a171c145bc63953b7540cbc166b51a5c209a2ece0c3b5647a34ffc1ac6b439b4e5a243e505c223a1a6fe5 SHA512 4c26aa0a438ac87208c4e269e16a994587ccdab38399a664638dd8c7407cf06f00c43a9c3c71cf4c88fa47a6e4466c8143ee7ee8130a8133518f5017ca34cc2d
-DIST reg-0.15.8.tar.gz 4300575 BLAKE2B 554a6afebf0c662fa4e4076019b25aa600f327cc6d3fbd9aff3462b8d1faf0b790724bb9d66725766087f6e4a2ccf55a61f41e7aba936ed386d97cf52c54afab SHA512 23d45d061e2914818787e6837fd02ba7b4fcf5c96a511d5e6ee66689bfd925870780d7a9fcfe6ee98f2b74ce68f05eecfa9d00852ff79965f59c88684113e0d5
+DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
 DIST reg-0.16.0.tar.gz 2991496 BLAKE2B e94a53c79ff062013e091d4c558870ef5c25af181cba201a44fa38b9dfe8816d6f3fd581f4e9a3dafe5b3753a3755c31f8b2f4a347da134a969fc93ac296897c SHA512 1e4d936e406998ffaa176e7834b28970b594f88a339fd8447bef2f944efa9b51c1d35bf71b384b3ed1b3e84be08db6d7fd487f4a3c65aa2de0308d6128cf0070
-EBUILD reg-0.15.7.ebuild 1129 BLAKE2B 4544b2ad0c8bb6c8c5f78739dd8491011e4720d57a6ae33ec4b737934a04817e4f69ecfed4b6154c960b634936932d80982f2434c44e4410f10a871619b68fda SHA512 352bb21c0a996ef99e4e92de2e6f2647be886d4b113b12115e0613ff33390c4a70baaa934f559ef00dd232bb64c2a496f0a139748f829dc9d811c1d2e058c441
-EBUILD reg-0.15.8.ebuild 1126 BLAKE2B 1bf46f235473036c1661ea305c99e47e00903db4d143a37ccbbc14f7d6906806181c37c56b353bd22c38b567ad5b3dc271f6062d75e873c9004f0a70a5eec0f9 SHA512 2fa3b84b0f814308fb9bfa849b9cd9b8af356b098b37bdee816978f5f30440c38f18af25235861cd9b9cc80aaf845d553445bf7da76d07ca04224edc4f8fcee1
+DIST reg-0.16.0_p20190102.tar.gz 2994965 BLAKE2B c7cb8a0eaa1599a5464b7a98c3df0b146dbbfea884260b7c8cbf5393a9384c8875e38ea4e45c5f888c65b9bb8c326cf9934d9b3c32a4809fe8e3b23239e8f2a8 SHA512 90e92c15b7ca4f2a5f943cb80096af0eba50acd7691963609c25f15a6795f886843776180754ab7d28477f1fc3a4b8d916bc9ac99b768368471b31564d14769c
 EBUILD reg-0.16.0.ebuild 1126 BLAKE2B b061bda221d78e6104a5c8a00bc347d37f0d3b7462c1ece2bbaf07c3ad5fc6780a03523ffb745f3a642039dfaa6f8ee8d4320dc4f69280303769cfbd1fd960bd SHA512 9853a61cb5025252a2f08279775f79c3848b104fffb5201efd314fc4ecacbbf10ce5700f3d497caba3025c644c43094ea92daeca16dbcacab2d126b9c619e327
+EBUILD reg-0.16.0_p20190102.ebuild 1299 BLAKE2B c100acb533e4688c0d011c1904bb2fcde8760f99a94ee97683d8237550da5c58d9d65694b5545e44785f60403dce2fea7bf7d9c520ee9c66cdb5f48e0865dfd8 SHA512 d0d0295b3ec6adf101ae65a94762977425ed720a75b92d1f384e93d71f8468b643f72fb13e1baa4b59afca89f72ca97275e712cd5c8dddab254b29ec0a992cee
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/files/reg-0.15.4-listen-addr.patch b/app-emulation/reg/files/reg-0.15.4-listen-addr.patch
deleted file mode 100644
index 21f2759e5b8c..000000000000
--- a/app-emulation/reg/files/reg-0.15.4-listen-addr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b3c826e2e48108d832cbe9fc3b630e7ff207915a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Wed, 18 Jul 2018 19:47:12 +0200
-Subject: [PATCH] server: Allow to restrict listen address (#115)
-
-e.g. limit to listen on localhost only
----
- server.go | 12 +++++++-----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/server.go b/server.go
-index 8866efed..a7cc2048 100644
---- a/server.go
-+++ b/server.go
-@@ -35,6 +35,7 @@ func (cmd *serverCommand) Register(fs *flag.FlagSet) {
- 
- 	fs.StringVar(&cmd.cert, "cert", "", "path to ssl cert")
- 	fs.StringVar(&cmd.key, "key", "", "path to ssl key")
-+	fs.StringVar(&cmd.listenAddress, "listen-address", "", "address to listen on")
- 	fs.StringVar(&cmd.port, "port", "8080", "port for server to run on")
- 	fs.StringVar(&cmd.assetPath, "asset-path", "", "Path to assets and templates")
- 
-@@ -48,10 +49,11 @@ type serverCommand struct {
- 
- 	generateAndExit bool
- 
--	cert      string
--	key       string
--	port      string
--	assetPath string
-+	cert          string
-+	key           string
-+	listenAddress string
-+	port          string
-+	assetPath     string
- }
- 
- func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
-@@ -180,7 +182,7 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
- 
- 	// Set up the server.
- 	server := &http.Server{
--		Addr:    ":" + cmd.port,
-+		Addr:    cmd.listenAddress + ":" + cmd.port,
- 		Handler: mux,
- 	}
- 	logrus.Infof("Starting server on port %q", cmd.port)
diff --git a/app-emulation/reg/files/reg-0.16.0-config.patch b/app-emulation/reg/files/reg-0.16.0-config.patch
new file mode 100644
index 000000000000..3ec1bf44d032
--- /dev/null
+++ b/app-emulation/reg/files/reg-0.16.0-config.patch
@@ -0,0 +1,254 @@
+From 0ab86b565f437b9dede5d3a7cef56690d8d19bbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Tue, 18 Sep 2018 15:42:24 +0200
+Subject: [PATCH 2/2] server: Read config from file
+
+---
+ README.md          |   4 ++
+ config.yml.example |  37 ++++++++++++++++
+ server.go          | 107 +++++++++++++++++++++++++++++++--------------
+ 3 files changed, 114 insertions(+), 34 deletions(-)
+ create mode 100644 config.yml.example
+
+diff --git a/README.md b/README.md
+index 3b1b661f..5e0f0175 100644
+--- a/README.md
++++ b/README.md
+@@ -228,6 +228,7 @@ Flags:
+   -u, --username       username for the registry (default: <none>)
+   --listen-address     address to listen on (default: <none>)
+   --asset-path         Path to assets and templates (default: <none>)
++  --config             Path to config file (default: <none>)
+   -f, --force-non-ssl  force allow use of non-ssl (default: false)
+   --once               generate the templates once and then exit (default: false)
+   --skip-ping          skip pinging the registry while establishing connection (default: false)
+@@ -243,6 +244,9 @@ Flags:
+   -p, --password       password for the registry (default: <none>)
+ ```
+ 
++Alternatively you can provide configuration to `reg server` via a file passed to
++`reg server` via as `--config`. See also config.yml.example in this repository.
++
+ **Screenshots:**
+ 
+ ![home.png](server/home.png)
+diff --git a/config.yml.example b/config.yml.example
+new file mode 100644
+index 00000000..9d4be25f
+--- /dev/null
++++ b/config.yml.example
+@@ -0,0 +1,37 @@
++### Reg Server Settings
++
++## Path to server TLS certificate:
++# cert:
++## Path to server TLS key:
++# key:
++## Address to listen on:
++# listen-address: 0.0.0.0
++## Port to listen on:
++# port: 8080
++## Path Assets are stored under:
++# asset-path: /var/lib/reg
++## Generate static website and exit:
++# once: false
++## Refresh interval:
++# interval: 1h0m0s
++## Debug output
++# debug: false
++## Skip initial ping
++# skip-ping: false
++## Timeout
++# timeout: 1m0s
++
++
++### Registry and Clair Server Settings
++## Registry Server:
++# registry: r.j3ss.co
++## Username to authenticate against registry server
++# username:
++## Password to authenticate against registry server
++# password:
++## If true, do not verify TLS certificates
++# insecure: false
++## Force allow use of non-TLS connections
++# force-nonssl: false
++## Clair Server:
++# clair:
+diff --git a/server.go b/server.go
+index fcd4cd71..0c84d85d 100644
+--- a/server.go
++++ b/server.go
+@@ -4,7 +4,9 @@ import (
+ 	"context"
+ 	"flag"
+ 	"fmt"
++	"gopkg.in/yaml.v2"
+ 	"html/template"
++	"io/ioutil"
+ 	"net/http"
+ 	"os"
+ 	"path/filepath"
+@@ -29,39 +31,76 @@ func (cmd *serverCommand) LongHelp() string  { return serverHelp }
+ func (cmd *serverCommand) Hidden() bool      { return false }
+ 
+ func (cmd *serverCommand) Register(fs *flag.FlagSet) {
+-	fs.DurationVar(&cmd.interval, "interval", time.Hour, "interval to generate new index.html's at")
++	fs.DurationVar(&cmd.Interval, "interval", time.Hour, "interval to generate new index.html's at")
+ 
+-	fs.StringVar(&cmd.registryServer, "registry", "", "URL to the private registry (ex. r.j3ss.co)")
+-	fs.StringVar(&cmd.registryServer, "r", "", "URL to the private registry (ex. r.j3ss.co)")
++	fs.StringVar(&cmd.RegistryServer, "registry", "", "URL to the private registry (ex. r.j3ss.co)")
++	fs.StringVar(&cmd.RegistryServer, "r", "", "URL to the private registry (ex. r.j3ss.co)")
+ 
+-	fs.StringVar(&cmd.clairServer, "clair", "", "url to clair instance")
++	fs.StringVar(&cmd.ClairServer, "clair", "", "url to clair instance")
+ 
+-	fs.StringVar(&cmd.cert, "cert", "", "path to ssl cert")
+-	fs.StringVar(&cmd.key, "key", "", "path to ssl key")
+-	fs.StringVar(&cmd.listenAddress, "listen-address", "", "address to listen on")
+-	fs.StringVar(&cmd.port, "port", "8080", "port for server to run on")
+-	fs.StringVar(&cmd.assetPath, "asset-path", "", "Path to assets and templates")
++	fs.StringVar(&cmd.Cert, "cert", "", "path to ssl cert")
++	fs.StringVar(&cmd.Key, "key", "", "path to ssl key")
++	fs.StringVar(&cmd.ListenAddress, "listen-address", "", "address to listen on")
++	fs.StringVar(&cmd.Port, "port", "8080", "port for server to run on")
+ 
+-	fs.BoolVar(&cmd.generateAndExit, "once", false, "generate the templates once and then exit")
++	fs.StringVar(&cmd.AssetPath, "asset-path", "", "Path to assets and templates")
++	fs.StringVar(&cmd.configPath, "config", "", "Path to config file")
++
++	fs.BoolVar(&cmd.GenerateAndExit, "once", false, "generate the templates once and then exit")
+ }
+ 
+ type serverCommand struct {
+-	interval       time.Duration
+-	registryServer string
+-	clairServer    string
+-
+-	generateAndExit bool
+-
+-	cert          string
+-	key           string
+-	listenAddress string
+-	port          string
+-	assetPath     string
++	Interval        time.Duration `yaml:"interval"`
++	RegistryServer  string        `yaml:"registry"`
++	ClairServer     string        `yaml:"clair"`
++	GenerateAndExit bool          `yaml:"once"`
++	Cert            string        `yaml:"cert"`
++	Key             string        `yaml:"key"`
++	ListenAddress   string        `yaml:"listen-address"`
++	Port            string        `yaml:"port"`
++	AssetPath       string        `yaml:"asset-path"`
++	configPath      string
++
++	Password    string        `yaml:"password"`
++	Username    string        `yaml:"username"`
++	Insecure    bool          `yaml:"insecure"`
++	Debug       bool          `yaml:"debug"`
++	SkipPing    bool          `yaml:"skip-ping"`
++	ForceNonSSL bool          `yaml:"force-nonssl"`
++	Timeout     time.Duration `yaml:"timeout"`
+ }
+ 
+ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+ 	// Create the registry client.
+-	r, err := createRegistryClient(ctx, cmd.registryServer)
++	if len(cmd.configPath) > 0 {
++		config, err := ioutil.ReadFile(cmd.configPath)
++		if err != nil {
++			return err
++		}
++		yaml.Unmarshal(config, cmd)
++		if err != nil {
++			return err
++		}
++		if len(cmd.Username) > 0 {
++			username = cmd.Username
++		}
++		if len(cmd.Password) > 0 {
++			password = cmd.Password
++		}
++		if cmd.Debug {
++			debug = cmd.Debug
++		}
++		if cmd.Insecure {
++			insecure = cmd.Insecure
++		}
++		if cmd.SkipPing {
++			skipPing = cmd.SkipPing
++		}
++		if cmd.Timeout != 0 {
++			timeout = cmd.Timeout
++		}
++	}
++	r, err := createRegistryClient(ctx, cmd.RegistryServer)
+ 	if err != nil {
+ 		return err
+ 	}
+@@ -69,25 +108,25 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+ 	// Create the registry controller for the handlers.
+ 	rc := registryController{
+ 		reg:          r,
+-		generateOnly: cmd.generateAndExit,
++		generateOnly: cmd.GenerateAndExit,
+ 	}
+ 
+ 	// Create a clair client if the user passed in a server address.
+-	if len(cmd.clairServer) > 0 {
+-		rc.cl, err = clair.New(cmd.clairServer, clair.Opt{
++	if len(cmd.ClairServer) > 0 {
++		rc.cl, err = clair.New(cmd.ClairServer, clair.Opt{
+ 			Insecure: insecure,
+ 			Debug:    debug,
+ 			Timeout:  timeout,
+ 		})
+ 		if err != nil {
+-			return fmt.Errorf("creation of clair client at %s failed: %v", cmd.clairServer, err)
++			return fmt.Errorf("creation of clair client at %s failed: %v", cmd.ClairServer, err)
+ 		}
+ 	} else {
+ 		rc.cl = nil
+ 	}
+ 	// Get the path to the asset directory.
+-	assetDir := cmd.assetPath
+-	if len(cmd.assetPath) <= 0 {
++	assetDir := cmd.AssetPath
++	if len(cmd.AssetPath) <= 0 {
+ 		assetDir, err = os.Getwd()
+ 		if err != nil {
+ 			return err
+@@ -131,12 +170,12 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+ 		return fmt.Errorf("creating index failed: %v", err)
+ 	}
+ 
+-	if cmd.generateAndExit {
++	if cmd.GenerateAndExit {
+ 		logrus.Info("output generated, exiting...")
+ 		return nil
+ 	}
+ 
+-	rc.interval = cmd.interval
++	rc.interval = cmd.Interval
+ 	ticker := time.NewTicker(rc.interval)
+ 	go func() {
+ 		// Create more indexes every X minutes based off interval.
+@@ -174,12 +213,12 @@ func (cmd *serverCommand) Run(ctx context.Context, args []string) error {
+ 
+ 	// Set up the server.
+ 	server := &http.Server{
+-		Addr:    cmd.listenAddress + ":" + cmd.port,
++		Addr:    cmd.ListenAddress + ":" + cmd.Port,
+ 		Handler: mux,
+ 	}
+-	logrus.Infof("Starting server on port %q", cmd.port)
+-	if len(cmd.cert) > 0 && len(cmd.key) > 0 {
+-		return server.ListenAndServeTLS(cmd.cert, cmd.key)
++	logrus.Infof("Starting server on port %q", cmd.Port)
++	if len(cmd.Cert) > 0 && len(cmd.Key) > 0 {
++		return server.ListenAndServeTLS(cmd.Cert, cmd.Key)
+ 	}
+ 	return server.ListenAndServe()
+ }
diff --git a/app-emulation/reg/reg-0.15.7.ebuild b/app-emulation/reg/reg-0.15.7.ebuild
deleted file mode 100644
index b8476ff5ffcd..000000000000
--- a/app-emulation/reg/reg-0.15.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot user
-
-EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="a761fadc9a1f26a9da8113acc4ea5d8d5fbe5043"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup reg
-	enewuser reg -1 -1 /var/lib/reg reg
-}
-
-src_prepare() {
-	pushd src/${EGO_PN} || die
-	default
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md
-	insinto /var/lib/${PN}
-	doins -r src/${EGO_PN}/server/*
-	newinitd "${FILESDIR}"/reg.initd reg
-	newconfd "${FILESDIR}"/reg.confd reg
-
-	keepdir /var/log/reg
-	fowners -R reg:reg /var/log/reg /var/lib/reg/static
-}
diff --git a/app-emulation/reg/reg-0.15.8.ebuild b/app-emulation/reg/reg-0.15.8.ebuild
deleted file mode 100644
index 19474d72cfc7..000000000000
--- a/app-emulation/reg/reg-0.15.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot user
-
-EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="d021aeb0b9786eac1212b5faaa70d11f56c60991"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup reg
-	enewuser reg -1 -1 /var/lib/reg reg
-}
-
-src_prepare() {
-	pushd src/${EGO_PN} || die
-	default
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md
-	insinto /var/lib/${PN}
-	doins -r src/${EGO_PN}/server/*
-	newinitd "${FILESDIR}"/reg.initd reg
-	newconfd "${FILESDIR}"/reg.confd reg
-
-	keepdir /var/log/reg
-	fowners -R reg:reg /var/log/reg /var/lib/reg/static
-}
diff --git a/app-emulation/reg/reg-0.16.0_p20190102.ebuild b/app-emulation/reg/reg-0.16.0_p20190102.ebuild
new file mode 100644
index 000000000000..3d7a774209c3
--- /dev/null
+++ b/app-emulation/reg/reg-0.16.0_p20190102.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml" )
+
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="d959057b30da67d5f162790f9d5b5160686901fd"
+ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup reg
+	enewuser reg -1 -1 /var/lib/reg reg
+}
+
+src_prepare() {
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}"/reg-0.16.0-config.patch
+	default
+	popd || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+	insinto /var/lib/${PN}
+	doins -r src/${EGO_PN}/server/*
+	newinitd "${FILESDIR}"/reg.initd reg
+	newconfd "${FILESDIR}"/reg.confd reg
+
+	keepdir /var/log/reg
+	fowners -R reg:reg /var/log/reg /var/lib/reg/static
+}
diff --git a/app-emulation/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 3b978dc13b26..807e2cf43a94 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -2,6 +2,6 @@ AUX spectemu-0.99.3-automagic.patch 904 BLAKE2B 25148e965f342a987b669c5b400bf0ce
 AUX spectemu-0.99.3-build.patch 1077 BLAKE2B 97038955c78e88f28c1812c3d6de8ef7e28b038a55fc7069035b9ebf99f54a83b5aea3ef21a7da8bfadc55dc8da4baa0dff634461a55f3583cc9d46c2721530f SHA512 9a650e52eb07e2bbd1109b5fe27417b3891aff79a9a7783c59fd683b4309eb9447672b4a20c0f7746fab60250d865e1d5cdbc8957e5813cec4bfebed996af493
 AUX spectemu-0.99.3-qa.patch 687 BLAKE2B fca83cada81c88c3d8e0ca5f6c66ddc593c9f1d019137708be50112d9a3283212a0fb9054859fadb161ddcf75087ffdf81bf698c9cd1dcbb2a66d19cc690dbb3 SHA512 854db7e4ab1abae52b225adb6a82b71a52a217087187970589eb694dcfdc54d8a36c7456470e8871e9af5736bc59e8f727ea5390ac5f6303e42a1d0c5efa7791
 DIST spectemu-0.99.3.tar.gz 269524 BLAKE2B f934e059bc40be8e6b3bae64c68a57654ea6d2dd9ab013dd7124446ade51b3e54cbf0d6b737f0c7c930dbd9eea89d619d47857310ea01cf2021f0e2f5a6dc54f SHA512 a2efcf46a2481a213825b452987626ade3fa95a525d26bd11a315ef885eb4f536343a7a58389733f459d05486b3da73e81503a0988ebe768ad93b089351f3e25
-EBUILD spectemu-0.99.3-r1.ebuild 888 BLAKE2B 2178e3dfb2ec3a1e3c1eddbb1a1103330e7854f7ba2ca50d147ddaff88cce5986bd01c9e3f629a410f2bd65b4e4f676dd7076472e542de41dfc3dd1ac4dc3264 SHA512 24dcf1097b3f619149364c52f9b1246428c8978d053ad5fdb913a10fbe51aeb3ad950ca56ed09285c2e0833571e6610ea4494ff0b79634870b4b7cd698913845
+EBUILD spectemu-0.99.3-r1.ebuild 884 BLAKE2B 8e903de062bdc6793355f0952ad8e770de96a81ab5bd2c6a0cdf8d932f0807210495f456eb8553557bc30ca870a7cf50d4281c07e23667f495f26d7defefa218 SHA512 44292e15d00bd8aa9bb14389aedab93bb3468b8a82e5128bfbc6b4f581193419be5c524647cabcca5460436b71f5e134b6ed2c9062cef2c7df3a9c02a81a4696
 EBUILD spectemu-0.99.3.ebuild 1195 BLAKE2B a728907fe7bce7fa5ce44c527bd4b6a48ad12099989ee7bb8d5d1a6fc71c4162540950183171779bc69876f6969de146fdc85b39cd6ba81aefa7446767bc91b6 SHA512 9ffa31f36c179bcd47e47f407e09367cfd1abcb459e1b13026b7e72a7fff82dab8910c249ac3bc0810254830911d9c7c495197e721cf1f67302e136a36564a1a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index 478549c3d5ca..9f0f7fdafdae 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-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=4
@@ -11,7 +11,7 @@ SRC_URI="http://www.inf.bme.hu/~mszeredi/spectemu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="readline svga +X"
 
 REQUIRED_USE="|| ( svga X )"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 7ffce3e18fc7..7e1edbca3db3 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,11 @@
 DIST VBoxGuestAdditions_5.2.22.iso 58013696 BLAKE2B 196f0048b685200328bcf753f3df23eac6477ce863885e93a54951795368bf62bdaa497589001ec203d75809b1f74ebbaa80419406d26bc7db43a131f5b9d698 SHA512 b320174b2f2ef796ac2c9c920579be38f0cedaa037d21992863ac355ecf6e99ae2aea56c70fb2034e9e03afac2cd7297f7717b447a6981701755593110164d37
 DIST VBoxGuestAdditions_5.2.24.iso 58429440 BLAKE2B ee5b2751238da4372c4164c02e96c5bc6a1dbfb6670f7cd8912415680e99118e65c8f4c765c7d5f9dcf521644a011540e289357fe38e715d6264fa84b5d7ef1b SHA512 e05f75f3a5974efba6f64606d255a03ddf104deec3c300a9369c06d603aa3cbf70b73cdfeda2ce1fcd1c36da472bc190da0ed4e908bd6dbcf857104c99a61b05
-DIST VBoxGuestAdditions_6.0.0.iso 79245312 BLAKE2B 413501b62bb6c8a0b1cef8255c631d4bc6c919b3a9c15e0fd780f6196e299f72ede083d51ca8f32bb83ec6d9384f1959c619bc5df67495a23bce503cf45c39e8 SHA512 4064bab634e8ebd75bc80c47ebd9a2596701505e15ebe872e1b599a42588ece307f90febfd474e429cd7e5e4ecf063bc7e37d666c6ae369f8f97b36a0e0ed81d
+DIST VBoxGuestAdditions_5.2.26.iso 58433536 BLAKE2B 1d7bae647923a57cdcee38a1609a07cd081d593a0852dcf67b549ed178508e93f7ee4d076ac700ab7e7ec828e660eb09cc8a55a0f2400b1ff0912cc2fafdff7f SHA512 fea91c442d3f05a35435155d3a3890e2c29e2523f1106cc8c7fb6513826263ff450e72b393796e0dff99b3bd85d85d8d55309e81f68ddfd39689df8f54bca1fe
 DIST VBoxGuestAdditions_6.0.2.iso 85905408 BLAKE2B c5ce6d2cc3c15032f5d6733df72f938f2e5b0e996d467464e0229cfd8b8a2ba57f4f3878d94f769f0dfda48b14e426815925d883add6934a2c3f72ac1a41d6cb SHA512 53e82fbec7f1e04f473f0add3a0e03e2abfb9e88b57d7501d28310c36ae26af835d52a76104b31a8a4dc69ff31b6826c7c391622cdf3977df7ab7c4181d0e7dd
+DIST VBoxGuestAdditions_6.0.4.iso 85917696 BLAKE2B 2fa419ef8524b46afb327bd1f5e53bec6df7fa53d6608bb25e5d986d8be9eaf2e0e7a37523beb56981380e8f4ad41ae48eb5ec23505a382c57fda737ec999caf SHA512 ad9afd9941cac771a156071df3a054225643e39059c84abc0c0c2525d0fa32d5bc5a144b1fef367f92e0216f8f9fc73ef961eeead648421ea30465650516bc88
 EBUILD virtualbox-additions-5.2.22.ebuild 710 BLAKE2B 1dfdfb7943723926e5d78af8a313f1faa238b1fe09a097ae2ba9b722d78fc205d0928817d416a3012b92ceb32e269d348f3b778b562c07f82a55d3518ff2b8de SHA512 0b0506759c3a98953082ae8babd433522454ade47af62984eefffb1cd37b860ca3423e04386cef219533bd01fd8109c2b2b1ec29aacc82a8228115717e49e8ae
 EBUILD virtualbox-additions-5.2.24.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
-EBUILD virtualbox-additions-6.0.0.ebuild 768 BLAKE2B 5f69263610ef425399c0fab670ec4341c642b25cc572f3282177958c299d2587b01a0ce85aa5b358dd57deb7a5485ddb92b3783c28f0e30b0fbf91359c5c3dc7 SHA512 aaea93c1a095efa4ad23b9bbc2e9b08b4f0280ada15c69828a2cb740bb355435684388b2d48a73984dab9ef1003ed6dc059d69e42c1a813086248eb714fd2877
+EBUILD virtualbox-additions-5.2.26.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
 EBUILD virtualbox-additions-6.0.2.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
+EBUILD virtualbox-additions-6.0.4.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
new file mode 100644
index 000000000000..6faf7e7e8a0d
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.0.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.0.ebuild
deleted file mode 100644
index 744845298696..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.4.ebuild
new file mode 100644
index 000000000000..5124a818a150
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 0cb4fa4ea8d8..1569b37eb665 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -6,20 +6,25 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz 19683939 BLAKE2B ce05e159172e34e1d520b3783d77db06aa8f91067cc743beb1eeafaf01508e830f5fe9501cb1f3a6d99492e3046ec2dd2fec94ffd39a237ef4679352492aaa1a SHA512 035103e420d773201ad24093910d7175a5d548f19de4a58900e78e2ebfac711851c99375977ba9fd47fced234346437164d226592b7070a867a1d13fd534a3b5
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz 23289693 BLAKE2B 13e1ad30b40676ed2e11cf26957377696a9f30a7a92bda0ca5f69039ffebe4abf3bb0224844609a29ac217b227e4d1906c70cd404d3967a26dc0ace3bf4d2ccd SHA512 29b682bf8130f73b25a82e97053847077d9eb48f0510db7fb0cf2e817e1e6b9a6e7ded54ede7447c56aa7b219d32a2d6ee19cb0efbe5c7e0a984c5e137fada51
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz 23290549 BLAKE2B f9ac1a560d5e8b9b73efa21e3623c9f6f0d7769eb4cad7b01d8f68a135a74573659a0a9b092f7ab35beb348ed2722fcf7862aa66e47987b33038f488b88b1129 SHA512 ee54cbdf58de8d37ba84fffd2baec2c9d3915feeab715767515fd6d6ec3032dad2f02509b08cea24754cfce0974a7c1b29c6050bff466af53c1ac6589f4c0215
 DIST VirtualBox-5.2.22-126460-Linux_amd64.run 88821201 BLAKE2B 1b0433844247ee9531af915dcbb740183fa29fb296f8c78b4165cc3b48300da71f7d329026983da581ffff0d7b8976a2e5e32d5e948861a557ddfa2437813ea0 SHA512 22b20a68884a114818fcdfe9a459a7c3b1b3598526a74cc66407f5bcdc6eb6bcbe022b820477ccdc081e22349777b73fac9d6126585ee3c8fa0d3d24624006f3
 DIST VirtualBox-5.2.22-126460-Linux_x86.run 87817677 BLAKE2B 5f11e5f92386c9524869082cf1a5af413c69fe5b36b1ace58887076000c7b928267eb7c3be22282885d6871ccdcee981ec79a526c71f281f0e8ada5858194851 SHA512 32d44b6d691e33a1ee1426cb7a3cb3648722709c588d177951b8be802546faadfd612567981bbbfed3d782b18260e6e638e7879813f3b06bb5a8387b052b0227
 DIST VirtualBox-5.2.24-128163-Linux_amd64.run 89282001 BLAKE2B affd8768878cf25209b7a53dc024ff1798d2c2e007031d40b39c5245df608cc09fdb19c216075b0ec7a4fd63ff580731b1b04838d5d6dc81bd126fed005ea355 SHA512 f22e3c71e5c3f923edc14fbae0191a5d1262426166984e19c784e2b0a332296f949d2a9eeca6972c1f16a0f9573c1f9807c556d4dab2bd500d5b73e22485c7e1
 DIST VirtualBox-5.2.24-128163-Linux_x86.run 88391118 BLAKE2B ffc44c55f664e4bc2c2e8bf09d95fda3631541b4b4b1dca7735dd5fcbf12da8258065fa13466ce23229126fb84b0193eee7cd794cf09f631ce124c4fd6558f16 SHA512 a7350a8266c6b3522be91158d765ce31b69acbfd67b6056a96361e0cb48926cee115c8f3df4d1965fd7b082d3f487f9f655253620a8357dbfadfbd2320ad6a3b
-DIST VirtualBox-6.0.0-127566-Linux_amd64.run 148766154 BLAKE2B 2e23341dc798aabc1fd696422073516b6f2f70b9bee525ef22528b72abf38acf24599442e5c56d52c24af48f5ae6e2e6cdee981293fc644fac965cc34041a101 SHA512 19b11f7cf62288624739547755a7732b7d355ba61040c7e951ecbaf0ce75252075e8168aa41054e31fa36d45998f1ae1136b65d09981475a3052c4da7fd3021b
+DIST VirtualBox-5.2.26-128414-Linux_amd64.run 89220562 BLAKE2B d937e3a8f622ed1afc8ab7d2479401c6b41f6b1404197b2d86933d741a209071b1bc98de14ea4f25b2b0f2a22a328393908f85955f8879dbf8b28e2b981e4d04 SHA512 c8d7741408d234e7c05709dd0ed66d30b427b0f39976f232b1fe8a17160d36c4dda7d3adda46a38cbdd6626d34570805f582ac0aae2a975385a1f1d06e97f354
+DIST VirtualBox-5.2.26-128414-Linux_x86.run 88339918 BLAKE2B 0fe177a8d9ab4c4cb894151a00f9554713dee27af1fe3036591a0e7865c8869eef17368ab42270d5a9081c849e6550ebef809c3f8f09a9238e2f5a5f0c9e76e5 SHA512 6a809cf29a2cd70bddeca0443955ea10044553ef85744949b604f92a8bca96b9deb1c37f723388d1f27f903c9469e7cb853a0bf7d6928bb18ba61cb19b216fba
 DIST VirtualBox-6.0.2-128162-Linux_amd64.run 155114954 BLAKE2B 0159383d2bd3ed0e454e03db61d7466e06b63222da364ae8c8964ac418c2a5de6b78c320c989bc497e6fc98051434d3e480d1bd16e0f92f8ac2fde8a60af088e SHA512 10b0971b81158f80de918f5ae9e0261eaec23ac7b5b3a8117c7d757a3044559648860b70d5688b58bcda1d0bdd36b1df70d5d0c8c1a65c53e1a65112beba1fff
+DIST VirtualBox-6.0.4-128413-Linux_amd64.run 154920406 BLAKE2B 518ef3ee6a5b8d066b9238ea3660cce5898b15471805cdcc508471a8a7b1003d5b4d894a8de5be4e70a67abe77dd05ce7d463603081749836d1e6b58aa43aa04 SHA512 a35cbc5d726acde31939d8729695cb041c8e962af3f4894153e5779af4efa1b260f0f021de9c5a3edc651271e7adfa1818d6b9c1e081155f483cb148555e52b5
 DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
 DIST VirtualBoxSDK-5.2.24-128163.zip 10153218 BLAKE2B e0a86462396eaa3fb9aa475ab40ee810874f61d3e9f37050b4aba36e6b5150e3699303b7f9989e32e794b9f67de4340ff008fa67339a3c45678005d126a17c27 SHA512 fbc12076ee968a6066f6ac81ff1555e10710d10d7821be24a4b4371a4f4b0409bed2d209904daa2b3f98a7998357558ca158bd76b87c5449815843312b669627
-DIST VirtualBoxSDK-6.0.0-127566.zip 10749531 BLAKE2B 98a9d1d85a5d835e9a6d1ed121f6650d795a695bf40fb05af235eba6454237a79487f801d6351f3c446b523001271faac8cc09880522f97cae73360c1179edf5 SHA512 1f25b9249c5e1e0a7caee867b1508f517e16afd23055decfe27a513d1199ebc72bfcd391a8e750403ddb80a4087df7cfd928604b827976d7075829c7e3d82e00
+DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
 DIST VirtualBoxSDK-6.0.2-128162.zip 10753904 BLAKE2B 52824830e3d816df57932d8812a959dc3590eeabe8b7ba1dc8927d7eac7bea0c4584e0f2d62b405fdb8d5833fc93792dfcd7c2cfc2714237ecb8dbf26be36f11 SHA512 d7d1d60c7ffc4022de16dccc7786bbc4d481cef26e105932158955cc4350d65a6ac5bffa01a319baee5a64f4ae7d016ba50f82128bef6e11e54e72e82e73c168
+DIST VirtualBoxSDK-6.0.4-128413.zip 10755635 BLAKE2B 60333b130adbacc85a84c65ee638effcb6d1a226957c48907df342853b0a9ba4d5632d93858e539fafe2ec28befaa7de584538b46ee83a05789b065a05c3107c SHA512 de2c3e979fe35cda8b433c27f4ce52d5c86e7c0bdfb061a758fce642d4aab908c7c6808c3110ec81d4967977768de95ee8be5cd330d634d3dc9711dd77f17867
 EBUILD virtualbox-bin-5.2.22.126460.ebuild 8327 BLAKE2B 02bf2b29c01c69a3e8321964f494c274c0d22fd1e360235a919ebdc0a0d4c716a51540c51ff85aec6ea7f5a7cc4bb4b4625eca877e23458bb8e57fdf2c5e300b SHA512 b9a91b54c1d0a368b98a021cd24af53c452cc5731fb3495dc7f6e26578bab84d297cc7dd4e0847e8ecf696aa0057c103e1b241fa90d0dfdb11954ea15786438f
 EBUILD virtualbox-bin-5.2.24.128163.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
-EBUILD virtualbox-bin-6.0.0.127566.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
+EBUILD virtualbox-bin-5.2.26.128414.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
 EBUILD virtualbox-bin-6.0.2.128162.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
+EBUILD virtualbox-bin-6.0.4.128413.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
new file mode 100644
index 000000000000..e4f534871c4c
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild
index 871816079601..871816079601 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 75c5ee819b63..fca823b9e98a 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,11 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz 19683939 BLAKE2B ce05e159172e34e1d520b3783d77db06aa8f91067cc743beb1eeafaf01508e830f5fe9501cb1f3a6d99492e3046ec2dd2fec94ffd39a237ef4679352492aaa1a SHA512 035103e420d773201ad24093910d7175a5d548f19de4a58900e78e2ebfac711851c99375977ba9fd47fced234346437164d226592b7070a867a1d13fd534a3b5
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz 23289693 BLAKE2B 13e1ad30b40676ed2e11cf26957377696a9f30a7a92bda0ca5f69039ffebe4abf3bb0224844609a29ac217b227e4d1906c70cd404d3967a26dc0ace3bf4d2ccd SHA512 29b682bf8130f73b25a82e97053847077d9eb48f0510db7fb0cf2e817e1e6b9a6e7ded54ede7447c56aa7b219d32a2d6ee19cb0efbe5c7e0a984c5e137fada51
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz 23290549 BLAKE2B f9ac1a560d5e8b9b73efa21e3623c9f6f0d7769eb4cad7b01d8f68a135a74573659a0a9b092f7ab35beb348ed2722fcf7862aa66e47987b33038f488b88b1129 SHA512 ee54cbdf58de8d37ba84fffd2baec2c9d3915feeab715767515fd6d6ec3032dad2f02509b08cea24754cfce0974a7c1b29c6050bff466af53c1ac6589f4c0215
 EBUILD virtualbox-extpack-oracle-5.2.22.126460.ebuild 1005 BLAKE2B b351b31f86d398933afbb8961b07050c9c1d4915eb1679a2a01db45dd6d55bc88ff832add19e2bb1b71731022a180e46830458a18489c0bfed9b9828ea438cbc SHA512 c3aadd73eaefa8c3283eb84a10c53da0d9ebb0e03e86baaea25170f9728b131f093cc14a531d83180072c4692cf62d55ffc7be073bdff03b16d69d37430a2784
 EBUILD virtualbox-extpack-oracle-5.2.24.128163.ebuild 1007 BLAKE2B 6b77c2fb22452f5ba431afdc6a13653eda458b71c94e464bb868cdd77017ca75f69b0eacd4cee788a731ebf5593a091cb9c8b3aa5c466beed5142cbf6fdcf8b7 SHA512 2759daac5078c490ace6d25070f72dd0bfc672146980631e207d5886ab80da24c67eb6972f6b314c473c3c635f2d2e2e2aea15564b4ea1e90a51defa1524571b
-EBUILD virtualbox-extpack-oracle-6.0.0.127566.ebuild 1065 BLAKE2B 5aa610967f7fff026a9dc48d093376fdf6df0d8fb330faf9604eb8799149ae33a8c7a85071236be49285a05f618a59819d16a8a8f977da897433c44eb7e1cf33 SHA512 17910c0b5fdc745a3013fdcb791fd4f99cf7b5b85fceda8a116fe4f75a02de3087d28ded850de257ec55e6252d68f27a337fb4fa2a993755bc2184d2e98e5a6e
+EBUILD virtualbox-extpack-oracle-5.2.26.128414.ebuild 1007 BLAKE2B 6b77c2fb22452f5ba431afdc6a13653eda458b71c94e464bb868cdd77017ca75f69b0eacd4cee788a731ebf5593a091cb9c8b3aa5c466beed5142cbf6fdcf8b7 SHA512 2759daac5078c490ace6d25070f72dd0bfc672146980631e207d5886ab80da24c67eb6972f6b314c473c3c635f2d2e2e2aea15564b4ea1e90a51defa1524571b
 EBUILD virtualbox-extpack-oracle-6.0.2.128162.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
+EBUILD virtualbox-extpack-oracle-6.0.4.128413.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
new file mode 100644
index 000000000000..e598ba638113
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127566.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127566.ebuild
deleted file mode 100644
index a3fc85c66faa..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127566.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
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.4.128413.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.4.128413.ebuild
new file mode 100644
index 000000000000..a260ead1a63b
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.4.128413.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 02bfc3695e3f..a385ffcce0eb 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -6,12 +6,14 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-5.2.24.tar.bz2 118369194 BLAKE2B 2073ec85a641ae80113d41e8363401da5afaf6ea442c2a3c537341f39e06a03a7175463605133e642988f72c4adde4f987905c08f4ba58460953af7169cb4ca0 SHA512 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410
-DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
+DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-6.0.2.tar.bz2 155125777 BLAKE2B 2d902fd1963305883eebba85daa03bd17fe8a9ba20e7a6482508879068a809ee80c4a5caffeb26acd0fd4ad29f6f60cf963e1d314e4b01f137ede5b589a74cb9 SHA512 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
+DIST VirtualBox-6.0.4.tar.bz2 155233564 BLAKE2B 6bc4d450e275e8aac5dc62ab05d9ba1450e13965f3eba64819315d121bd0e515319be2ad92ab429f2e598e157e89660561de69a2aac87e14792284669bcec7e8 SHA512 c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-guest-additions-5.2.22.ebuild 6010 BLAKE2B fdf621c8d0f93220553c81b877571144c1bb2fdf000db0a45350fbc98f0cf96b703029874459fc56cec303d7c63c2046a1225a964b58fb45c234a4a679829e11 SHA512 acda6a782e5ebc605ff37c7c814192f87f607a67fba5ac49bdab201faf7326352c4153c0f74bd4431789763641879d781631d5c52cf23c1b583d91da4c9e2ebe
 EBUILD virtualbox-guest-additions-5.2.24.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
-EBUILD virtualbox-guest-additions-6.0.0.ebuild 6073 BLAKE2B 5190c5b2f7bb43768c5c383946fc32c8ab558a4695b431706baa31fe32f17643daa6915c4cb2a3d76abc006dbd463eb3d32f1ad0036c7d00dbc62dd75e33ea51 SHA512 827bb031a87b240a0da583d077839afe834947c25c6f03dbd54cc18b494524522a1a65a8bee56d5533c2a6fb1f2dff53d2be313b5b1d736ada7694272a93db9e
+EBUILD virtualbox-guest-additions-5.2.26.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
 EBUILD virtualbox-guest-additions-6.0.2.ebuild 6139 BLAKE2B 4d9a0a2ada7b0f88f4b8edd46720c6c43315ec64f7a8b8e64339424cbfb2bf8b8eee457ade3c72ddf014cf7b15df970a240c7d5a896ca0d309605033dc903eb7 SHA512 93ea063d27b7a4a321b1875923d1e4749690d4fa320802abab67d908f999e8aed33f16f5092d4642a2b8a5c2f35464f85d4e1f9061eaf9df2a0a6d2809728e27
+EBUILD virtualbox-guest-additions-6.0.4.ebuild 6139 BLAKE2B 4d9a0a2ada7b0f88f4b8edd46720c6c43315ec64f7a8b8e64339424cbfb2bf8b8eee457ade3c72ddf014cf7b15df970a240c7d5a896ca0d309605033dc903eb7 SHA512 93ea063d27b7a4a321b1875923d1e4749690d4fa320802abab67d908f999e8aed33f16f5092d4642a2b8a5c2f35464f85d4e1f9061eaf9df2a0a6d2809728e27
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
new file mode 100644
index 000000000000..5780804c8c4e
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="VirtualBox-${MY_PV}"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0.ebuild
deleted file mode 100644
index 978d1681f8b9..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="VirtualBox-${MY_PV}"
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# stupid new header references...
-	local vboxheader mdir
-	for vboxheader in {product,revision,version}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" \
-	emake TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.4.ebuild
new file mode 100644
index 000000000000..1cda2a1f29f4
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.4.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="VirtualBox-${MY_PV}"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index daa577b92677..b302e6afd0dd 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,10 +5,12 @@ AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
 DIST vbox-kernel-module-src-5.2.24.tar.xz 642124 BLAKE2B fbf077b1d94f0b2f6ccb1a9a9f2e9b6f2b02153659f60a28bf3905bbd9aca762bcdbbe1a96ff602048a4d43eb61b8195c1c511bea7248d0593efd7972a17fc5b SHA512 ba0dc0ba4964eb17c421f624e321369a96564f08daa7e6949db9cbde2a182cd29a51f7b0a3215938789bb61e2427cbd38e318e5d909fd54d243ef764f51eb0e4
-DIST vbox-kernel-module-src-6.0.0.tar.xz 666352 BLAKE2B 51309dd9fddb1e26e8fce55bae018d96569a28ce1d6850e2b13b47829d0336671d23962191ff4eda0f846c073a94a1d30fa67bb5e5b73f1fda63b6f06acc1225 SHA512 c0c26f2544580e16c525db997a5a3b2cbe1b84b0418cf099d12c67bc72ff7c79b30fe74793d10c710db6a03640ccb5935fbb9df55c2d8aea435beafe0de94385
+DIST vbox-kernel-module-src-5.2.26.tar.xz 642096 BLAKE2B fa908b8dda4c49e880005f22d4ec159ba4e84b20d3cf8f514ec5ad0ea556499b0df25fb714bb5f9a3474e6fc1cba67f6d56fddaee748b9561bbe31a003dd0657 SHA512 7f37be1b35772d59cd3df9b61dec436450de3c038faf2cd22fb891fee7270aa7f87f146f72497ffeb63dfe869cccd3f2788562d23fc51afd83ca19159f2a6810
 DIST vbox-kernel-module-src-6.0.2.tar.xz 665352 BLAKE2B 703291334afb8662211dfc5223d66dafa496612ca917637b2d34f6d38475287a1eed00e484965c670da236fdfcc558e0c7ebd081be1f6674603af2c0b6bda549 SHA512 c05f3e89b2fc5a504e77f0617dbe9ccde8de6d9b06e4c2f6d59d90f362b2d5a8207d64b16a8c767e63066a04236934664dfd452b23f4c5a2c4a3b301e07212c9
+DIST vbox-kernel-module-src-6.0.4.tar.xz 666200 BLAKE2B b7a6911a8534ae9e7db5a90fecfaf58394bf61ff1ee925302fdea46443e603535d1508b638c7c3f2440c0fe1176ca85d2f063f99632eb1a9093a9367f2e49fdc SHA512 565d635683f8a5f32c18b1bbf41b38bcab549a019cf0977c8dfbb53310494fb261e485ac11eb48e546c3c4b6ed13b3fb1628013dbc101f042ee9a61b8168122a
 EBUILD virtualbox-modules-5.2.22.ebuild 1187 BLAKE2B e6e3307a1b856612c589f498f536d1ae864a3ba22dfe97845f8d596f6f8d7a80b82c9e6173392d56962b62e745b0881a8cdda1146f7529187d8d1fd6c0c05708 SHA512 7d35b69bc75414c7195161531bc065e788e3f8fcb79e89fe8df2138339735571fef79ba0fc25ac39b954842995b22af9ea6fa28166027da2a8d39439cf33930f
 EBUILD virtualbox-modules-5.2.24.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
-EBUILD virtualbox-modules-6.0.0.ebuild 1245 BLAKE2B d6196f90bf25c7faf01fcd6830c8f036642b4cd0c9a624121faabb45868119fe4fe4d7967442875a6bb96240aca4244440311d33c56532001866f9cc7e149d7f SHA512 0c44aba646f7639b99ef8bd774978ab2027118a6b158161e0df7d7a0383d0e153658ed7de68e48ec75f37747dfa362266455094c4e5005239b0fdce2140cbc97
+EBUILD virtualbox-modules-5.2.26.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
 EBUILD virtualbox-modules-6.0.2.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
+EBUILD virtualbox-modules-6.0.4.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
new file mode 100644
index 000000000000..c4b01a1b3f96
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.0.ebuild
deleted file mode 100644
index 7d8c894ee384..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod user
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	enewgroup vboxusers
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}"/virtualbox.conf
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.4.ebuild
new file mode 100644
index 000000000000..7257cb3b5812
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index cc06cd3ad299..b5ac8ad86257 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,12 +12,14 @@ AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-5.2.24.tar.bz2 118369194 BLAKE2B 2073ec85a641ae80113d41e8363401da5afaf6ea442c2a3c537341f39e06a03a7175463605133e642988f72c4adde4f987905c08f4ba58460953af7169cb4ca0 SHA512 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410
-DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
+DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-6.0.2.tar.bz2 155125777 BLAKE2B 2d902fd1963305883eebba85daa03bd17fe8a9ba20e7a6482508879068a809ee80c4a5caffeb26acd0fd4ad29f6f60cf963e1d314e4b01f137ede5b589a74cb9 SHA512 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
+DIST VirtualBox-6.0.4.tar.bz2 155233564 BLAKE2B 6bc4d450e275e8aac5dc62ab05d9ba1450e13965f3eba64819315d121bd0e515319be2ad92ab429f2e598e157e89660561de69a2aac87e14792284669bcec7e8 SHA512 c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-5.2.22.ebuild 13857 BLAKE2B 2b27ee756ccb7b3dc03228c236768d2c07a282ae04d18184ebf523c5846edbf68f035546c3bc93720e3e5647d5334a2326455718cb98ea2ebcd6d356f6f822b7 SHA512 dd9d340c9f438f1f7d7d10fdbefea54dc2e38c5a40bb8d02739a38fb5098700805950bb3dc45418ea99ff04fe4f05d019d4dfbea99044eec4e231d44f9ccd7af
 EBUILD virtualbox-5.2.24.ebuild 13953 BLAKE2B ecfd06ec1542ce65a71189538204c439dfd6fe289d7fb099af6bac5e82b61732db9e77f55e46a30182508cf65e88a4cc987ebb437576e66a507aed8cb6ef55a9 SHA512 185d0d8b25ce396d8103eac7d5596d6e53140b4c345f37ad1b0f9aaccd718d7b6034b88539a9b5d391d037c63dc266bf01190ca9dff2db08616c942bcdbe39b2
-EBUILD virtualbox-6.0.0.ebuild 14118 BLAKE2B 9d34c59bee5eca14c2510c17d053750e1f3204f81811ef8a7f5c3aefc93ccf75e5c5ef41c50d76a81b9d5b33edff3aebb8272018f9ca68c78a9ab117fcec493a SHA512 734b823426626a93961a01c4e2a872431e0bc6e9d6ecc29c22e0a25883c3282cff1b8fd803af930c4377992ca0ba889187ec4284658566e49e974d7dd31c3e00
+EBUILD virtualbox-5.2.26.ebuild 13953 BLAKE2B ecfd06ec1542ce65a71189538204c439dfd6fe289d7fb099af6bac5e82b61732db9e77f55e46a30182508cf65e88a4cc987ebb437576e66a507aed8cb6ef55a9 SHA512 185d0d8b25ce396d8103eac7d5596d6e53140b4c345f37ad1b0f9aaccd718d7b6034b88539a9b5d391d037c63dc266bf01190ca9dff2db08616c942bcdbe39b2
 EBUILD virtualbox-6.0.2.ebuild 14203 BLAKE2B 342d89df9490c33664c49997c1eb472d2ee76d92e3b64750ffc498297c72b9b294734688e0e2c808f22ecb0d17406e3eca878da64921018a60459c6f03bd66ed SHA512 c674bbdf752b56051bc9d05197588b106832fd9eccd8842d46394ee7b72025b72c87341432b0b6e69b1b0608f1ff31089618f5d237c6568815e775ea5f0ad54c
+EBUILD virtualbox-6.0.4.ebuild 14203 BLAKE2B 342d89df9490c33664c49997c1eb472d2ee76d92e3b64750ffc498297c72b9b294734688e0e2c808f22ecb0d17406e3eca878da64921018a60459c6f03bd66ed SHA512 c674bbdf752b56051bc9d05197588b106832fd9eccd8842d46394ee7b72025b72c87341432b0b6e69b1b0608f1ff31089618f5d237c6568815e775ea5f0ad54c
 MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
diff --git a/app-emulation/virtualbox/virtualbox-5.2.26.ebuild b/app-emulation/virtualbox/virtualbox-5.2.26.ebuild
new file mode 100644
index 000000000000..4464ccc84a0a
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.2.26.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus --build-libopus '')
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild
deleted file mode 100644
index b97352140e89..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild
+++ /dev/null
@@ -1,481 +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 flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( virtual/opengl media-libs/freeglut )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	!headless? ( x11-libs/libXinerama )
-	java? ( >=virtual/jdk-1.6 )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	local binpath="release"
-	use debug && binpath="debug"
-	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	# *.rc files for x86_64 are only available on multilib systems
-	local rcfiles="*.rc"
-	if use amd64 && ! has_multilib_profile ; then
-		rcfiles=""
-	fi
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			#for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			for each in virtualbox VirtualBox ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.0.4.ebuild b/app-emulation/virtualbox/virtualbox-6.0.4.ebuild
new file mode 100644
index 000000000000..32183eb05b9f
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.0.4.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
+	eapply "${WORKDIR}/patches"
+	eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800
+
+	eapply_user
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			#for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index c46a9d700492..83aca8443ae0 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -14,6 +14,6 @@ DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e
 EBUILD wine-any-3.19.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-4.0.ebuild 21151 BLAKE2B fc9fc95cb7bd5b7e609d703deb6bbad51d44a8b76443818f975b83e6f3679785895bdb11a0f3b7e0f1a26a962ba6e15eb83b7ecc8de3ffeebdd1695d3ed9e004 SHA512 eca2b41c6f349e5deefdd54befbbd714088803a195bb383d9748aec20e0800dba93bd7ba4f578a9ac6597ff1a651457541e540a4ace0295c5dfe35c2a104e55d
-EBUILD wine-any-9999.ebuild 21153 BLAKE2B 097951ac2770e079194924c0aa294945c03a1e8cb829c246ae52201580841fada75a8922d163bb8982ec236f3f69deb603059d684a10e4b587eaf0b64bd822d5 SHA512 b9c3c8787c3d3f3d0decc6314aec412caf7c1b19e5efec206898d321dac1174bad5118e4364b5e062482193e4c26889033003dd5ca10a293e1e6613cc2d8c44e
+EBUILD wine-any-4.0.ebuild 21151 BLAKE2B ac9c30146bb7a60d5637d59012a7ebd275504c541c13d4f7bf336b9c45e4c66a1944f3dfdf4827b71179e2b8865a85265d769471e9f66f87e31d3484ceaa79ee SHA512 f3c10f0a9720b7f8f4dc3ff0ec63eb877618759942770daad51e4ac96812d964bf1ee2f81355c456191791bbf4fa38899f979ffef52bd31ae421d7e19976f3e6
+EBUILD wine-any-9999.ebuild 21116 BLAKE2B e67c24471a2427648ebe42ed0f966243f5c026d49a3f11e9c83ebb769fd90dd2b9658ce11de31c0d3b2db94c92cc9068da8358d8cc03f45ec9685ab448d9141a SHA512 497feb16b0e26f41a3b7aeb2b052a4815a94bbac4fbfaa6f52bd965e2d83bdb993e1e55e93a8a3ebf823a08b46af877e31100db34620da9a2c2f94d20c491031
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-4.0.ebuild b/app-emulation/wine-any/wine-any-4.0.ebuild
index 6138610c446a..ccf3dac674e2 100644
--- a/app-emulation/wine-any/wine-any-4.0.ebuild
+++ b/app-emulation/wine-any/wine-any-4.0.ebuild
@@ -140,7 +140,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 460586cacbe1..02193e5c7b25 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.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
 
-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"
+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
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
@@ -139,7 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 79dbca0d956d..420fdb93d815 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -10,6 +10,6 @@ DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d
 EBUILD wine-d3d9-3.19.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
-EBUILD wine-d3d9-4.0.ebuild 18679 BLAKE2B c85203784df03e1087c42b0f73dd8f103732f54d1e2b74b15f551b364edc3da2915bbd0bf27bfbc296b81147a01fdd24c947a7fe8658c5f985a93d844276230a SHA512 9f58fe7fb75deb4cf1b945b79fc506f807d91c867bd1c924c2220b6b8c10c53e939f042696e115caf27416493f8cc4be76861e23abbaa3aaa6a6e730b72b93a0
-EBUILD wine-d3d9-9999.ebuild 18681 BLAKE2B bc9336a634dc6f216b1c10a4b7c0a692b48ad0501e6b854e18775840d1fb9a7707aa5493f764511b2a68ef42a6bac5d2af49352fd742f54f3fd2b82a78a5dc11 SHA512 0fe85ce775eb69a1197e71ec7b7f40bd0bedaf8657809b9aabb147099593672bc9e7805b77373926cc99ea58c5573653981ccd5ee10255272844a8ff4d2c19b4
+EBUILD wine-d3d9-4.0.ebuild 18679 BLAKE2B c764f94c2c018d15f1ca63b2adccd7fc043782ddae604cc5ef0a50b69d3a77de0452a73c363f932d59b76680883e892743a03beaa9d1fa81dffdb75ffec4fade SHA512 ee370f32b52e47c99fe7248e064e9910cd6b98d11dd1c86d458644e1240c100e70e1cd4d3919e1101cf0a882ba906551e3771fd142cbfe4112a9896d417cccdf
+EBUILD wine-d3d9-9999.ebuild 18641 BLAKE2B 66fe7823a307418a85a5f6bd1cf5adbdec4d9b64c381c0b16e89da56b40286e2ea427e83f1f03366263c93a03f7446144a94fd9427c9ed0329f9c27df429d712 SHA512 7e452bbf8f36298487dcda525ad5e2c8f0cfb2cfa6de9c0947764c2e4791f205c7e946f0216dde7a39f1c55a7acdf7344ac71ea56c5cdb92dcdf5cbf3374c23b
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
index 10ac0281dd46..cfa8c622172f 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
@@ -124,7 +124,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index 3ebab9ae1cb4..f9e7a4e47808 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-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
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 5ff8f6b857c2..e911ca2e22da 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -2,8 +2,10 @@ DIST wine-mono-4.6.4.msi 45592064 BLAKE2B 30099b7f02276e47e350a96af07bf64b43c857
 DIST wine-mono-4.7.0.msi 64625152 BLAKE2B 9c533d9f9a5cec6aefa66ed916e88f0a03ab76e8292f112a669208c5b26855a314657c9950993a205941cd314f0c93a55f621ed71ebb4846a66d30fa9af3c855 SHA512 07cd2b26f3bfe6fc796a126b83e9c0aa655d3e8152af536ae2e8ae419013742706ddae6f93cc2341c94a2f3b8ae7d1b27d12f891d371928189291428f9ed877c
 DIST wine-mono-4.7.1.msi 56470528 BLAKE2B b1b9dd832f725cb70b80889c08db524540c389c4eb8c990415f0c1b4a17274fc96390808c943bd0ff42c79f4bbb376b3d599d31ed42b5ebcb4be79dbc273eeec SHA512 d47f21fa3ddb31522366056a2062cf7b77eec0a12f96dc05326561c9d2604405128441ff40d1b9567a6e6cd1c19ee03444d2ba02dd3b8dd2d150030dfb52f765
 DIST wine-mono-4.7.3.msi 56470528 BLAKE2B 59397f851bd0883f060fd359228fcdedea5a32ce06349fd563411dfa603a6c8700496111821fd9e571cfd4586e829acb12321528a4a8330d1fb6f92855482225 SHA512 d51c0e21c8448a4d11c3e4fd530bda340cc93cd420080e08aadd7b704183dcadf8553b0937e02c7a54a8a2fb46a395718a3e807b85f19936b0e4ee7b92052dfe
+DIST wine-mono-4.7.5.msi 56470528 BLAKE2B a662249fe85dbcc6de273cc8f8384fee9fe789a272c7dfec28e406ac2b512cd0e9ef07716004c694f66a69d2dd0a62e14691123db7b9845d7ad86762619da100 SHA512 25e4188e42362aa9050e4d78a5748697d63181fa91a0c0d2e43ad4c26996f9fb82053a5e6942621aaff01c832be88ea13ac7b472be8841a828eed4e5e87c9ee7
 EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
 EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.3.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
+EBUILD wine-mono-4.7.5.ebuild 503 BLAKE2B fe57ec97ba1e4d3305e40c2bade254cad8d5459a7bf4fc1583593149ea1e08215f31bf0c33e54e2e1163f671db4711c2c5d923954178a05554f71b53d5a9cf2c SHA512 232882960cf8c4499f2e3d50eabfc3afb49cc5cb44e82380ebd75be3f1bccc32f4ec3096f9e61884035ffcfd674f83c622ed739469c26a1bc5ec1632d796c647
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
new file mode 100644
index 000000000000..9343b2896550
--- /dev/null
+++ b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	doins "${DISTDIR}/${P}.msi"
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 9c7ba108d4bb..9a57a680131e 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,6 +10,6 @@ DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e
 EBUILD wine-staging-3.19.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 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.0.ebuild 20086 BLAKE2B f3df2595828bacd06ce12cf2b3f2846d89556cd013535bb6ad2bc8573a4b4436bee66d8259f10df65afb0883ddb0266381fd2403162cf19a9247dc3d3ee1c3c2 SHA512 acbd87f56155f8566388a122ef54363e658eb140e4f37f049e4566ffec495d5c3ea4e942b8796859173b385cb32e944c72d8e0a709d29d87e710b8b0ea6258ef
-EBUILD wine-staging-9999.ebuild 20088 BLAKE2B 7b45850fd943ab529ff442187bd04edc4ebef9092b20400586306ccb54b588b2346e41239b058a608f905fab4c7653eb6d056b31c63dbaf2e655ab2c409b144e SHA512 bc7152915add222360f2684494ff62ff8fcb0289654a8a83e53764c4eb6ad35f5dc10a17bbd790e6f3369b3b2d109b0e8ac09b5c89c158e83f86069a7b7255b0
+EBUILD wine-staging-4.0.ebuild 20086 BLAKE2B 18f862a45df2bfa7a2b428e48cd028e48905127beccbd0d5b80fbb999720f9efe98f6e5c4022d18b5de5d4e0b28f9db07b5ba7b25a816fc7fa049236304556b2 SHA512 da9f41dd2faca0e65e4d69e0ebb77c6f348c12568e8bf3fda4effa3e62c75a5bb2415720f492cd86e03d04135815ece6cd1859d2b81da52d8d07ec0ac7c5e58d
+EBUILD wine-staging-9999.ebuild 20048 BLAKE2B e06b98c8aa8b02a50336f91a946e4f138618d455379bf2a86c1fb228f61d5a912bc38ebecf0b506637e539f7f4313974602979ebdab115e99ac4a4b2561e75c1 SHA512 2637064739be6cfdc3b32864b190acf4b52eca789fc6e4a810f80f0fbfa77a15dbb69daa3d7f2c07c6dec6e6b6016ffbdf948e72de9e5d61a04060761bf1577d
 MISC metadata.xml 3610 BLAKE2B 6840ad896b4efc5cf532bbbb56c3610182b62b3063321378d16e418514ea372da30341e173975a2cc17b81774c0ecdfb11b52d12de6b4875cbac638a9f5a6a78 SHA512 b6372bfcb02b7917ac1d79a26639e9ca6440d373bfbd5688012d48344b4ad6966c23436853517fbe2236a720d77de71433edea1ddd6cb612f0fec65016ef91b2
diff --git a/app-emulation/wine-staging/wine-staging-4.0.ebuild b/app-emulation/wine-staging/wine-staging-4.0.ebuild
index b0f4871a5bed..01089f5e2524 100644
--- a/app-emulation/wine-staging/wine-staging-4.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.0.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 4e3948ed97ff..708d1c91e80a 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
@@ -129,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 1efe0fd340b3..7907e27d5877 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,6 +10,6 @@ EBUILD wine-vanilla-3.0.4.ebuild 17085 BLAKE2B d1831445374f36c0fd20b930b2786c790
 EBUILD wine-vanilla-3.19.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 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.ebuild 17346 BLAKE2B c5530dbd38c9750f69eabfe3fd21fe84af22368e266c050ba7782b34d90d3bc7cf0f7b53b3ac1389236e4095a7e463724e0bd75a5457a4ad67eaea1a4435017c SHA512 2eb2cf5565b47767ffa625800ffdf0230d63e7af5b43e8bad35c4e427aa05db42504476bec76ba0c15494860ff1509b3049abb3a9674891bd7b00a068fefd421
-EBUILD wine-vanilla-9999.ebuild 17348 BLAKE2B fb54a9a4fce1edfec32205a1d2ece604ac389debd6aed82807cec12b2fd4c958f44dabd1fa5b47177dc9ff43fc7ec1e424f84fc5a85a8c5f251f3b7fd7efcfe6 SHA512 0110604461c0ca846f96eb5271c7b9766d4d9f6083551793b13dcb5e283f5a7ca27ad3917f5cffcf2d6f113dd26d42d66b8bc063c5931749fe7d5fd3e42d035c
+EBUILD wine-vanilla-4.0.ebuild 17346 BLAKE2B f4aba7937070a0d1fb801538260e18286f40319663a9a741ed1ce59631643f653b6c17e44fe60849f6521ecdbb6b9e91bc37b89f91a009c1d692db965eed6860 SHA512 15382c1b9ca91463924b5cc7b5df3a9e3a1cf75ec0caaca70b88600ccad506564a8db75a2ce03614106da24de811563209f8bb9ad69e796522b87b37eb606af2
+EBUILD wine-vanilla-9999.ebuild 17308 BLAKE2B 04b39cc4f7dd0be69db375471993cdb51f37344e60af9369c6863e1353ba48d89d4ed460b7c55503a49dd875aac5b525a73b8516f0712477950e2734fa6ef30b SHA512 17289cb988d36bf3cbbfebcf90595dc26bdd2e924b7a752fa57f45e37b361a342faece2d8dc9ad63f6b3a7f1ee8c0e8a5f1c47053791656f0c52b767202741b9
 MISC metadata.xml 3157 BLAKE2B 917ac49661429459c488ba4e4e83a0fb558dab3068635d2ac307eabd9e1576c9034fe53ec80bd71023be925d184aca442d8c61eb5ab788a947e22a0d2aa0882b SHA512 2709187f3765e00e14c19049fa81f920a8f8ef60dc4b36db17faccf26df8b04edd017368d820fce91c65836662ba21d29a104b6ac0ac17164047f29bb7c85d91
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index 416e5edd5f14..be747fee393c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 7a4be4853fbb..adafa12ab3ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-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
@@ -12,7 +12,7 @@ MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git https://github.com/wine-mirror/wine.git"
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
@@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.7.3 )
+	mono? ( app-emulation/wine-mono:4.7.5 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index c3685501ab15..8d5dcd630407 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -3,11 +3,13 @@ DIST winetricks-20180217.tar.gz 646726 BLAKE2B 3cde3ca1cd7c74946732c530a49ca5329
 DIST winetricks-20180513.tar.gz 652299 BLAKE2B fb4c55e534e368d5d7e94247feed031d0f6f98a2f3604f6187e32d25659f1cfa7f5589806e429ee054b4a94c00ebd6ac63cb99012fd94a99622891132a477001 SHA512 49fc022fc3db068145baf3a51444dc937deb092aceac8e31259888fea21ffe86f747a0d4dbd5ff10f253a94b15de090c01f20dacbe838c8444bdb00b98cbf5c6
 DIST winetricks-20180603.tar.gz 651678 BLAKE2B a70ae685bd49e429199619176e130681ab2d28ba8659f68bdba298d82e610c77df86c3d998273e60bb53d9da24bddcfe80f6d89e044007c1477a92bbc0e6043f SHA512 e88b0d4375331c94d3e2d995985b6c28fd208f1e32b1e4d84f33997a8a69fc9f8a4173325a571f5d10f233bcf40fe4cde644401c1563c8cfe7915748448a08cd
 DIST winetricks-20180815.tar.gz 666135 BLAKE2B 4bdac7980bf180d296c9d42074b7e0a6fa4c04e704e3022ae3c07a56f787ddd0d30dbb253f247772bf53861df71affc88acef1cd92c2db6fc1962e6a31b57939 SHA512 81222610f6c29e67d1b3914912dd1980fca9b7f15f283b78128780d1e667c7203b27ab3c5c4220e855c6f329a5df58c585fb70d3a7fff07db648bf63a556ad6f
+DIST winetricks-20181203.tar.gz 671138 BLAKE2B 4a6f7154509bdd4c0ec73da8b94e44f80ca732f3e3e6c85149676df4eebfe586bcc1ffafffd4937e7d3b5efe6bde015bfc8ba53a1489d553001a9600c178b1bd SHA512 ff960b7830fd688315a6cef9c50f45435d95f4d8bb8feb5f3cab3c24302369b5876afdc8145d395be4b33c9d11c3606312aaf84cb675eeb511479c46490b1585
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
 EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
 EBUILD winetricks-20180217.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-20180513.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-20180603.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-20180815.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
+EBUILD winetricks-20181203.ebuild 2137 BLAKE2B ae231898680bb0b59d596d2a8becef6773100c3fea7d7b6e8fe26cd275273cca47350fb409b0b927eaba369b57fd8b7df66e503ae1a1c483f2451e361ccd880c SHA512 670a876d4dda678399d0611fee6f9b7b7753382ed9de91ae8a34e9c4f8715750999d3af079d77df453ec950396c8c632e0d296ac5638059648ff8afb2be9b870
 EBUILD winetricks-99999999.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20181203.ebuild b/app-emulation/winetricks/winetricks-20181203.ebuild
new file mode 100644
index 000000000000..484e85849f7a
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20181203.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+wtg=winetricks-gentoo-2012.11.24
+
+SRC_URI="${SRC_URI}
+	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
+	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+
+DEPEND="test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		dev-util/shellcheck
+	)"
+
+RDEPEND="app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	net-misc/wget
+	virtual/wine
+	x11-misc/xdg-utils
+	gtk? ( gnome-extra/zenity )
+	kde? ( kde-apps/kdialog )
+	rar? ( app-arch/unrar )"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		git-r3_src_unpack
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
+	else
+		default
+	fi
+}
+
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+	default
+	if use gtk || use kde; then
+		cd "${WORKDIR}/${wtg}" || die
+		domenu winetricks.desktop
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins wine-winetricks.svg
+	fi
+}
+
+pkg_preinst() {
+	if use gtk || use kde; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 8b96b41644b4..4554957ef5c1 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index 37e32aa6f252..62175308cb2b 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
 DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
 EBUILD eselect-postgresql-2.3.ebuild 919 BLAKE2B aaa7f9e6ae8094210bdbee7fbb807e3fb38d3afa34a319778234c6d6e1fb983e334532d27cc1d4e347ff6e30f14c8372a347ad21b2f3de7cba3d396bdce74c5f SHA512 e6e52a816d934b53007329f31ef3ac66db711fa5e70946a0b811263134aed3894d836fc2f2b522879aaa055304df17efc64ab402ced0e4ab86fe62d739726e4f
-EBUILD eselect-postgresql-2.4.ebuild 1012 BLAKE2B f3fd07da9e71ce10c91a921ae162fa6d7b86fe205f004cfe4a48aea79ec2c651e4f862f8280995afa1a0d226a933b9356354933c09e92819b3c038431576a1d6 SHA512 3d3c46131c982c6ca01eed3ca7033167cdd89519042506e567d2a607164fca2468fa2e1b4009bb5b2f60cffb1d27812de70dcc17070e9473bf5426208d373c8f
+EBUILD eselect-postgresql-2.4.ebuild 1011 BLAKE2B 8ac70ef2356cdb0aba1bf30c371a8bf684a3ef548ea9c1751207accdbb683fc519e6dc6d1eda40543e1d8b82e9557e66d45a5f6653c36b5e383775ae2039c609 SHA512 8b91df7e0ad78b262969920b3e650ee8bbe41b54203d815d626a972cc701cb25e0d71918bc09a3fa09c2d91a4b213073181e0a4ca98f66d4ebd041d4c8ccb363
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index f02b5dddba6f..012bfef0afe9 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~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"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 8b2b8860c9ab..4cd01f4f0b04 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index 44242c15ca4c..3cdd4731a416 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -1,7 +1,5 @@
 AUX chkrootkit.cron 78 BLAKE2B f43e9a4a0864c3914658298622aaf0e97374e4f8518c085f0c6c1b439583b36567652376a601eb039ca9d6a8bdda0cb18d9c58b36ab61839113048d32ce9fb54 SHA512 6839f3372d28673ee436349a107dc33b77cfd676fd16cda1ccfc5211514e840593d0f106e4e0a9331c4b658860992a9169f3a7cdd75c835a780a41097e7bd758
 DIST chkrootkit-0.51-gentoo.diff.xz 4708 BLAKE2B 0dacba47222319d9e5bb5d39e0eb4b7074fb3025be885c5fd9564c10f592e04ba4afe2d0c792a2e54fe4c9b1103e366f65af949e7c0db730bf61981fe8fe2364 SHA512 13dca9c272d85d35d736e14896058612f62e1781aac034f06882fe63d956f074a3c67bf308c104f0080323bb127ba01373967b2c28481741d17d83310fe52dd0
-DIST chkrootkit-0.51.tar 174080 BLAKE2B 36acd12801d2ac599b71d0c59165c1489309df0365442aa575bb4c505bbfea5d0daad837fa9b7b40c2aa3841fceda199f37fe5832f0685ad3a0a82ff5e653a3b SHA512 adef6823d069b32305605d0eaa3d3701c6a87900646d9509cebe0fd8a2fec0523595d0dcb4576b32245e7638388d3b43858dbc42be68de9971ac8461fcfdeb34
 DIST chkrootkit-0.52.tar 40031 BLAKE2B 8bd3518edc11a22dbc7e866de622454f55baa9fcd06a4034489596c0a24d867fec16d134dbc0aaf8b936640177d7dee8e061e39813a3ed261ae657d70f54a47d SHA512 45d66227c185c60166c9ea2a1f89f4594fa7c943c280fd6da5b59b5b355d5fe0d36806ef133fb29f9b2cac0bc05e9c10773ed4fae923a7115cc900818a596d42
-EBUILD chkrootkit-0.51.ebuild 1332 BLAKE2B 5d5bdb9a5edcb3bd08944f89592f24446f45f890859a80930adbe99831b26b5860e4f47804c1c27f101895c15a40b0c3d2c796c9dd687fd10bad3a3a25b1c971 SHA512 094c6e7003e1e5588d74e392ca2c6924f4172c42598601066b9858de5b01385abe444a1be9f5d81d55e0ef1125257914e68ba9bc5108c7fe018ee3cdd1a01232
 EBUILD chkrootkit-0.52.ebuild 1344 BLAKE2B 79e130f96e27cca1ba769cef5585e35eb25e9c9d621f42f2e6cae0cd9210f27af24dcee5c5f0bf7bc6127b1db143871022d6cb7b0c02d19da3f16411849a061d SHA512 f9afb12caf63b82e3ee53c4bf920b8a47f66c344450d2208a75668f668d493e9ecc3a1dfbd795feaa9ae4a6402e823d21a27412524f96d729114663d174ceae7
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
deleted file mode 100644
index 34028cf57fd9..000000000000
--- a/app-forensics/chkrootkit/chkrootkit-0.51.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 eutils toolchain-funcs
-
-DESCRIPTION="Tool to locally check for signs of a rootkit"
-HOMEPAGE="http://www.chkrootkit.org/"
-# Upstream named their *uncompressed* tarball .tar.gz (*sigh*)
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
-	https://dev.gentoo.org/~polynomial-c/${P}-gentoo.diff.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="+cron"
-
-RDEPEND="cron? ( virtual/cron )"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-gentoo.diff
-)
-
-src_prepare() {
-	default
-	sed -e 's:/var/adm/:/var/log/:g' \
-		-i chklastlog.c || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" STRIP=true sense
-}
-
-src_install() {
-	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc strings-static
-	dodoc ACKNOWLEDGMENTS README*
-
-	if use cron ; then
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}"/${PN}.cron ${PN}
-	fi
-}
-
-pkg_postinst() {
-	if use cron ; then
-		elog
-		elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
-		elog
-	fi
-
-	elog
-	elog "Some applications, such as portsentry, will cause chkrootkit"
-	elog "to produce false positives.  Read the chkrootkit FAQ at"
-	elog "http://www.chkrootkit.org/ for more information."
-	elog
-}
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index c1e0e77921ed..7357d45cbe17 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,8 +1,4 @@
-DIST openscap-1.2.13.tar.gz 15874074 BLAKE2B 680a574cec7c8cd8e75dc91e4824735b09d2225ac91118897e569b2eb073959ea6d4a184fb79014aebe21d853ca01d2d36ed077050b82a2376066ad092bea170 SHA512 393b426f3278ab9438439df9a077b95b29bba66dfc2c799b7b40c2bf3980cf619aa1efc27225785ec780aa75926af6751b10fdb0b8d561c8056bf9a9a087792a
 DIST openscap-1.2.14.tar.gz 15980085 BLAKE2B 1d5d418b215f4a66a9f1874c4b9ed32c7c80e09d74a0ef04a256a7e1a24f1b675871116b0e22576dce476ee01c3d3b26ea5a48870a58aca99fdaea52c6877a7a SHA512 0e408b2dd58b8b424a27f5c852c6dc8c596fdb201e45cc5f762a1998e00511040762df4e55cdfd93dac4c820c28935acdf3942e96227dfa4f4363d682a2da7da
-DIST openscap-1.2.5.tar.gz 14513153 BLAKE2B bf7925fe17cb451f240ec50994f9291f55dbdb50c38872df0db1663a2d3f640e4d8bf1595d4fd7b46059ab43708e9340f4a1cced58029775f57f3b6d29a2eb30 SHA512 abeafafeaedd60ca08b52b981f83d458bc972894fc466d7cff29170b578a023f314bd330d7c812d838e09cad567ddc5daafa7e46e4b9a0db76451114d98d17ca
-EBUILD openscap-1.2.13.ebuild 4286 BLAKE2B 280db60d4754f63ac12c717d10fc2048edbe6e98cb880a974b0780ed8321b23c40e598fd2a5042b67a30f9137e80b50f1dc183b13104100babbd94b40386d450 SHA512 7afdb887a8525c6cc159d3fb13409992461d17b1c39ffaff88d2d25ca7b2b357b374f0fac4741e2a5d462f52bedaa6cf207ebadc917ff84ed40ec94769feebd1
 EBUILD openscap-1.2.14.ebuild 4286 BLAKE2B 280db60d4754f63ac12c717d10fc2048edbe6e98cb880a974b0780ed8321b23c40e598fd2a5042b67a30f9137e80b50f1dc183b13104100babbd94b40386d450 SHA512 7afdb887a8525c6cc159d3fb13409992461d17b1c39ffaff88d2d25ca7b2b357b374f0fac4741e2a5d462f52bedaa6cf207ebadc917ff84ed40ec94769feebd1
-EBUILD openscap-1.2.5.ebuild 4269 BLAKE2B 50f916e56621d6e7d6b888fca6d5b7fd0cf9f2c39b7ab0b025df1d10de43e39e2d2628ec99790e9b8221679cedb730cb8526875f12c93a89aef3db60757dcd5a SHA512 271741cfe0a503f05c4fc1b93af2d517fb91f5c6a8c455d3bfccba79e2d63b9613282c127f225041e761be7db5130e40740960feb423fd8a1a1a0f5b7c5ce487
 EBUILD openscap-9999.ebuild 4525 BLAKE2B d01cac69963b680845045d12f01e246a362f6fc1fc642faca0136330778e823e042d23209aa0303309b1f0ebb4c22c6fcaee1ef71766763a740d5305d2488845 SHA512 49aa917d534848a7b6cf3859bd905386dc35771d18f01afb5a38816ab1cbffdb468a3644af9dc33887648ae9ea8df8a935b1bf9b95178107f0cbbb4e48ebd0c7
 MISC metadata.xml 578 BLAKE2B 11b1f278dca69f4a60d0787d132db680da262d1dc2ebd91cca07b7dc7d87016a3fa9d536ae008e432a1d82494ba6f4f02bda7488667104a2a994d430fb45886d SHA512 404947116ad0cfa7f260bd577e3ae99ae4a2813be4c36687e2664c5cc2d1ce2b130a83b03bafd81e1750b19a50ba49864959e97a67a8e2099c43186099e7f5f9
diff --git a/app-forensics/openscap/openscap-1.2.13.ebuild b/app-forensics/openscap/openscap-1.2.13.ebuild
deleted file mode 100644
index d2b7aa583d7a..000000000000
--- a/app-forensics/openscap/openscap-1.2.13.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 eutils multilib python-single-r1
-
-DESCRIPTION="Framework which enables integration with Security Content Automation Protocol"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://github.com/OpenSCAP/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt:0 )
-	nss? ( dev-libs/nss )
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	gconf? ( gnome-base/gconf )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	xattr? ( sys-apps/attr )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-#	uncoment for debugging test
-#	sed -i 's,set -e,&;set -x,'	tests/API/XCCDF/unittests/test_remediate_simple.sh || die
-#	sed -i 's,^    bash,    LC_ALL=C bash,'	tests/probes/process/test_probes_process.sh || die
-
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemented
-	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
-
-	#This test fail
-	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
-
-	if ! use rpm ; then
-		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		einfo "Disabling SELinux probes"
-		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use ldap; then
-		einfo "Disabling LDAP probes"
-		sed -i 's,ldap.h,ldapp.h,g' configure || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	python_setup
-	local myconf
-	if use debug ; then
-		myconf+=" --enable-debug"
-	fi
-	if use python ; then
-		myconf+=" --enable-python"
-	else
-		myconf+=" --enable-python=no"
-	fi
-	if use perl ; then
-		myconf+=" --enable-perl"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	if use sce ; then
-		myconf+=" --enable-sce"
-	else
-		myconf+=" --enable-sce=no"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		cd docs && doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	prune_libtool_files --all
-	if use doc ; then
-		dohtml -r docs/html/.
-		dodoc -r docs/examples/.
-	fi
-	dobashcomp "${D}"/etc/bash_completion.d/oscap
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/openscap/openscap-1.2.5.ebuild b/app-forensics/openscap/openscap-1.2.5.ebuild
deleted file mode 100644
index 444292acf604..000000000000
--- a/app-forensics/openscap/openscap-1.2.5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 eutils multilib python-single-r1
-
-DESCRIPTION="Framework which enables integration with Security Content Automation Protocol"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt:0 )
-	nss? ( dev-libs/nss )
-	acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	gconf? ( gnome-base/gconf )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-	rpm? ( >=app-arch/rpm-4.9 )
-	sql? ( dev-db/opendbx )
-	xattr? ( sys-apps/attr )
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-misc/curl
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	test? (
-		app-arch/unzip
-		dev-perl/XML-XPath
-		net-misc/ipcalc
-		sys-apps/grep )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-#	uncoment for debugging test
-#	sed -i 's,set -e,&;set -x,'	tests/API/XCCDF/unittests/test_remediate_simple.sh || die
-#	sed -i 's,^    bash,    LC_ALL=C bash,'	tests/probes/process/test_probes_process.sh || die
-
-	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
-
-	#probe runlevel for non-centos/redhat/fedora is not implemented
-	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
-
-	#According to comment of theses tests, we must modify it. For the moment disable it
-	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
-
-	# theses tests are hardcoded for checking hald process...,
-	# but no good solution for the moment, disabling them with a fake echo
-	# because encased in a if then
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
-#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
-	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
-	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
-
-	#This test fail
-	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
-
-	if ! use rpm ; then
-		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
-		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
-		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
-		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use selinux ; then
-		einfo "Disabling SELinux probes"
-		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
-		#process58 need selinux
-		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
-	fi
-	if ! use ldap; then
-		einfo "Disabling LDAP probes"
-		sed -i 's,ldap.h,ldapp.h,g' configure || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	python_setup
-	local myconf
-	if use debug ; then
-		myconf+=" --enable-debug"
-	fi
-	if use python ; then
-		myconf+=" --enable-python"
-	else
-		myconf+=" --enable-python=no"
-	fi
-	if use perl ; then
-		myconf+=" --enable-perl"
-	fi
-	if use nss ; then
-		myconf+=" --with-crypto=nss3"
-	else
-		myconf+=" --with-crypto=gcrypt"
-	fi
-	if use sce ; then
-		myconf+=" --enable-sce"
-	else
-		myconf+=" --enable-sce=no"
-	fi
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		cd docs && doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	prune_libtool_files --all
-	if use doc ; then
-		dohtml -r docs/html/.
-		dodoc docs/examples/.
-	fi
-	dobashcomp "${D}"/etc/bash_completion.d/oscap
-	rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 785080481eae..044779e5e3a0 100644
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -1,11 +1,5 @@
-AUX disable-acl.patch 1407 BLAKE2B b07fcebacbfea8698f1b7714552e7ecab1abe4327424ade1c4bc532b033abb06f7269822f0b287974764eef57ee989791adefd07e7358f25023916c2e5072c0c SHA512 7df8444f33bc23baf6327fc7fa6fe40329fffd71185ab663f192921bab00d93e360c5ea539318554e42c63da5dbef781ece84e795b46a7ac65dcb694ebb47a35
-AUX ovaldi-5.10.1.4-disable-selinux-probes.patch 3928 BLAKE2B b1d3a1bd11e07d618a1a71e169e2d86dc3953ecea81b8edc49538557f0a7c7add0c754a78573333e9e7cd2f14c57e8429435d5c6ed9caef62b8e85b7b063c3f2 SHA512 e9d6f2bab3fd5d6fbb2b6bc6dc881bfb22c873c8856dc9da7c01d2992f74479177d82529df84b186da285aed8d943919b9bbbe59d7d1e0788c42351a3f895217
-AUX ovaldi-5.10.1.4-strnicmp.patch 292 BLAKE2B aa35f44875a75ba1a4d3ee02dc8a37892822e4576bf678858d7af901d1f945366fa353839aa595f3ad8cb09a2fd7485d072eca4318fcd2ab36ab8ee665ee2db7 SHA512 498ce005a56cbe16377653a25da783e96fc7871cb114d19e3695579263403ecb3a917abe637965bc6ee62dd36e927ad564c83d253b3a6467651e9ad57f9bf1f1
-AUX ovaldi-5.10.1.4-xerces3.patch 13354 BLAKE2B 87bcfe0e17150d7bf9831ce9ca2c821e9d3adcce403177247d52af0f0fea440f45c6d7a7b79a5a6a7f24850ccef0f72e941f34f50ea9500656fd20ef6bb702dd SHA512 4f31d9b7fdbd31fb3228da1d3c637ff8a205395754fd9a27375a33b18d954bfb29b7365e7134e7ae8c93e867dba980f5a18255872d6c64e03f449b32349d2a99
 AUX ovaldi-5.10.1.7-disable-acl.patch 1231 BLAKE2B 2f434497f12b52be3f18a4a35dc9b22dc6c93c5c3db9c0a46ef4a85753c6262f553b9c4aabddf55ff534f99f43b7667f65e758111a570e4102ca1a27cc03ce15 SHA512 e71a2899b0eb0a9abd6ba2a3a00ef67d6480597defa3390cfd4706e801aa6383c7a6ff5e02e4472b5a707bab35f398b6b9d00377adbd82673b6cf5c9961370a8
 AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 834 BLAKE2B 8e4cc626d97ee2f80c40913b09550693437ac6cc9b3ad0491962b8c3b78cd6e060ba4c5c0f3bc18be10348ec31fcd9e0e35108bb80425764a7d4f75412b8f0b0 SHA512 f05a797252a2006384f450afd2c0c2b8cd894abc2409b21a3df9cec57af39ff81dc2b007b0e3c460e3ce85855a1b37fe18b5a4b79408969019332300d0c1ed47
-DIST ovaldi-5.10.1.4-src.tar.bz2 14868251 BLAKE2B a85d4d1b80226dd4059d206b471788b1417224dea54ba0b5813dda3427543195b9fb5505e4f9d5db4655acb36385a84ff23556c281189558bf1a637f5a122262 SHA512 d7926a7416fe90013e203b333390e33d51c3eb0caa6ebba69dd593791a8377ac38f5db72fcff2d1ab2dd39a0f5d1b0d2a0d08f906d3e26740288532a27debb47
 DIST ovaldi-5.10.1.7-src.tar.bz2 20391784 BLAKE2B 7e2c719f0819f967c6aee533bb881c29ffac756461460d73e3231f1cffd254d88a26e716f0334d023daa7fa6f9c314bf7a42b6c13e2a90daa558e589d135479c SHA512 22c373436889b03ffb5d479bd322703bbd8b5b335f116a3b38a3d206ddaaf3115961ab89597c3907b6e5d745eb302a042c135c73cde0eaae10e51f5d6e3e55ec
-EBUILD ovaldi-5.10.1.4.ebuild 2979 BLAKE2B 8f71272ae8fb64603e3761c7874c2a0292b654cf421561a6d2669ee95c59fea12c9af033fdb7ca47f0135a76a95f5e42f2d85896bbc5bdbb8e8da16a10a2195d SHA512 3cbd6a919cc0285edefec12a41ae85b10104a8c1d49c419fdb95740489982726a551c8539cae7e63101ed6634cc07508176c65fb7aa0cf73d7253211695200f4
 EBUILD ovaldi-5.10.1.7.ebuild 2921 BLAKE2B f1687f68049b3e91906b22fdd1318a95cf2be41537c535c5ea91ad2b92ffe2ada68e5ad137d83db7d302c20945304b2b2cb98aa1b73baed08dfb3cfb634579b6 SHA512 b33110d8e78206d1ff2e3bc9d710ca70fa54b6dd7c9dca3b5c76ea85ea6b582ef8ccff245aa9d7ddcd50f7b8d95866b212cd16d21722f88ac30aa8be79b124d0
 MISC metadata.xml 244 BLAKE2B f0c285271b149f90fc80cca808366c27dc0e3da036e71b3d5754c33dabfc1e7df9ca340dbf729365f3b38961b165370d511075eebf6c0ce910134378d0c2b03d SHA512 3c0bc0d2a893195113f085b69d5e6d1ac5a6916bde0f04fb319c020badf81472b79d1430d6ba2cd123265334510498a27a3c38bfdc230bf5fbbfab65d5aa4d48
diff --git a/app-forensics/ovaldi/files/disable-acl.patch b/app-forensics/ovaldi/files/disable-acl.patch
deleted file mode 100644
index 49ea42c80558..000000000000
--- a/app-forensics/ovaldi/files/disable-acl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/probes/unix/FileProbe.cpp.old	2013-01-14 16:28:33.000000000 +0100
-+++ src/probes/unix/FileProbe.cpp	2013-01-14 16:30:33.000000000 +0100
-@@ -427,19 +427,8 @@
- 	   5) If a file doesn't have an ACL, or it matches the standard UNIX permissions, the value will be 'false' (this is covered by acl_extended_file() - thank you openscap)

- 	   6) If a file has an ACL, the value will be 'true'.

- 	*/

--	

--	int hasExtendedAcl = acl_extended_file(filePath.c_str());

--	if(hasExtendedAcl > -1){ // behavior 4, 5, and 6

--          item->AppendElement(new ItemEntity("has_extended_acl",Common::ToString(hasExtendedAcl),OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_EXISTS,0));

--	}else{

--	  if(errno == EOPNOTSUPP){ // behavior 3

--	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_DOES_NOT_EXIST,0));

--          }else{ // behavior 2

--	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_ERROR,0));

--            item->AppendMessage(new OvalMessage(string("Error reading ACL data: ") + strerror(errno)));

--          }

--	}

- 

-+	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));

- # else

- 	// behavior 1

- 	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch
deleted file mode 100644
index b9d02d763c61..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-disable-selinux-probes.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/probes/unix/Process58Probe.cpp.old	2013-01-14 16:05:18.000000000 +0100
-+++ src/probes/unix/Process58Probe.cpp	2013-01-14 16:06:16.000000000 +0100
-@@ -29,8 +29,8 @@
- //****************************************************************************************//

- 

- #ifdef LINUX

--#  include <selinux/selinux.h>

--#  include <selinux/context.h>

-+/*#  include <selinux/selinux.h>

-+#  include <selinux/context.h>*/

- #  include <sys/capability.h>

- #  include <SecurityContextGuard.h>

- #endif

-@@ -328,7 +328,7 @@
- 	pid_t sessionId;

- 	uid_t loginuid;

- 	uint64_t effCap, *effCapp=&effCap;

--	string selinuxDomainLabel;

-+/*	string selinuxDomainLabel;*/

- 

- 	Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;

- 

-@@ -423,10 +423,10 @@
- 	}

- 

- 	// this one doesn't require reading anything in /proc

--	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {

-+/*	if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {

- 		item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));

- 		item->SetStatus(OvalEnum::STATUS_ERROR);

--	}

-+	}*/

- 

- 	// The Linux start time is represented as the number of jiffies (1/100 sec)

- 	// that the application was started after the last system reboot.  To get an

-@@ -522,10 +522,10 @@
- 		// aren't any.

- 		item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_ERROR));

- 

--	if (selinuxDomainLabel.empty())

-+/*	if (selinuxDomainLabel.empty())

- 		item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_ERROR));

- 	else

--		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));

-+		item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/

- 

- 	if (statStatus == PROC_OK)

- 		item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));

-@@ -740,7 +740,7 @@
- 											   capMap[capEnum]));

- 	}

- }

--

-+/*

- bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {

- 	security_context_t sctx;

- 	int ec = getpidcon(pid, &sctx);

-@@ -763,7 +763,7 @@
- 	*label = tmp;

- 	return true;

- }

--

-+*/

- #elif defined SUNOS

- 

- void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {

-@@ -830,7 +830,7 @@
- 	item->AppendElement(new ItemEntity("exec_shield", "", OvalEnum::DATATYPE_BOOLEAN, OvalEnum::STATUS_NOT_COLLECTED));

- 	item->AppendElement(new ItemEntity("loginuid", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

-  	item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

-- 	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

-+/* 	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));*/

- 	item->AppendElement(new ItemEntity("session_id", Common::ToString(info.pr_sid), OvalEnum::DATATYPE_INTEGER));

- 

- 	items->push_back(item);

-@@ -988,7 +988,7 @@
- 	item->AppendElement(new ItemEntity("exec_shield", "", OvalEnum::DATATYPE_BOOLEAN, OvalEnum::STATUS_NOT_COLLECTED));

- 	item->AppendElement(new ItemEntity("loginuid", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

- 	item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

--	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));

-+/*	item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, OvalEnum::STATUS_NOT_COLLECTED));*/

- 	item->AppendElement(new ItemEntity("session_id", "", OvalEnum::DATATYPE_INTEGER, OvalEnum::STATUS_NOT_COLLECTED));

-     

-     items->push_back(item);

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch
deleted file mode 100644
index fc127efd3cdb..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-strnicmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Main.h.old	2010-10-22 14:59:13.000000000 +0200
-+++ src/Main.h	2010-10-22 14:59:38.000000000 +0200
-@@ -38,7 +38,7 @@
- #endif

- 

- #ifdef LINUX

--#  define STRNICMP strnicmp

-+#  define STRNICMP strncasecmp

- #elif defined SUNOS

- #  define STRNICMP strncasecmp

- #elif defined DARWIN

diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch
deleted file mode 100644
index 9350029312c4..000000000000
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.4-xerces3.patch
+++ /dev/null
@@ -1,283 +0,0 @@
---- src/XmlProcessor.h.old	2011-08-18 14:35:41.608703233 +0200
-+++ src/XmlProcessor.h	2011-08-18 14:39:21.835597094 +0200
-@@ -38,14 +38,17 @@
- #include <string>

- 

- //	required xerces	includes

--#include <xercesc/dom/DOMBuilder.hpp>

- #include <xercesc/dom/DOMDocument.hpp>

- #include <xercesc/dom/DOMErrorHandler.hpp>

- #include <xercesc/dom/DOMError.hpp>

- 

- // for entity resolver

--#include <xercesc/dom/DOMEntityResolver.hpp>

--#include <xercesc/dom/DOMInputSource.hpp>

-+

-+#include <xercesc/dom/DOMImplementationRegistry.hpp>

-+#include <xercesc/dom/DOMLSParser.hpp>

-+#include <xercesc/sax/EntityResolver.hpp>

-+#include <xercesc/sax/InputSource.hpp>

-+#include <xercesc/sax2/SAX2XMLReader.hpp>

- 

- #include "Exception.h"

- 

-@@ -53,12 +56,14 @@
- 	This class extends the default DOMEntityResolver and implments the resolve entity method 

- 	to support 

- */

--class DataDirResolver : public xercesc::DOMEntityResolver {

-+class DataDirResolver : public xercesc::EntityResolver {

- public:

- 	/**

-      *     

- 	*/

--	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);

-+//	xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
-+	xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
-+	xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
- };

- 

- /**

-@@ -144,7 +149,7 @@
- 	 * owns the documents it builds.  Users must manually destroy

- 	 * those documents.

- 	 */

--	xercesc::DOMBuilder *parserWithCallerAdoption;

-+	xercesc::DOMLSParser *parserWithCallerAdoption;

- 

- 	/**

- 	 * This parser doesn't have user-adoption switched on, so it

-@@ -156,7 +161,7 @@
- 	 * appear to ever be switched off.  So to make sure this isn't

- 	 * leaking memory, I have created separate parsers.

- 	 */

--	xercesc::DOMBuilder *parser;

-+	xercesc::DOMLSParser *parser;

- 

- 	/** The entity resolver for both parsers. */

- 	DataDirResolver resolver;

---- src/probes/independent/XmlFileContentProbe.cpp.old	2010-10-22 14:49:22.000000000 +0200
-+++ src/probes/independent/XmlFileContentProbe.cpp	2010-10-22 14:51:39.000000000 +0200
-@@ -419,12 +419,24 @@
-     return new DummyEntityResolver::DoNothingBinInputStream();

- }

- 

-+#if XERCES_VERSION_MAJOR < 3

- unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const

-+#else

-+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const

-+{

-+    return NULL;

-+}

-+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const

-+#endif

- {

-     return 0;

- }

- 

-+#if XERCES_VERSION_MAJOR < 3

- unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)

-+#else

-+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)

-+#endif

- {

-     return 0;

- }

---- src/probes/independent/XmlFileContentProbe.h.old	2010-10-22 14:55:47.000000000 +0200
-+++ src/probes/independent/XmlFileContentProbe.h	2010-10-22 14:57:00.000000000 +0200
-@@ -134,8 +134,14 @@
-     class DoNothingBinInputStream : public BinInputStream

-     {

-     public:

-+#if XERCES_VERSION_MAJOR < 3

-         virtual unsigned int curPos() const;

-         virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);

-+#else

-+	virtual XMLFilePos curPos() const;

-+	virtual const XMLCh* getContentType() const;

-+	virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);

-+#endif

-     };

- };

- 

---- src/XmlCommon.cpp.old
-+++ src/XmlCommon.cpp
-@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
- string XmlCommon::GetNamespace(DOMElement *element) {

- 

- 	string xmlns = "";

-+#if XERCES_VERSION_MAJOR < 3

- 	xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());

-+#else

-+	xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());

-+#endif

- 	if (xmlns.compare("") == 0) {

- 		xmlns = "";

- 	}

---- src/XmlProcessor.cpp.old	2013-01-14 15:16:14.000000000 +0100
-+++ src/XmlProcessor.cpp	2013-01-14 15:19:20.000000000 +0100
-@@ -35,7 +35,6 @@
- // for dom Writer

- #include <xercesc/dom/DOMImplementation.hpp>

- #include <xercesc/dom/DOMImplementationLS.hpp>

--#include <xercesc/dom/DOMWriter.hpp>

- #include <xercesc/framework/StdOutFormatTarget.hpp>

- #include <xercesc/framework/LocalFileFormatTarget.hpp>

- #include <xercesc/util/XMLUni.hpp>

-@@ -50,11 +49,26 @@
- using namespace std;

- using namespace xercesc;

- 

-+#if XERCES_VERSION_MAJOR < 3

-+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)

-+#else

-+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)

-+#endif

-+

- //****************************************************************************************//

- //			DataDirResolver Class                                   					  //	

- //****************************************************************************************//

--

-+#if XERCES_VERSION_MAJOR < 3

- DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {

-+#else

-+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)

-+{

-+	return NULL;

-+	//return DataDirResolver::resolveEntity (publicId, systemId, NULL);

-+}

-+

-+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {

-+#endif

- 	string path = "";

- 	size_t last;

- 	string schemapath = Common::GetSchemaPath();

-@@ -127,7 +141,7 @@
- 		parserWithCallerAdoption = makeParser(schemaLocation);

- 		// add one extra feature on this parser to prevent it from

- 		// taking ownership of its documents.

--		parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);

-+		SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);

- 

-     } catch (const XMLException& toCatch) {

-         string errMsg = "Error:  An error occured durring initialization of the xml utilities:\n";

-@@ -156,32 +170,40 @@
- 	XMLPlatformUtils::Terminate();

- }

- 

--DOMBuilder *XmlProcessor::makeParser(const string &schemaLocation) {

-+DOMLSParser *XmlProcessor::makeParser(const string &schemaLocation) {

-     // Instantiate the DOM parser.

- 	static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };

- 	DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);

- 

--	DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

-+#if XERCES_VERSION_MAJOR < 3

-+	DOMLSParser *parser = ((DOMImplementationLS*)impl)->createDOMLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

-+#else

-+	DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);

-+#endif

- 

- 	///////////////////////////////////////////////////////

- 	//	Set features on the builder

- 	///////////////////////////////////////////////////////

- 

--	parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 

--	parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  

--	parser->setFeature(XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing

--	parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.  

--	parser->setFeature(XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.

--	parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  

--	parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  

--	parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.

-+	SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document. 

-+	SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.  

-+	SetParameter(parser, XMLUni::fgDOMNamespaces, true); //  Perform Namespace processing

-+	SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.  

-+	SetParameter(parser, XMLUni::fgXercesSchema, true); //  Enable the parser's schema support.

-+	SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); //  Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.  

-+	SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); //  The parser will treat validation error as fatal and will exit  

-+	SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.

- 

- 	///////////////////////////////////////////////////////

- //****************************************************************************************//

- //			The following code was added to handle air-gap operation					  //	

- //****************************************************************************************//

- 	/* Look for XML schemas in local directory instead of Internet */

-+#if XERCES_VERSION_MAJOR < 3

- 	parser->setEntityResolver (&resolver);

-+#else

-+	parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);

-+#endif

- //****************************************************************************************//

- //			End of air-gap code															  //	

- //****************************************************************************************//

-@@ -189,7 +211,11 @@
- 	///////////////////////////////////////////////////////

- 	//	Add an Error Handler

- 	///////////////////////////////////////////////////////

-+#if XERCES_VERSION_MAJOR < 3

- 	parser->setErrorHandler(&errHandler);

-+#else

-+	parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);

-+#endif

- 

- 	// Fix a schema location if possible, so instance documents don't

- 	// have to set the schemaLocation attribute.  And if they do, this

-@@ -197,7 +223,7 @@
- 	// overriding of the value in instance documents.

- 	if (!schemaLocation.empty()) {

- 		XMLCh *schemaLocationCstr = XMLString::transcode(schemaLocation.c_str());

--		parser->setProperty(XMLUni::fgXercesSchemaExternalSchemaLocation, schemaLocationCstr);

-+		SetParameter(parser, XMLUni::fgXercesSchemaExternalSchemaLocation, schemaLocationCstr);

- 		XMLString::release(&schemaLocationCstr);

- 	}

- 

-@@ -279,23 +305,19 @@
- 		XMLCh tempStr[100];

- 		XMLString::transcode("LS", tempStr, 99);

- 		DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);

-+#if XERCES_VERSION_MAJOR < 3

- 		DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();

-+#else

-+		DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();

-+#endif

- 

--		// set feature if the serializer supports the feature/mode

--		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))

--			theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);

- 

--		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))

--			theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);

--

--		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))

--			theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);

--

--		if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))

--			theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);

--

--		//if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))

--		//	theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);

-+		// set feature if the serializer supports the feature/mode

-+		SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);

-+		SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);

-+		SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);

-+		SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);

-+		//SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);

- 

- 		//

- 		// Plug in a format target to receive the resultant

-@@ -313,7 +335,13 @@
- 		//

- 		// do the serialization through DOMWriter::writeNode();

- 		//

-+#if XERCES_VERSION_MAJOR < 3

- 		theSerializer->writeNode(myFormTarget, *doc);

-+#else

-+		DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();

-+		output->setByteStream(myFormTarget);

-+		theSerializer->write(doc, output);

-+#endif

- 

- 		theSerializer->release();

- 		delete myFormTarget;

diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
deleted file mode 100644
index c23af38bfe53..000000000000
--- a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Free implementation of OVAL"
-HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl ldap selinux"
-
-CDEPEND="dev-libs/libgcrypt:0
-	dev-libs/libpcre
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	sys-apps/util-linux
-	sys-libs/libcap
-	acl? ( sys-apps/acl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}
-	selinux? ( sys-libs/libselinux )"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	#Ovaldi do not support xerces 3, but portage have only that
-	epatch "${FILESDIR}"/${P}-xerces3.patch
-	sed -i 's,xercesc::DOMBuilder,xercesc::DOMLSParser,' src/XmlProcessor.h || die
-	sed -i 's,DOMBuilder,DOMLSParser,' src/XmlProcessor.cpp || die
-
-	epatch "${FILESDIR}"/${P}-strnicmp.patch
-
-	if ! use ldap ; then
-		einfo "Disabling LDAP probes"
-		sed -i 's,.*ldap,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*LDAP,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's/-lldap//' project/linux/Makefile || die
-		sed -i 's/-llber//' project/linux/Makefile || die
-		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
-		rm src/probes/independent/LDAPProbe.{cpp,h} || die
-	fi
-
-	if ! use acl ; then
-		sed -i 's,.*libacl,//&,' src/probes/unix/FileProbe.h || die
-		epatch "${FILESDIR}"/disable-acl.patch
-		sed -i 's, -lacl , ,' project/linux/Makefile || die
-	fi
-
-	einfo "Disabling rpm probes"
-	sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
-
-	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
-	einfo "Disabling dpkg probes"
-	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
-
-	#Disabling SELinux support
-	if ! use selinux ; then
-		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.h || die
-		epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
-		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.cpp || die
-		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.h || die
-		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.h || die
-		sed -i 's,.*SecurityContextGuard.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
-		rm src/linux/SecurityContextGuard.h || die
-		sed -i 's, -lselinux,,' project/linux/Makefile || die
-	fi
-	# respect CXXFLAGS and CXX
-	sed -i -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' project/linux/Makefile || die
-	tc-export CXX
-}
-
-src_compile () {
-	emake -C project/linux
-}
-
-src_install () {
-	# no make install in Makefile
-	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh
-	dodir /var/log/${PN}
-	insinto /usr/share/${PN}
-	doins xml/*
-	dodoc docs/{README.txt,version.txt}
-	doman docs/ovaldi.1
-}
diff --git a/app-forensics/yasat/Manifest b/app-forensics/yasat/Manifest
index edfff0358e3b..3e7068ef8b3d 100644
--- a/app-forensics/yasat/Manifest
+++ b/app-forensics/yasat/Manifest
@@ -1,12 +1,3 @@
-AUX yasat-700-remove-absent-tests.patch 506 BLAKE2B 2f699c54d3378a1100274d308493a2857cbe506a6c2da359fbfe5bd2abe2b07c530b68efeae4c2a2034d9747dd0a7be93df10bcf09f45f6edd4130be8cb08d88 SHA512 766b85891a5a866af5a2fd518e13a65dc56184235ac17526b5f32fd9175569d20cc3a6dcea27ad400a65cf99f23346fafa0ed2e368f3f9a2077c23d3d21fae95
-DIST yasat-526.tar.gz 123976 BLAKE2B 51ce9c161b633fec268a83f1fe4f464532e1613c7ffbd6a361a27793c0f8251e064c96112c79299349aed3a1214d28484aa47580ef1a6de71ba358eec0720382 SHA512 8abcc43f49791e7fd4c7755a2d2b20b6b89d5437bf9dfd392867374ecaaddba96d311636b38d4a6ba60f52c342334675bb1f3894b7aeae446ab479b9a319f898
-DIST yasat-700.tar.gz 137379 BLAKE2B 217bb83cdad0ad0de1fbec622f155ec21bcb5fb34c49bc6e612065f64b40dcb0046b54733c75d33b3a473e37607aad291561dc8fa38df6d5f968ee006863af64 SHA512 5022667810bf70f07181b7177ddf542690d22be3a82e7b0476d8d0d9c01844413ca6c848587dc29ec4c5c4e40c6a5a51781a2e564b19e9674d0ca916807378a5
-DIST yasat-755.tar.gz 141633 BLAKE2B 6d3e9e6efbfaba395326a73b5ad521ed1a3d8f2a31ec0041d92f4c84285a4d6b8a232781baec73fcb0cce7ae1f04e7a8493a1d9caed2812938da4a88c6672e8e SHA512 5a2a86c1f828f3fee5b84447ce6607b0dbdd8a16d8425dac910ef1c6f0d606105e851af35eedada46bf6438fb7cdde3f178803d8adf91e86f3bae4ce06151f44
-DIST yasat-839.tar.gz 148015 BLAKE2B ebc17bbba182be3bf5277d9032e885101a836ab5c118c88c17ffedabef74b58fc7cf84a415e03e85ba5549587197daf035d121642620048b7d91f02bb51cbb30 SHA512 daf500a6f71a41d5f29501b0e449b711aea151d39b553c0ec356a8986b58a60ab96553cb9a752b495a455e1072e945c8b70aaf9eea53abac0ada8f26aa0b9181
 DIST yasat-848.tar.gz 148261 BLAKE2B 917846d82f052d8300045eb02e6aa8cea18bb6ea170ef52c83646069ed14096f205cba8f50d079f7f63fcd00e84c78643aacfc202795d3922c0708cd525ef1f8 SHA512 0bc0e8e1068bee05242b5c7a7cdc8ca976503f696aef2889870ef872546021d0956489cf8d5b304a36be412cf8e5c8cbf4be5aa1cce5df008c5185188e5a99dc
-EBUILD yasat-526.ebuild 484 BLAKE2B 9ce845c479753609efe1440add1cc042f3abfe10fe28e82705ab4382f7f5839b48c46a9fb4e5d11fcb3465325f7f217bb6bf6718dec6bdd024f0a67598c99a72 SHA512 3fdf812007806e441171d31700626f44bce122b88afc7c36d8c9397116db7ecf87d130d8e5f4c195312e6540620e30da71028c5c5c30f6540e4ef6f3e8135233
-EBUILD yasat-700.ebuild 565 BLAKE2B 5ea1b7d4cf8d2b02f33033d89ff8de89c009139d81abb04750ebad4f761308f562b0fd525319f6807b881129a7e4741ba5ed459f9ea0074db25aa28d281feadd SHA512 b71485b1cddc66186612ded7c50111d39c88a7d44c1ade3f4677255b1b5cbf1ec0b84cb5c6c1e58cd9ba3b985c620ac0c7ab9bffde1530d7d50b2ad005accb46
-EBUILD yasat-755.ebuild 493 BLAKE2B fc2849bf416e1e5fa05ac48193778f98ed2935dc30fa55b2ca282663be4a86426962f51e40040959ddbbd22279f1359a5952bb9f28801d193298aee39da07a66 SHA512 8bab1fb28f7186345da24999449fe2c2d45208c515c9b76f5bff2e1cfde145b87da895b49b802d28ac9c07926d6db444833b1acb85d60705e20950f7e5f54326
-EBUILD yasat-839.ebuild 493 BLAKE2B fc2849bf416e1e5fa05ac48193778f98ed2935dc30fa55b2ca282663be4a86426962f51e40040959ddbbd22279f1359a5952bb9f28801d193298aee39da07a66 SHA512 8bab1fb28f7186345da24999449fe2c2d45208c515c9b76f5bff2e1cfde145b87da895b49b802d28ac9c07926d6db444833b1acb85d60705e20950f7e5f54326
 EBUILD yasat-848.ebuild 493 BLAKE2B fc2849bf416e1e5fa05ac48193778f98ed2935dc30fa55b2ca282663be4a86426962f51e40040959ddbbd22279f1359a5952bb9f28801d193298aee39da07a66 SHA512 8bab1fb28f7186345da24999449fe2c2d45208c515c9b76f5bff2e1cfde145b87da895b49b802d28ac9c07926d6db444833b1acb85d60705e20950f7e5f54326
 MISC metadata.xml 243 BLAKE2B 391aeec1a7040f787bdadf6f51360c9479a6fa85593395f5dcb34e499bb86e553da4777c3889a04c16e9f647ac09ab4001911af7c5e2899ac0b70648b0079134 SHA512 92acef03825eb111548d4f7214ed78f938db7485f569a87b6e69c35757e1e22603d1f29c2bc1f6dda7121fa231a41ffaf5d40993515c61c59f95221c93488e5a
diff --git a/app-forensics/yasat/files/yasat-700-remove-absent-tests.patch b/app-forensics/yasat/files/yasat-700-remove-absent-tests.patch
deleted file mode 100644
index cffda2f50fa7..000000000000
--- a/app-forensics/yasat/files/yasat-700-remove-absent-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tests/test.test
-+++ b/tests/test.test
-@@ -137,7 +137,7 @@
- qa_test $? 3
- 
- #check_system_cron
--echo "====== Check a private key ======"
--check_private_key ./tests/test_rsa.pem 2
--echo "====== Check a private key protected with password ======"
--check_private_key ./tests/test_rsa_password.pem 2
-+#echo "====== Check a private key ======"
-+#check_private_key ./tests/test_rsa.pem 2
-+#echo "====== Check a private key protected with password ======"
-+#check_private_key ./tests/test_rsa_password.pem 2
diff --git a/app-forensics/yasat/yasat-526.ebuild b/app-forensics/yasat/yasat-526.ebuild
deleted file mode 100644
index 5afa111fb9f5..000000000000
--- a/app-forensics/yasat/yasat-526.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc"
-	dodoc README CHANGELOG
-	doman man/yasat.8
-}
diff --git a/app-forensics/yasat/yasat-700.ebuild b/app-forensics/yasat/yasat-700.ebuild
deleted file mode 100644
index 408b1439affd..000000000000
--- a/app-forensics/yasat/yasat-700.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-absent-tests.patch
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc"
-
-	dodoc README CHANGELOG
-	doman man/yasat.8
-}
diff --git a/app-forensics/yasat/yasat-755.ebuild b/app-forensics/yasat/yasat-755.ebuild
deleted file mode 100644
index 5474a0034388..000000000000
--- a/app-forensics/yasat/yasat-755.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-S=${WORKDIR}/${PN}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc"
-
-	dodoc README CHANGELOG
-	doman man/yasat.8
-}
diff --git a/app-forensics/yasat/yasat-839.ebuild b/app-forensics/yasat/yasat-839.ebuild
deleted file mode 100644
index 5474a0034388..000000000000
--- a/app-forensics/yasat/yasat-839.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-S=${WORKDIR}/${PN}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc"
-
-	dodoc README CHANGELOG
-	doman man/yasat.8
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index af9b496acc9b..2137468a5d14 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8c0b90306009..d9cfb1711f8f 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -7,5 +7,5 @@ DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060
 EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679
 EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96
 EBUILD ibus-1.5.18.ebuild 4279 BLAKE2B cc9c0046615c92f1767e7c1e942a283e7ba6a1d9acc9f65c96b4f7bb60cdc0434017c112f21e1a321a55a0997d942b57ed8ef9013762d4ac635b5da3f0c31725 SHA512 65d60a8f53ea373982e35c8c817a1752565cd98f4c54db339119f762898aed3142ccd8d044ecec54b1375e9ffeaa306d07e6ad0cff198d63b58140ef4c12ee4e
-EBUILD ibus-1.5.19.ebuild 4340 BLAKE2B 2550c7270052bdcdedf645f7698f3e972bc3e22c4456e976e9a161678e8e96ddeddbb6bfba13b8db976538d3f97f3c860773320f3d790c03a726979bdd3b1c41 SHA512 14f9d43bd461806e4bc0fe116ea3c983c691975e8285bba5d919d3c0cf52d4f3e41fb58f749866cc0f5d674e9db6e26aee9da77e431d5b11c29169228b0a7b7a
+EBUILD ibus-1.5.19.ebuild 4358 BLAKE2B c51a3c8c99835247faa82948d3763205049e61ba5486cbeae240e770e870687012efa23501159ef72e3a0a283b36ef2883f89ead90389ec2019ce9bcd7287ee7 SHA512 43c454d0436ed3ec9735d1b0c13b00b475fc53757bcf2d3456a8ab567ee05240da8e90471b8ab07f3f3fce5ef91d3d8c71fbea56fae6dc935df2736bc3a8eddb
 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 f318087a0030..5b5724779a5d 100644
--- a/app-i18n/ibus/ibus-1.5.19.ebuild
+++ b/app-i18n/ibus/ibus-1.5.19.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"
@@ -63,6 +63,7 @@ RDEPEND="${CDEPEND}
 	)"
 DEPEND="${CDEPEND}
 	$(vala_depend)
+	dev-util/glib-utils
 	dev-util/intltool
 	virtual/pkgconfig
 	emoji? (
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 285b523a8aa7..39def0ead547 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-fr-3.40.1.tar.bz2 1136351 BLAKE2B ed175105dbcccc6c1fd8e888d5c015e91d166949821ff4441aa62e9bb002a0b79c493bba7b9a247103201c9f6a12f9d2a8618a00930669196a02e99dc9bb2cfa SHA512 58027da7b78a442a84448ed6d7c6c89ccbe97fd811afb26a9c6580da2e15b86f7fae4c876d773f7ceca1fbe92c265693eae01b76ad4795b52c0298ba25ac1330
 DIST man-pages-fr-3.70-1.tar.xz 1143156 BLAKE2B 09a86733caf03246e530e898688d0f93ef401a74cc66eb1f5ee05ded5dee0be45fc27fcbcf458f2c5a3286a6655c7b7302eb1b2759be6e0205e69db95ce989dc SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8
 EBUILD man-pages-fr-3.40.1.ebuild 617 BLAKE2B b01216e1864eaba5fe0f0e4cedee41a91db8b58f74b6c5c60e94ed8110abb06420e2d1a346ea5d8c863e63c3b767f7a2c5983f0cd371585bd595a7578eea5501 SHA512 7dd9cf6c085ee30d81e087d84ed9f1829704693db46b94ca18a5003ab75840a0b5e4539b4067509b995c580c1abb63c3c15f19527f3baa7449541103fe646d92
-EBUILD man-pages-fr-3.70.ebuild 599 BLAKE2B 948aa31261c8d499ce0e67b3b640cddc414e8288983ed51e0a8f6bec2cfbcbfd288d65a1edface963fcfa4d7dfdf83e064d6b47680de1c82b0f5c3586abfb925 SHA512 af5795905c6ad7125ab80435af15742591d6307d49a1fa88a856eb9b34b976b1bf4da58ab055bbca9c86c7a5cfbb25b310251a6245523af4c917c0388c3f3f26
+EBUILD man-pages-fr-3.70.ebuild 593 BLAKE2B 86ca518c77a912118958c96c1284437462f5d7b920b033868fed960af2112d893ae12670f64a1ee72ce1b7d112a788fe2c36de4331201886c63550c14014aed8 SHA512 4f7d92542aa789def3ab0002c5175520ac7d79f106a9a8ed9ff407aaacc8a0b8208d3734d93f2b890baca93a8565b2792ada9fd617eededf9f6bfc2ec45b796b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild
index 9b8632e36abf..2f1a356dd353 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70.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://alioth.debian.org/frs/download.php/file/4119/${P}-1.tar.xz"
 
 LICENSE="BSD FDL-1.1 FDL-1.2 GPL-2 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=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index ebe3ce789f0b..2b0962e476d8 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-it-2.80.tar.gz 1789480 BLAKE2B 664121e6a6d8e73200546431ea97d0b8c751eaeed87e958ff0b0a822c651c7e489b05a7e26de23a889a4f1ab6fc21524bb81fab21f0331eedb4102d40cecfeb1 SHA512 81cee1b4d0c818b83830355ba1347df7a309b87ebfe3169db7763b22de8638273eacf377d0b9127aa1e748c8fd427eb268dda6d6c4b543c6d3788edda86980ef
 DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
 EBUILD man-pages-it-2.80-r1.ebuild 719 BLAKE2B 731599ffa82862ffb559abb582c806a656f6b944b35ea68ea384e6e6bdcd89cd1ada2aa981e572354065de74b928177676a8e8d5bba0f8e360feb399215518e3 SHA512 63361bfbe5770c970332fcb43df2ee706a6ea06a098562eda2b55de9d6eef893e6dec1ee17c25678060599e1440b0f9032a5ba910364cf6ec8f46a29434f7cc1
-EBUILD man-pages-it-4.00.ebuild 725 BLAKE2B 3599abd3bff72c8083c12b0fa0a4585bed607b1e1392820ec633407c3fc3ee879ee93a34691aaa4cd3d5a6de0875720bff381938faebe18e80c3bda6bf7ab2cc SHA512 7c0cea795a609daa7c28e853131238de2b4aef497d6c3f07da23ecd21e99b5c4becee02c2d168d02b9b975a5aae1994605d3d4a4f2b90174054f006c9c1d445d
+EBUILD man-pages-it-4.00.ebuild 719 BLAKE2B 16155c5447e2077253be813d162c7407f04993707f5acb958b58c8a4d91b4e4928947830469ecf2be326caeddc360dcaf29eebc27c7974a12ceda982a3b23708 SHA512 b432e6fd70633bf60a6a94ed295a8b84c33abf60b784861086e29c7efebbd8e92ceb20d64dad360c339185426ae9d1314528392cac7a10210cf8e08acdf6e881
 MISC metadata.xml 421 BLAKE2B a703dcd3047685aa6aa2a276d88a4a2f7a804bfcdf9d2980af1cf243b5f002361e8ed0b78961baab773fc20d46a6f860c8c912b39dc8a821d7ff4dcc7b317de5 SHA512 0c58ae5b97148e94d374bba03e0a65a2462b5f0d750c4df4e52ebd0cfac649fe4f35011429423ef20a20391cf4d69c206eb8bfa3d4ddd060265427b6d96aa095
diff --git a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
index 162f6b988e84..5d451a40ce35 100644
--- a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-4.00.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
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
 
 LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
 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=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index 1e198de5cc12..4a10f410ae38 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-zh_CN-1.5.tar.gz 3762338 BLAKE2B c2c740e6ae6f6e0cb26af7bca4e9d5ce75b20eb535362030565c8ed794c984ac8d1c7fe0ee354f58cbb37bc2dba1067afc33dbe4af07257938b0137156b43790 SHA512 799eac7e6c64dd9bb647bf490457bc6ece76870d261606e33f48df977762b66f778fb5afe3608443be100e516988c700ddb53de2a226e7b29d32348fa240ce91
 DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
 EBUILD man-pages-zh_CN-1.5.ebuild 643 BLAKE2B ec1026616838e311022ba6f1792b29e7e2529d869aade168aa7384995ba4ade5d7d97d4f2d7b18fc6e825289f999575ee618733ab0c0d7a7ca6a9b31ef36c7b7 SHA512 2311e3c84969eb1a5654b5e5f1eabf6c6331ffec4d566e3035f36946c830104171f65da7c5b2564e37f0dff3c72581cf94d44a979370cb2f223a06696fcea12b
-EBUILD man-pages-zh_CN-1.6.3.2.ebuild 840 BLAKE2B 3c3d0bcb492e4abb5a4a789d6250be66ee945a95932fd7eb5f85a3e64e162f1ad833d1c99258fb961d78557e446ab9a12e9b92e1f84e5af2472d0d2063c50ced SHA512 f8e426425001fda818a94c310286c248ce0c5ca13e67b2ebc7abd5a9c9704c1f89ba06c98d0d70a2218b87e42e8be3e5889924d26c0f35ae64f4c9e876fcb088
+EBUILD man-pages-zh_CN-1.6.3.2.ebuild 834 BLAKE2B ee4500c6142d671bff85684b586608a4ee7807c54af335f7db9602e69f86188c761a1987a163259ad83a86a8ccb5653a7d19a9174347cb239421b9f9fdcba8da SHA512 f4fc84939f83e9a4de32512df809b968ad30f912856f1613a5bff18cfcced65d3770bf50e011b897e8c9fcd5fe4cb95ea6a2983fd1016bb8936f680dd1e1901d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
index 571125909774..e7a3c74a8c95 100644
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.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=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 1a428db67510..471513938008 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,3 @@
-DIST transifex-client-0.10.tar.gz 71817 BLAKE2B ff98cf6ec54131fb7fe25f3eb5b10d204b4269db1d72ec45cd1646fefca9e71e8493846560ad380778ab27119ae81f10a01b3405fb39a20839098f86de8756cc SHA512 c8134f3fc04953d468c2e6ceb0ef90e8335709bde778c5d7d532b3ea390e71abdf8856b8eaa5acf6507c4e6fd2f918e6b0989b3913ee603cc5987b1a9d6b3964
-DIST transifex-client-0.12.2.tar.gz 177046 BLAKE2B e676930ef1269db6b28cd9aebeab20749ed51d27428d0ff7f7b2ac3427812d1a36598d51593d739b5447e088f82e34c6c0b7b209f3c9568f3577bbb640ce0399 SHA512 5cf1df26a195b85cbb20dc6b53ce9e6a39330347edee7e294f8f50bfa954bc47304dcaed1109e405794c67bef0fb62ae6eace90e69556c89ec48d14d6990fdb7
 DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
-EBUILD transifex-client-0.10.ebuild 497 BLAKE2B aa3269d370a187f15c506f560af4d24587a72ef05816a2af668be4995805d2c02a245c57a70834fb4e2501be35313c76842a72ea766e71ef426802292924f2fd SHA512 fb907677958cfa3278922b22b420511f0243302b82d18aff21459e85b0a5d6f58ce5a5ac00bbf939d05a9d88c1104886078e907f88bb6116aa011472659deecc
-EBUILD transifex-client-0.12.2.ebuild 512 BLAKE2B 5c8bf4e477d373f8e57065baf1bc9e5040dd67c4fa5a39ce567c163521c8a6ab381075b6b16d9f0bce16f7d375970caca6d4365162e2f6fba04f67475b767536 SHA512 284e9383b5399b098e7bc26806cec41affcc6c8b254a4491c389123d1d29716b01263d7c48a10eda51bc255f71e7492689580bf309bea6cf333c484b5dd8b849
 EBUILD transifex-client-0.12.4.ebuild 630 BLAKE2B 1056dde4c5b77d8103c33365b4a428a4a74b746332db67daef2a5489ad87a077423b0d368c9d89281f13ccd15b35f47de32053c9e04db9da8eaf590d4f991146 SHA512 0ad5eb19f0607f40c3e745c484b14577a09220a03d71db4687ed63a418cab7c0b9cb9ac2cd8bb758bc4f5b4efd8c8c44799676888dfd046b1c0838c9f9a88bfe
 MISC metadata.xml 312 BLAKE2B 4f8f44c33d8e28af1666aed00cd0536cf010425d878769c0354ccee3e09a05314a61336ca16a012c6f9a453370df95410e02835123fa09b04bb9b6e6be9b39c7 SHA512 2f46ebd28eab7970044d6ce2570abce4507e3a6087ffd6b3825e005a25645d24f0b9c1fa08c31cbfe7d4a4795d6318e0cb72a959b36934055dbb95aa4d688272
diff --git a/app-i18n/transifex-client/transifex-client-0.10.ebuild b/app-i18n/transifex-client/transifex-client-0.10.ebuild
deleted file mode 100644
index ffa6e59029dd..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.10.ebuild
+++ /dev/null
@@ -1,20 +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="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
-SRC_URI="https://github.com/transifex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
deleted file mode 100644
index 267aa3228929..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 3c6dec7ec019..b1503c4e4578 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 41236ad3c902..a00a15791bfe 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -7,5 +7,5 @@ AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f
 DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
 EBUILD collectd-5.8.0-r1.ebuild 19416 BLAKE2B 3f5880aa8598e508aa57463801c5add74249c3e1a41a5692f1b32db1d520e7fcfb8f2bce75ca352fed9e0cecaf61b53c74678e5777003e99a6abe740d6b2a39f SHA512 1c8fcb25b433c6e01bd7cf3a1f89be36fcc5cd94b30c4e023745d5fc789015cf06e83a627030e452931804d278da3992008477208d6cbd280d7b91707ff07e1e
-EBUILD collectd-5.8.1.ebuild 19434 BLAKE2B 536d569818cb2097c6612404f62b1a9a601f389fc02b38f002392762acde39e5b7c3dde781020d58aa0cda394980a9280fd21dab663acec9aa184b95f81d2e9f SHA512 52f3882b0f0fd076a61aeb3f49ee8cb0ab943b5a33282bc43d1d8530c5293862da1054d39c2f81a51103b746cfcd6556a1b54e97d724e42e69d4f01f353ff34c
+EBUILD collectd-5.8.1.ebuild 19433 BLAKE2B dd8ecdf5b763c9379d754c612d39b5dcb340a76e9fc8eecde72d353a3179687f8f80feeb46efc82a7986a00cbd4524ce5241b67f06330f5e56f69de812a84b28 SHA512 1b4a547c2673f8531214cc12cf81e5d87d722623ab032da0f80faae35dac510c1655a5407620c80e2a0e8f975b6b02f1d496755b4fa964e6d455f31b11b981eb
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1.ebuild
index ae00f557d5c5..5a1b006d7865 100644
--- a/app-metrics/collectd/collectd-5.8.1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm x86"
+KEYWORDS="alpha amd64 arm x86"
 IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 331114c42ecc..c02bc6de2836 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -4,8 +4,10 @@ DIST prometheus-2.4.3.tar.gz 6095284 BLAKE2B 9b9d54cf8ed61453d63e4b93cd81cd1c08a
 DIST prometheus-2.5.0.tar.gz 6123272 BLAKE2B a84b31e24f4448330af63b64ed56b8c535e790930738c0f00d7ec05ff5b49cd52bcae047cfe3a0470909397562f29662003e5b5ad0a747dc209109e360daa18d SHA512 181ef94b75717d116ae8b1307f7351eb889d153b27316e08e8cffe16cf885dbf43bd0bd4214f05e56bc33bbf53f7864721ab666f5ea4356b37a5987347c6a191
 DIST prometheus-2.6.0.tar.gz 6607363 BLAKE2B b9449403c840367b5332e27cf5d76b3becf1abcaaff6b2f2fd48441609b91d969ce078a2a3c4a38cc68b421b8e796561be87858adb77ac780f45650147469596 SHA512 75ae11a49de4277c7b4e49b83d7f34c9eb17b6bde988ab84e735109430361856ae0d33179a678b2cfc88342966a8e393a75062142c6f713f8a974aa8f332691e
 DIST prometheus-2.6.1.tar.gz 6612143 BLAKE2B 33dc64406dd45f494720a1ff5f6d09ed4b45b3880b15626ab7455909258addc5d1549d3edbf8af9a374516930b297c5bdb6ef51a78cac3cb338357896c0d71ae SHA512 80bf6afa00b60aa4245a53e275a2b9579a7936609aba4ffacbbe478f34e530208e0498d8c5ea53dd3a940726e05bd6fac19fed3d6d9dd209af565d5368b2340f
+DIST prometheus-2.7.0.tar.gz 7276755 BLAKE2B 39c5e73f87aa919537eba19c09a0268b1079ffc8527aef6d31637c6cd9339e0c49a60afc44515d18a86aca6056bf0a1707ba02fc441ff63f0f517d864747d5be SHA512 02df7701cc9c50c2792c1a9ddfb6e41345bbc2f12aef8dfb09b5b545499a09a88d13c6d70a090086d35694817d7a5b26312554ebc50b02492bfdbf206f611d03
 EBUILD prometheus-2.4.3.ebuild 2018 BLAKE2B 680b446079aa4f6c63973ec7c551e15d3fd413532c0b8e9fe4bd052d818b8d4e0dddc50711660168b8d17e43a6ea9c03f47097f6309fe4a2c7489a7ea1578aa2 SHA512 7188d7761b276ad8b91dfdd45cb68db13d7f4bfb05457a475f3e180e91a3ce150cfadf5cf0ffb6d20eff48f0ae63c5ec8fe9e7fb8fc104c61c9517e1d9ce9285
 EBUILD prometheus-2.5.0.ebuild 2019 BLAKE2B a2eb9a001197cedcd08bd09382a7b7fe979bed18fef9140f6c0a1087a06be13cf294808ddbb9a78c69513976679eacdbf52cf5081eddf34eb42c3f2873cb5eb5 SHA512 11e164cd754c917975743f3251cc1e50e9612c14129041c1f69eaee0b32917e58575e68d7e3d801b65d695f2bcd6aa448a4687abde436015ead18d15ed477cf9
 EBUILD prometheus-2.6.0.ebuild 2034 BLAKE2B 24a96bf1f7536fe537bea865463c29a5f385adbee87e1597693b9a0d1f7087a5b4a106fa409844c2c80d5308ce67a7612ef636448bccf45e979306f8a60429cf SHA512 276dafc414e4394cbf2f23235f9d6551bfcc55b61c8bf4da1f352870727184ca74806954e3716444b0891f543a803b7f680705ffa5435f742bdca1f68c2d46e9
 EBUILD prometheus-2.6.1.ebuild 2058 BLAKE2B 39d366af15eba910c708c1729592ce9e5c6d461ffc7801f97eb7a7a13c549818ad7f6d5d726312c2dcd4bcf9af7bfedab2ba79680315c4bd33c489655e3caa9d SHA512 75c746cee2e96ac9cda1d4051014193d2f3b0683ac255ffd058c1a56e1898f2959e79a616af7fe149ca7687f48b2c19c935f6a9a7bb637cb17086d6fff6939ef
+EBUILD prometheus-2.7.0.ebuild 2058 BLAKE2B 67aeb66306625024416a57068ec3448a6cdfab622aa366209e46e867e66204babf762810f7765fef2b0f4bc2da5a36bb0a920a4b6fcd4ccd7c4f753d133ed516 SHA512 8545e8cf9424b05213d47e3edad0839fc0ae4361bc90c4e536c57a1f890b4453d07ff8b606b60ffbbcab825032ca9aa1c06db6b2803131819111dd583a6d78b5
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.7.0.ebuild b/app-metrics/prometheus/prometheus-2.7.0.ebuild
new file mode 100644
index 000000000000..297c4d0750fc
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.7.0.ebuild
@@ -0,0 +1,70 @@
+# 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=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="410ee9e"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.10
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	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-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index da2759eb8ef4..07c05559c627 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index e4c6ec525a94..832f1de14068 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -4,5 +4,5 @@ AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854
 DIST cdctl-0.15.tar.gz 44163 BLAKE2B f5f3f44fabdff4446eb5d6e3fdcb12f17a4d6ee57e90f4bb772c963d89fd7b22301a6f8ae3b4f4b38f57aabd27cd68a292b96849d66c2b77741d07e129d2a8c5 SHA512 7bcaec8f52cafbe84d87dcb740a952520ceccb197b1491a88bb03d6a993a6385d424f67386a7175bb30c5c8b3ac02abf31c2e8843c1cd7d1d808eee70a5906f4
 DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
 EBUILD cdctl-0.15.ebuild 700 BLAKE2B 1d66bd0b7393aca38e99f76383a6be950a9e0d03178a9910b5c86a67f0da84156f602576899fe1961b8c87ba96b24229c0c2b55afbf3108d00568ab95992e98c SHA512 935931345e30e6eee205a0e75961b322ba1b167942d7b0f810500c1e02c57b4ac99472029c05064204041d06da6fecf1f712c7d913da13f7d06d5e7af795dad8
-EBUILD cdctl-0.16.ebuild 535 BLAKE2B fbe68f74be781214cfb4c5c507cfbea0685b46c333d4c6674a83571d8930fb5250151cd612c55c068d4dcf5e947317192f7da666c64228e6386e6688e92b23aa SHA512 d4044b97a1b319304916f57f2c8fe381073c381453cf207a189aa953bf74cdb4ac97fd5ae722fd07a1c11ceaaddaf29c13d83e78dbdf5d41301d74b2879123bf
+EBUILD cdctl-0.16.ebuild 530 BLAKE2B ee0dedaf6504dd0f959c8622cb273a2f80c8e185daab209dacbde8005633fe34a6aaf3240090245743715f0cd8d28c597628347d49453dc3bf6d6992fe74ea72 SHA512 6c2e2872232e4a3487c1a0dd48a9b1d6f35788e19271092cd28cf30e3ebc9307731e89da320526e835029e3fb8463c8d3cb57c8354367eb89e7b3f36ae02ae5e
 MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index 3dff479be49b..46c0ff87e552 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.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://sourceforge/cdctl/${P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 949b8f8df229..4510608ba05d 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -2,8 +2,6 @@ AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765
 AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
-DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
-EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
 EBUILD fhem-5.9.ebuild 2359 BLAKE2B 5cdbf07dc8cdfeb9ac223edc366210ea91ade46d0e959935a33c592b0cdcb2eaa33f35c3c9d534be4bc9d9cdeef951aa1e46365fce7b5882745f3e3b1eaca621 SHA512 676f0f4a8d878f61e4ec9c32b38d756c2c5a9b5902baabd0b1562e1232c8e2b0705d4ed819325b46940b6cd08aefc16089995626d09eb6b1e77c541458b58271
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.8.ebuild b/app-misc/fhem/fhem-5.8.ebuild
deleted file mode 100644
index 70fd300295f7..000000000000
--- a/app-misc/fhem/fhem-5.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A GPL'd perl server for house automation"
-HOMEPAGE="https://www.fhem.de/"
-SRC_URI="https://www.fhem.de/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="dev-perl/Crypt-CBC
-	dev-perl/Device-SerialPort
-	dev-perl/Digest-CRC
-	dev-perl/JSON"
-
-DEPEND="media-gfx/pngcrush"
-
-QA_PREBUILT="opt/fhem/contrib/lcd4linux/fritzbox_dpf/lcd4linux
-	opt/fhem/contrib/lcd4linux/rpi_dpf/lcd4linux"
-
-pkg_setup() {
-	enewgroup fhem
-	enewuser fhem -1 -1 /opt/fhem fhem
-}
-
-src_prepare() {
-	default
-
-	# Allow install path to be set by DESTDIR in Makefile
-	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
-
-	# Remove docs in Makefile, as they will be installed manually
-	sed -i -e 's/docs//g' Makefile || die
-	sed -i -e '/README_DEMO.txt/d' Makefile || die
-
-	# Remove manpage in Makefile, as it will be installed manually
-	sed -i -e '/fhem.pl.1/d' Makefile || die
-
-	# Remove log dir, as it will be replaced with a symlink
-	rm -r log || die
-
-	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
-	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
-	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
-
-	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local DOCS=(
-		"CHANGED"
-		"HISTORY"
-		"README.SVN"
-		"README_DEMO.txt"
-		"docs"/*.txt
-		"docs"/*.patch
-		"docs"/*.pdf
-		"docs/changelog"
-		"docs/copyright"
-		"docs/dotconfig"
-		"docs/fhem.odg.readme"
-		"docs/LIESMICH.update-thirdparty"
-		"docs"/README*
-		"docs/X10"
-	)
-
-	if use doc; then
-		local DOCS+=( "docs/X10" )
-		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
-	fi
-
-	diropts -o fhem -g fhem
-	keepdir "/var/lib/fhem"
-	keepdir "/var/log/fhem"
-
-	dosym ../../var/lib/fhem /opt/fhem/data
-	dosym ../../var/log/fhem /opt/fhem/log
-
-	default
-
-	newinitd "${FILESDIR}"/fhem.initd fhem
-
-	newman docs/fhem.man fhem.pl.1
-
-	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
-	doenvd "${T}"/99fhem
-
-	fowners fhem:fhem /opt/fhem/fhem.cfg
-}
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 9d09a61b2968..20eb74011974 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -10,5 +10,5 @@ AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
 EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
-EBUILD jail-2.0-r4.ebuild 2212 BLAKE2B cd01439177e25004b8d772e6ae0af33c645f76dbbd994b50bfbd9bb81920e5de9ed44262ac22547909b7bc19cdd352ebd7e11cbc3aaa2b045116a0493a98bfa4 SHA512 238a11d7df549581d56fa29d83aca319c2356ef8d4bf1b6a9cb2cbda4c45d2a4e0c3813095991f96185ff714787eb250a5952ec3d2b04c6f4eb1cd77a5159d76
+EBUILD jail-2.0-r4.ebuild 2211 BLAKE2B 8df423376baa65ac3b24de8bdf60a6e53dc5e38e0f67807a7d8c4f9741ed6ac38c53cfca497cc832a7ff660973ce5a621003ea5cf114d68ad17277d3709ff5bc SHA512 9c80666b71e28166bc01d423f68b4de2fbd17add5c4335f55287810e7a6ebfbe7f29d42b5841d9e5380f9a4b94b7f86731ed02d9a752ee5d96acde83b535f8fc
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index fc4cdee1bb55..d023f2811adf 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 874bbb73c15f..bb471e9ea3e4 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,5 +1,7 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
+DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
 EBUILD khard-0.11.4.ebuild 1056 BLAKE2B c76efd9de7fafd0627daad28594c11de71d65d2315dee87dc1dab7ae80d02fca7d82e8d11fe525c74b4caf45fbc1422e5ae3593fb28a3eec9e82ef25a956124d SHA512 02a4b8786589a7fedd7e922f3f217d0172bc01f434bfe34246d0f8d93e3e78e25d0e7ebfcfa2f556a6e720b868a39d1a8965413aa5356698824997aca581d2eb
 EBUILD khard-0.12.2.ebuild 1097 BLAKE2B 206ac7d0574a3b5c1b8ecd481fad937a9a36316b09ebfe3eb044806407e87a540a4c4bb0ae358bf31df48214e45ef6e9ba7868e67758aa2d1747b507adb87fc2 SHA512 82fa6c023edacdfe82998ae782dd48f83ab175d3f18c38db5bd77a49b166f9ef27e71e484dcf33fddfe0f518141b0a8b00678517614fba84972c0f30f3fdeb56
+EBUILD khard-0.13.0.ebuild 1163 BLAKE2B 2c1c3a5b360030fce4f35679f426d30dd6884ac4fb8710758ddc70de0219c102dac19a63b080d87bd470ce009939abf691332a66fe5c606adf92364c8330d192 SHA512 1b3beb6fc7b915e5ed2757204f90b88792da8e1bbf8044c16dcd04127aedd0132abbb2d9b77a170537dc711b392102367d154a2a333e5e8acb94addcff785e5f
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
new file mode 100644
index 000000000000..f4ffb0c291c1
--- /dev/null
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test zsh-completion"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+	)
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+src_install() {
+	distutils-r1_src_install
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/_khard
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
index b66cc4b68790..912bcc627763 100644
--- a/app-misc/mkcert/Manifest
+++ b/app-misc/mkcert/Manifest
@@ -1,5 +1,3 @@
-DIST mkcert-1.0.1.tar.gz 1695474 BLAKE2B eeef86a3e626f044c7b83d86be55082ce256752d834bf1388890db18f74678df57f2fc0050874dd4ff9ec4b849aa5b8d339e09e6af7e08a8f0b5236e0ac7aa09 SHA512 9e4ebadf19134fee7bf637fbb402df46a70d1f99ad06685a6a49da929fdd61b1ae9bea6b3f287201f488aec90505c60a58b454abb2efe584114d814023789600
 DIST mkcert-1.1.2.tar.gz 374244 BLAKE2B 3d9dd700e77ae6eae693bed51ae027fba409880f2c0f8fe1d5eb3c4af1e85f03784c0f6b55a384117c8ba8949ba0f061911998846f8c7ac3fddaa9e4dee567f5 SHA512 6015964915088914c0c208c47a41142b4b69e1e0c6e890422fe07c0dee2fb7c8a1ac04b9efba8a913de35ef3f46d3c8ee96941257eefbceb1c1885a67e1255da
-EBUILD mkcert-1.0.1.ebuild 638 BLAKE2B 63edba0e65ce29bcd23e26be4d4573208d1ed457966338d663587800c583b4f60daaf823fece40397781060e2c5fe6d08d0be907fe2eea5a7201b1af7364482f SHA512 ea148834a727dee96adf0c7b863ed220bd5b3559761c552b004e8db35ec5c72f3ae77ba9beee63b35e637e781cb1b8ac401ad8df6cec58e2f4b6b9879625844a
 EBUILD mkcert-1.1.2.ebuild 638 BLAKE2B 63edba0e65ce29bcd23e26be4d4573208d1ed457966338d663587800c583b4f60daaf823fece40397781060e2c5fe6d08d0be907fe2eea5a7201b1af7364482f SHA512 ea148834a727dee96adf0c7b863ed220bd5b3559761c552b004e8db35ec5c72f3ae77ba9beee63b35e637e781cb1b8ac401ad8df6cec58e2f4b6b9879625844a
 MISC metadata.xml 250 BLAKE2B b66a738607cc4fc7299cb2075c67ac40558a890c57e9c28539c4eeeebf1edf12288414babb7340a5464fe87ba325d7665a37ec2aadb81934a41f16b467db96aa SHA512 c2fa249b463e4116ba228c35128bdb3d4b8490678cc9e240074bcf4d3569b54edbb67cdb27da45535f2e23bfe4d35607fbc16887e97af285cfd2b1f994fe95ac
diff --git a/app-misc/mkcert/mkcert-1.0.1.ebuild b/app-misc/mkcert/mkcert-1.0.1.ebuild
deleted file mode 100644
index 0176c20c9259..000000000000
--- a/app-misc/mkcert/mkcert-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/FiloSottile/mkcert"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A zero-config tool to make locally trusted development certificates"
-HOMEPAGE="https://github.com/FiloSottile/mkcert"
-SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go install -v ${EGO_PN} || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/mkcert
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
index 8430cd1b04f4..a6b1435be4a3 100644
--- a/app-misc/openastro-data/Manifest
+++ b/app-misc/openastro-data/Manifest
@@ -1,7 +1,3 @@
-DIST openastro.org-data_1.6.orig.tar.gz 13603001 BLAKE2B 64a0850cc681c13eed672285edb5ebdf7b2adae6012f5525461312b6ede56c65d20b17c554220174c4e191bd326c8d201e5d6db49435e62b4a7a1d1e743ba3bc SHA512 99f3b6db61e27ccf04a7e0ff3ba7da45b889e1177bfbc1192af1929fca7255dc2b18a4ac9eb536af9ceb11e7722e0a3420102c7e45a6c839abe87734e8be6591
-DIST openastro.org-data_1.7.orig.tar.gz 15682188 BLAKE2B caa423b90fac8391bd30b6ed1f6b6065c91b5a1828defbbc753dc88ac23f3bfef8437b87d02dec4176fac419206ab5df4822e2353a36a0e92255d376e678ee54 SHA512 a67cc528253d0a9f70fdce550b8065c481e2dae8dc59dfed0428491cf4751648e41f0d6032b58008f2fe095f81fc4a23717156a69a73b03bd3105b50eb325ffe
 DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af
-EBUILD openastro-data-1.6.ebuild 536 BLAKE2B fcaac146a091782e7560d18c54eeb11af4c9bb5342061fb2a78e84b7ba0860a31341452b3d8281e3c76478e4d72fd1c30a9087af6dac1e014d547da57c6491cf SHA512 7c674f9ed47af5c4e92de0180d083c3c1ab6d2545a827dcc8665ac69306a6f1c3b6c23b69e325e0191a563bfc0372f15fe577e71a93440dfeba08a9ec030ab2a
-EBUILD openastro-data-1.7.ebuild 536 BLAKE2B 4e6529414ed28d9a3f3666c28ad3b159ada8c1bc19012a6f9277547e3805d34bbb51577d70ea17611b58bb5b7d51288d0a0bd0dd5787b040619490a7c747cb2d SHA512 573683c1b529dbf6032329c338a1c9be018f6a4f587d123233c316209d63868b376b673c2636c32198b9aa48f5472bf484c55ec36a33007b9618d5ab5e21c7a2
 EBUILD openastro-data-1.8.ebuild 557 BLAKE2B b5cadc16f1bd965ac09a81a5674cb1f9cdfd47bed73b3ae10529b70c3ad626a802bf2c90f71b10c77b6283289d000a532fad6d3ae38dfbc14d02544cef72595d SHA512 e6955a4f9486e4a56147ea74fd70f72d348ed03e964f84a1a2aca54b5012bb11b62fb19797302075d90f83c6539212f3146e4a0690dac3b2d1f4c1eade1bd088
 MISC metadata.xml 391 BLAKE2B de44378c992fb6a7cc3fd16c2cec319b49dafc0da73f06e41ed08e48a57b97906f2e488bc2dc74d8850800762c3c70de3281af436dadf67d8a60b30226c795c3 SHA512 33213a04e12838729bdce8d1db7a395d337dbf65f9b00bdb3fac1f7a0764efd615a879942f03d9bec6476026d1fbc81e69a096bcd3831adada5b289bbbff483e
diff --git a/app-misc/openastro-data/openastro-data-1.6.ebuild b/app-misc/openastro-data/openastro-data-1.6.ebuild
deleted file mode 100644
index 0609cf57e3a8..000000000000
--- a/app-misc/openastro-data/openastro-data-1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-data}
-MY_PN=${MY_PN}.org-data
-
-DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
-HOMEPAGE="http://openastro.org"
-SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro-data/openastro-data-1.7.ebuild b/app-misc/openastro-data/openastro-data-1.7.ebuild
deleted file mode 100644
index 50b4ce85ce56..000000000000
--- a/app-misc/openastro-data/openastro-data-1.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-data}
-MY_PN=${MY_PN}.org-data
-
-DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
-HOMEPAGE="http://openastro.org"
-SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/pfm/Manifest b/app-misc/pfm/Manifest
index eb3d450b937c..facfd720b322 100644
--- a/app-misc/pfm/Manifest
+++ b/app-misc/pfm/Manifest
@@ -1,3 +1,3 @@
 DIST pfm-2.12.3.tar.gz 2272053 BLAKE2B 257fb8b4682b884e1ee850668cc283cc1fc83d2cdc1366b5186fba6d71fa08b1f4c7d10123609c4bb8c79ab25f89c25994d749df098219efb9e9547e5e299d61 SHA512 d9feeaa95a0114ee513835a9273b62164a851ae8599d27575b3545f02144b4cf970a066afd5acec03092f0d49c85929c8127d1e134d1e80c15fe6d0a9b6921fc
-EBUILD pfm-2.12.3.ebuild 659 BLAKE2B 0ce8a828904fffdce8ee7b034a10c11836cfb6e4882be405eca8bfe6b64c3d2f743d6177f362d363f61a54d3fe3aad18e8bf3596105aba67fabe3d991852c80c SHA512 8b0795a28311a785384c449310225e4a80cc19b47fb20473378374564d5c16bec777f999901f65cff947a17a1be376322d1ae32c57cdba27440fe9199d2fbe60
+EBUILD pfm-2.12.3.ebuild 661 BLAKE2B 8db1ecfb700930261978f40decec52700c607e5ed284a73bae68123ed12b14cba6187295e0764d741a89bc0ec7c3a8931e76ee690623b6d68d143a0cefef5d00 SHA512 8b7748520ad387e9ff3b4e1f57c4d91aa5c44b1fbbfa9e9838037dae2f9b349ae00531de987f7450c51995156e4536ac4dbe405731b2fd8e8749dd405ad9f351
 MISC metadata.xml 326 BLAKE2B ddedcf63628c21363e6b9f5835d5f3646c5ee32267dfe53390b4d7b9b69e6d7e7452503aef493d6814824904005ae5345cceac36abb750a97595a71069fecbd0 SHA512 74b827fb7bba6a09cbd67c07f3349b0e724bbda26f7b27cec24488a75d2dffc11415468c9bdbd12139115d8d40af137af10e51209200e5874b9f988cb27d7ce1
diff --git a/app-misc/pfm/pfm-2.12.3.ebuild b/app-misc/pfm/pfm-2.12.3.ebuild
index 6932426c8f50..0d060d619cce 100644
--- a/app-misc/pfm/pfm-2.12.3.ebuild
+++ b/app-misc/pfm/pfm-2.12.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="mirror://sourceforge/p-f-m/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 s390 x86"
 
 RDEPEND=">=dev-lang/perl-5.8
 	>=dev-perl/File-Stat-Bits-1.10.0
diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 88ff6cbba328..685dd4786d12 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,5 +1,3 @@
-DIST physlock-0.5.tar.gz 13547 BLAKE2B f45a69476beff2c86787efc6b41c1dc330284a4c212927b45938d0bc531cef53ff01845277dc273bb826533c46b689667162f25936bfd35fe670b5f3c2642627 SHA512 0e22d2c1093556e2ca52da4ee36e53a7eebf9c2cf8e10592c95971aa3479c3ee1a31b9d71e52fca715a483f22740f6cf9a3c167fb61e4c6034a2ecf900fd5f9d
 DIST physlock-11.tar.gz 13791 BLAKE2B 73ba9ad238a4566156144a7107018689996691d1a24bab44e9575067efe072cfb6181b409a81ebcad03d42a48ea94fe32fc738f2d730cb1fd0137b2455a5a74b SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938
-EBUILD physlock-0.5.ebuild 471 BLAKE2B 70adcf4d2e320869458473b88dfdd8a858f2aa8007654c10817285386b0b1311725c20605b8d59d9345d86acdf2338eb426a59dd423b824c27c5551501719dcd SHA512 743491ca82a6f0495b22c2356f8f27846cd27689f4b2e67473de54aa7551a46c7c1865d7a6b2a0c59bbf329f9323700973089403aabdf049aa3d0f1242c07f54
 EBUILD physlock-11-r1.ebuild 553 BLAKE2B 93be1c05c828d028f2176e32fac1723cbd065e6cf25c19c49eb9509bf3794e7310beaaebf0555f9087d818a7e9386a0de8f9bebe715f4a3c9492322a2b2c7080 SHA512 64d965a8fa93986b39ad74e313c4963bcaa342b7ac758532760db10de1375d2886b5f98dd43d19e7912fa6d93b5de8dacfe93e49de913ddcb0fe9e8757b68215
 MISC metadata.xml 757 BLAKE2B 91000aca8e366f965b46d72494b23734db9d5866c41f2f364755b9bf1397ce673ae96a8c182ee732ca3b05fae863cb8caaf61478f708df33ad3fe21e246b4af4 SHA512 34f57b70b867095ad5ddffad1a5a943488699e98495e98631dde72a96fca5260947bcece476e4411d146d6a1f72ed602401455d49343a4fa79faae77b5483625
diff --git a/app-misc/physlock/physlock-0.5.ebuild b/app-misc/physlock/physlock-0.5.ebuild
deleted file mode 100644
index f306ba46c194..000000000000
--- a/app-misc/physlock/physlock-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="lightweight Linux console locking tool"
-HOMEPAGE="https://github.com/muennich/physlock"
-SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-}
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 80527baa4004..ebedf05e6e56 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,9 +1,5 @@
 DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
-DIST trash-cli-0.16.12.29.tar.gz 66826 BLAKE2B 0d8b56a1ac23272ea9c53b732e679ce4b92173e404afeb7611d781cebde32ff9895d751176ab038444fd5a98920ab725cca909c5920d9c28ab32408bf5fe2e84 SHA512 a8a94205233ac600a98324b95829d1f00debaca95c85c51fa12f7a65ae6f24fda58370d8fe0095bf33327cbddae7dfb02c2587efffd2d7c206c7f7cb0a59953e
-DIST trash-cli-0.17.1.14.tar.gz 69141 BLAKE2B 028274ea2753eb3ff4bfec5929dafcf090d05938154eb20ce02559e696310a647643275a64c2278c9dd8e71442c5e32dc77a87f095c14c2bbe5f98931e627604 SHA512 29033d6e780d81ca762cb69d571c1fa8608f7e84564600d1f7a92141acecf9d7c770e7ff6dcac8f98701af4c6aec3874634eba0af0e92fc2b98ce99c5550c14d
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
 EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
-EBUILD trash-cli-0.16.12.29.ebuild 494 BLAKE2B 106963754651c7a7f4a7de148cd7e915a689acb1b098cbd0f61837291ee8a358c6b9ac41a20660f8bde03a8b35828ae27bf551c54939c0e44c6cb4b36a96e469 SHA512 40718d5e6b630a88fa1f98cb4ed9ed5723307e7d9166e0997cd4a68b198f83dffecc0e1a64072c752aa5b9f11e4ad5873052759fde43a2ea709fbeaa425db401
-EBUILD trash-cli-0.17.1.14.ebuild 493 BLAKE2B d476b75c962c9d0ad6d4669d6e33e1cac49c9c0f07bf312056c95904680c8283dff32447b46124373cea281fe5a16705e7f9bdd6633078ff560e3eb4deece57b SHA512 3dadfbdf10c4754158f42f303c71ce8e0e8e42d2067d2f5c1fb6c091dda4a34a5c09fa5a7159541ff15c64050e5b2dd3619b95517ea271047bd70b732e983b00
 EBUILD trash-cli-0.17.1.14_p20170816.ebuild 690 BLAKE2B e1861defe15cc1c2b85bc9cdee959642ae6af982dd13cef06587aebc9143ee33b482495d5754d94d7709645d4b9a095f598e2fe7119a4106bae461dd80cbb1e9 SHA512 a609fe817df9fbdde828a4919850c13abc324a9843246b74c15c7b5ce5ad0eebed69c0e5d680e55f665aae2af26826efda9b0ab670042038d11c1f19af6bfadc
 MISC metadata.xml 864 BLAKE2B 9c5096cdaea96ebdb3d23bbb1f44b9f706cef9b58ca6f4107bb2d1c4f11937753df808cf188625ad4ea42293492c0991693d36f9bcb2e2d9f3753de9bdcf463a SHA512 aadcc31272a1c57fbff503ffe14b595ba75096335b64ca9f460fd8c309b32ea283f602a5b89581473a1040dc099bd283e89deabf1ed5cccdfcc36daf5b7e04a2
diff --git a/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild b/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild
deleted file mode 100644
index ef6a13324634..000000000000
--- a/app-misc/trash-cli/trash-cli-0.16.12.29.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-SRC_URI="https://github.com/andreafrancia/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild
deleted file mode 100644
index faa9656ed80c..000000000000
--- a/app-misc/trash-cli/trash-cli-0.17.1.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/vzstats/Manifest b/app-misc/vzstats/Manifest
index 294dfe3f7fc4..99ca8506ac56 100644
--- a/app-misc/vzstats/Manifest
+++ b/app-misc/vzstats/Manifest
@@ -1,7 +1,3 @@
-DIST vzstats-0.3.2.tar.bz2 11560 BLAKE2B 88945e19719fdb1d20a5ebcb18bb1b597eae9f8ab22dfa20c28d38a572ba287fbf9ba295bc892611a63a9a02e4b08531ad764ee732ed324ba0001365337dad55 SHA512 43d7a16ff2f051c94faa00e99d6d77d34707026319c34b61e2354fb2916e06af43b73c4476d1ee98c195b43e6e8bc540d0cb09d4345286682c830cea87abff59
-DIST vzstats-0.4.tar.bz2 12187 BLAKE2B b21fa70135438cd3b33c80aeca3777226f8d6d5724cb2a8f948905aa43fe4ed8e6ed30a72bc81801a1f64209f13c1afbca45ae0e6f1193c49c1e31b1e4671e52 SHA512 6d9885ce7f5dac3d50afc5583da8f84524ba6600c1587b8df75c12c9f09a273e91482cdd52cef41773c76c8b0d1a8b957ac9f0ecb9125a81e8021e332ab237f7
 DIST vzstats-0.5.1.tar.bz2 17548 BLAKE2B 91e431ef2fae5f63fe544b9ffe87e0bcc4d53be3e38eb5e261ba4ef00ce56a7a6118ef213837f48050e2d291fb9ae8576e2aa24c1df0425ba758866f00b64d84 SHA512 ea58ba065fda6f1e1bebcdd273e231d1da46934d0c5217e1acc0a3ecb2ce5738975d3155939c6f74ba407796ae94af4ba405efdb0c808e9bbbbded48285a6663
-EBUILD vzstats-0.3.2.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
-EBUILD vzstats-0.4.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
 EBUILD vzstats-0.5.1.ebuild 605 BLAKE2B 9e1d84e4b3e4e6911a4216528a306af1e6f89e69fe38c0134548c4639d3dad21c944ad1d08587370392e4522ca710456b806279fb472c4f0c3bdf647c0eb3212 SHA512 e15f8b5d0d9d2f051e3bec3bbd80aaf68b5cc958e3a4558a35c7f5d0499f82a677cdbe755b730c8084d55be4d55cb8512bce4d82923a24bb16e2447bbe10c18c
 MISC metadata.xml 767 BLAKE2B 4fc236d574509666fc9e2a364c9e675b3ce8f4d9ab7212489961aec8eeaf6c3736d26d18b8d307276d7dab7ab7fd2ae71908763a06f847a5cde6fc47a7a07f5c SHA512 e186ed96257d933a92e02fbef6efd3d584015aaecb6efa07c3f37f4d684a270d8f395b2df0445b4b847013c254018da2252169b74f2ee2f0d5989579112343b7
diff --git a/app-misc/vzstats/vzstats-0.3.2.ebuild b/app-misc/vzstats/vzstats-0.3.2.ebuild
deleted file mode 100644
index b4f566ccc487..000000000000
--- a/app-misc/vzstats/vzstats-0.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="OpenVZ stats collection daemon"
-HOMEPAGE="http://stats.openvz.org"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/cron
-	sys-process/cronbase
-	net-misc/curl[ssl]
-	app-portage/gentoolkit
-	sys-cluster/vzctl
-	"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake install install-cronjob DESTDIR="${D}"
-	dodoc README
-	newbashcomp bash_completion.sh vzstats
-}
diff --git a/app-misc/vzstats/vzstats-0.4.ebuild b/app-misc/vzstats/vzstats-0.4.ebuild
deleted file mode 100644
index b4f566ccc487..000000000000
--- a/app-misc/vzstats/vzstats-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="OpenVZ stats collection daemon"
-HOMEPAGE="http://stats.openvz.org"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/cron
-	sys-process/cronbase
-	net-misc/curl[ssl]
-	app-portage/gentoolkit
-	sys-cluster/vzctl
-	"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake install install-cronjob DESTDIR="${D}"
-	dodoc README
-	newbashcomp bash_completion.sh vzstats
-}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 3912e72274cd..3114decab444 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest
index 6a669cc92634..4044b1b1d0a4 100644
--- a/app-mobilephone/wammu/Manifest
+++ b/app-mobilephone/wammu/Manifest
@@ -1,5 +1,3 @@
-DIST wammu-0.43.tar.xz 563832 BLAKE2B 26b075d16d6b26608022eac58260083b7883a3c0b0fe8b73984c625f3ecb2a6ce972cb73bc8e5ebe280726447b6fa188716206f7540a9de42013c221a05589dd SHA512 c8f0aad8d8fc2c852638a77b45d48ba3c512a1e1cf8f8dc54b99a614f7338f366494ef88d786143defd77e55ab9597d9c705569c4e0fceb856f29a05b9c6a843
 DIST wammu-0.44.tar.xz 582284 BLAKE2B ba0523d4778c0fcebc8c86354d503880ea4a34f8ba05e9c4c8ef9b206366ad11c16f85dba2ce19977587aba0bc791adade4d35422a1727b1e042d5be29f39b54 SHA512 9b1a8c9fad2abc618d3e778338446b154516fff9e176aff02ed8daa64ff6e69a591324368dacd50f40c832d16d197447c575644520102317d95c573ed8d6bc7e
-EBUILD wammu-0.43.ebuild 1284 BLAKE2B e22bf2a9425e6dbe1b600cf54c46c9068589d26528f05be0493fd9e41e781899daef8f9e65770d7665c8665e9aa7e33ce1190d13acc48e098a02ceca38e85651 SHA512 f8075664077424838531afc315bccbc256f5de02a7dcd1e2bbb0d5c02dcb986d32ad62ebdf0cb2fd482ad6f7f6fb0126984579ffbb11c54e2c1f3b979f4fed79
 EBUILD wammu-0.44.ebuild 807 BLAKE2B 30eb9847b8ba9417d818b6914a66b278918b5f40cad0c64d089ca992738a43aa8dae1867abdd0c968e722cd9bd7d98af436e0f64327c8bd68142feefa66489ba SHA512 2dfb76c503ed27e92b1b35d1e944435061738e1e1c2d207e7d1b926004e4e33d182cc4d7e2efb8599afd94d308e75a0486b407c9c8093c822bcc93c438b51450
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/wammu/wammu-0.43.ebuild b/app-mobilephone/wammu/wammu-0.43.ebuild
deleted file mode 100644
index dd959761aaee..000000000000
--- a/app-mobilephone/wammu/wammu-0.43.ebuild
+++ /dev/null
@@ -1,54 +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
-
-DESCRIPTION="Front-end for gammu to access mobile phones easily"
-HOMEPAGE="http://www.wammu.eu/"
-SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth gnome"
-
-RDEPEND="
-	>=app-mobilephone/gammu-1.36
-	dev-python/python-gammu
-	>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]
-	bluetooth? (
-		dev-python/pybluez[${PYTHON_USEDEP}]
-		gnome? ( net-wireless/gnome-bluetooth )
-	)
-"
-DEPEND="${RDEPEND}"
-
-# Supported languages and translated documentation
-MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr uk zh_CN zh_TW"
-
-# Required to source locale content out of the box
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	local lang
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if ! has ${lang} ${LINGUAS-${lang}} ; then
-			rm -r locale/${lang} || die
-		fi
-	done
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# SKIPWXCHECK: else 'import wx' results in
-	# Xlib: connection to ":0.0" refused by server
-	SKIPWXCHECK=yes distutils-r1_src_compile
-}
-
-src_install() {
-	SKIPWXCHECK=yes distutils-r1_src_install
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 06639b8f62bd..6b6efc4e7fe8 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/QtBitcoinTrader/Manifest b/app-office/QtBitcoinTrader/Manifest
deleted file mode 100644
index 4357cc84f8ac..000000000000
--- a/app-office/QtBitcoinTrader/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST QtBitcoinTrader-1.10.01.tar.gz 1319323 BLAKE2B 8d3a17600607d44ee2112a65c321ecb864dfea89bf13f3dbd3a98819e7fa55c9e36a0ec3e7a09ab39746cc53034870becae336ada5e0c002bd0e43f8bdc4b752 SHA512 a9f2aa86225d24d4492c3d375a00490ec72405391396669aea21cba7fa2e4afb088e35743ecf15045ba12c7294d972ecced59e19b46c83a9c4930604c530d999
-EBUILD QtBitcoinTrader-1.10.01.ebuild 1095 BLAKE2B a3f4ee4c024f24632c07e682b52dc872fad0c7311dd48d2ded2fa6927638609c4d42014db98377833dbbf2d833c66e466a68ebe0f4a8cd4d63fae284278b2ed6 SHA512 ef8b1339e015fff795bddc2db01ca2f717c1460032b8f11c39149201dc0e5be00f87c9290b932e19704934d91ef3b4ffa706fada68c05eabad389e56ae2e4d35
-EBUILD QtBitcoinTrader-9999.ebuild 1095 BLAKE2B a3f4ee4c024f24632c07e682b52dc872fad0c7311dd48d2ded2fa6927638609c4d42014db98377833dbbf2d833c66e466a68ebe0f4a8cd4d63fae284278b2ed6 SHA512 ef8b1339e015fff795bddc2db01ca2f717c1460032b8f11c39149201dc0e5be00f87c9290b932e19704934d91ef3b4ffa706fada68c05eabad389e56ae2e4d35
-MISC metadata.xml 348 BLAKE2B 2e848b660b01cecccffae3866aa70896488a0cbe908319fa9406f71c90b15c4219b3c551404c6a4790a66db992cfcaacb95b735e13813209be3ce644d4ddfd0d SHA512 ca2107e298aeb0a5f53349f882574df01ede3e91d3aec7048bde5b317d26a652b422b1a86f391897da2c11206f209a8eb56d42252ccdddfb91d4b8c9a7394aca
diff --git a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.10.01.ebuild b/app-office/QtBitcoinTrader/QtBitcoinTrader-1.10.01.ebuild
deleted file mode 100644
index 1737d26d1010..000000000000
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.10.01.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	eclass=git-r3
-	EGIT_REPO_URI="https://github.com/JulyIGHOR/QtBitcoinTrader.git"
-	EGIT_BRANCH="testing"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	eclass=vcs-snapshot
-	SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit base fdo-mime qmake-utils ${eclass}
-
-DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
-HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtmultimedia:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5 \
-			src/${PN}_Desktop.pro \
-			PREFIX="${EPREFIX}/usr" \
-			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-			ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild b/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild
deleted file mode 100644
index 1737d26d1010..000000000000
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	eclass=git-r3
-	EGIT_REPO_URI="https://github.com/JulyIGHOR/QtBitcoinTrader.git"
-	EGIT_BRANCH="testing"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	eclass=vcs-snapshot
-	SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit base fdo-mime qmake-utils ${eclass}
-
-DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
-HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/openssl:0
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtmultimedia:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5 \
-			src/${PN}_Desktop.pro \
-			PREFIX="${EPREFIX}/usr" \
-			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-			ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-office/QtBitcoinTrader/metadata.xml b/app-office/QtBitcoinTrader/metadata.xml
deleted file mode 100644
index 1067cc360f3d..000000000000
--- a/app-office/QtBitcoinTrader/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>alexxy@gentoo.org</email>
-    <name>Alexey Shvetsov</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">JulyIGHOR/QtBitcoinTrader</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 7a2ca80a64d9..bbfe75861a2b 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,3 +1,5 @@
 DIST kmymoney-5.0.2.tar.xz 11682108 BLAKE2B 310ec19938950f05654555be1c1f0091233e1c3e497c9481ff0a199ad8f34efe517fb5f2c54cf6e521b03bddf9aec89976e346f1dba72b1f245c4d8af349864a SHA512 a2d6e28a68a7d8bf05e4a0c88b398ff8d9b644384d7113e6abeea4572df8b054a31edaaddd6cad7dc5aaddef492c0477df3a92a4e2d4efdfba7722f54453ca47
+DIST kmymoney-5.0.3.tar.xz 11690060 BLAKE2B beb836c4753caa81ee3a06f12fce65fd584fbeaa228cba087b77284e0f3ecce8b88b030466198db62fdf23af26cee5caad59eb845653006d700cf68a0793231f SHA512 9f8aaa26a3cb3f5eb2a61936ecc54f97096f98d4f0ffbfbfb6adbe099a559f797d997b1d23bb7f18d31d76182f8fa8601a70176a4bc16f5cdf2fac0af8903fc0
 EBUILD kmymoney-5.0.2.ebuild 3201 BLAKE2B 74a73a9eb9d32afd999deedad63db47a24249b68111779477a6bba27cbd5641305be3faf440f21e17e202eec3f97f71c2e636dfb2a1b35c0362ec87f96151b4a SHA512 6ce1a81bc99cd11d4359eb0fb3381469b8397e2e117e50896deda4e80a3087a0097299de7397449fd2e438313094707595de2d60b150f1fb1760672666ebd953
+EBUILD kmymoney-5.0.3.ebuild 3176 BLAKE2B 96b01177f755cdfc9c16b32737877ba30c4fa105706a894e0708d35cbb8ba559c6d0ebb341b1703b31bc29af928cb5227a6fe373184613f6403f9b790e421ad0 SHA512 1e46628fcf7199cd000fd12992e68eae7d12edf2d15965f23dabb38bb50ae5cb49f05460241c3ec6358d8f00e574c3dc9c1475fb6f214cdd433f653434bd25e2
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.3.ebuild b/app-office/kmymoney/kmymoney-5.0.3.ebuild
new file mode 100644
index 000000000000..f50f2d2da312
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.0"
+PYTHON_COMPAT=( python2_7 )
+
+KDE_GCC_MINIMAL="6.4"
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde5 python-single-r1
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kiconthemes)
+	$(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 kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=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? ( $(add_frameworks_dep kactivities) )
+	addressbook? (
+		$(add_kdeapps_dep akonadi)
+		$(add_kdeapps_dep kcontacts)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-5.6.5
+		>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
+	)
+	holidays? ( $(add_frameworks_dep kholidays) )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		$(add_frameworks_dep kdewebkit)
+		$(add_qt_dep qtwebkit)
+	)
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	weboob? (
+		${PYTHON_DEPS}
+		$(add_qt_dep qtconcurrent)
+		www-client/weboob[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/kmymoney:4
+	quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+	use weboob && python_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package addressbook KF5Akonadi)
+		$(cmake-utils_use_find_package addressbook KF5Contacts)
+		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_KBANKING=$(usex hbci)
+		-DENABLE_LIBICAL=$(usex calendar)
+		$(cmake-utils_use_find_package holidays KF5Holidays)
+		-DENABLE_OFXIMPORTER=$(usex ofx)
+		-DENABLE_WEBENGINE=$(usex !webkit)
+		-DENABLE_WEBOOB=$(usex weboob)
+		$(cmake-utils_use_find_package weboob PythonLibs)
+	)
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 652636
+	local myctestargs=(
+		-E "(reports-chart-test)"
+	)
+
+	kde5_src_test
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 604fb8a24a20..b4a7f2630eb4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,21 +1,23 @@
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
+AUX libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch 4093 BLAKE2B c6f74ef29c055e22f7f58e4962c3036a39ca4cd731abf382576c6ad1954b8d8dd8c5fa90147931ef0bc4bd094c70143726e4a046c57e9a5062875c1ff248caa6 SHA512 df571472de299a3c184348ce48caef937604b9981101b986d8473b7bdfa0ca0244395ab8079cc97dcef23aea9864aff93523582a459c55457fdd4dbba4e4e985
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 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.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
-DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
+DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
+DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
 DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
-DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3
+DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
 EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8
-EBUILD libreoffice-6.1.5.1.ebuild 16816 BLAKE2B c0d07cc04f85e29740015abc7d190095c417dd576e1db06c0c60481c629c84969a1d6c99c5c960fd630ca4601b402de144caf92ec43c6ca37321b006929f7e93 SHA512 b29570517404db7639cb7cc6d4d9d1ce5ba4454b5e169e388b0020d8a9a4c468459d0a1bf04fe7137013aa2e3bbb4d44f1b6f5e4de3991c10ab0110c4ee6b686
-EBUILD libreoffice-6.2.0.3.ebuild 16812 BLAKE2B a06a0a234cc2dfe2c7e24d7f1878f60889f0e8c27d227c5be543a74b9561e42c01944e89f21ded876881d4c77cd8869645a0f7d240802f91fcd91699a12794f9 SHA512 b67e8b9138e6954cdbad9ee9b44b4d85bd3814e13da303ad0d01cf19c25de3d44efae5e2349fe9792733cbbe94b4a9e3eb42e5a2e7fcfc6d7511db4ee0b19a25
-EBUILD libreoffice-6.2.9999.ebuild 16956 BLAKE2B 094ffcc63b1b6bb7d28945bf93ff1ea20aa604235792f659e062064d282f89bcf7d222f482025f81bfd839dafa76d67a0da68cf8864c8c2d3e460ff8c03ca2d2 SHA512 584a65d9473973dbd99fc0af546c3ed056c839b6102368a899cc75e5d6bd32a18d0c2ae74bce0e93370e6aa824fcefc030af580155f753e4553bd9e7610d662c
+EBUILD libreoffice-6.1.5.2.ebuild 16904 BLAKE2B 89933e6355496aba9ffe54df07fab5abdda9e1cadfc4e87abae1019491a682067d809b96eb1b80af0884c5594d58f6b5b3638f76e0e77a44d6760d76031b86c4 SHA512 9806016a449ff7c68f6f996c4689bf402253881d531e47817b1f871546e9ada07a7e4594738f9fd5d94264da164047161e577809c1b062e9af2ccee25980a855
+EBUILD libreoffice-6.2.0.3.ebuild 17063 BLAKE2B 12a93d45b161e4850510d1e38dbc33db6c8585f3bf7de96c8a49ec9841cd879f4594e130cb1d95117681b6052ed039d74e12a5ec2290a2b26e2b597b7cf407cc SHA512 ffe11ba7450d381d530d79d750a21aab3c83e794894fe5fa788b565f9bb07af55cfa93fd48657ac6ef69f9c183ce064e9d905e33a9a514855e2bc6b6346f6cf0
+EBUILD libreoffice-6.2.9999.ebuild 17685 BLAKE2B 11c30e87391082a9176f76aafd0c690daec9c1285c41224f1f54771a5d8451982a549b92ee0934ec8c9a61f370ffecff08199bf8337ef5b7ccdcc303f50652b1 SHA512 7d5d83ef2e7492814f7252f8c53ce1a4b42c554a7f5610eec59edaed7448790c3367e2c3075ebee7ded9693bdb63bd7ec513bb94b94a85e1ee3b9ba22b218237
 EBUILD libreoffice-9999.ebuild 16956 BLAKE2B 094ffcc63b1b6bb7d28945bf93ff1ea20aa604235792f659e062064d282f89bcf7d222f482025f81bfd839dafa76d67a0da68cf8864c8c2d3e460ff8c03ca2d2 SHA512 584a65d9473973dbd99fc0af546c3ed056c839b6102368a899cc75e5d6bd32a18d0c2ae74bce0e93370e6aa824fcefc030af580155f753e4553bd9e7610d662c
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch
new file mode 100644
index 000000000000..30253e0b973f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch
@@ -0,0 +1,105 @@
+From bf93bae6990b01ee726b59b0969b93585719671a Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Wed, 30 Jan 2019 10:11:35 +0100
+Subject: tdf#122752 gtk3_kde5: Use non-native fpicker for non-Plasma desktops
+
+Adding the custom widgets to the native dialog currently depends
+on the native dialog using a KFileWidget, which is just the case for
+the native QFileDialog implementation on Plasma/KDE5.
+
+In order not to lose custom controls for non-Plasma desktops,
+fall back to using the non-native QFileDialog there and adding
+the custom controls to its layout.
+This was mostly taken over from Qt5FileDialog.
+(This is a similar approach as that taken for the kde5 VCL plugin
+in https://gerrit.libreoffice.org/#/c/67106/ ).
+
+Adding the controls to the layout returned by 'QFileDialog::layout()'
+cannot be used for the native dialog as well, since a nullptr is
+returned in this case.
+
+From QFileDialog doc:
+
+> By default, a platform-native file dialog will be used if the platform
+> has one. In that case, the widgets which would otherwise be used to
+> construct the dialog will not be instantiated, so related accessors such
+> as layout() and itemDelegate() will return null. You can set the
+> DontUseNativeDialog option to ensure that the widget-based
+> implementation will be used instead of the native dialog.
+
+Change-Id: I75fbe7731da28d0dc7df878f4c57e141d4d89902
+Reviewed-on: https://gerrit.libreoffice.org/67111
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+Tested-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 26 +++++++++++++++++++++++++-
+ vcl/unx/gtk3_kde5/kde5_filepicker.hxx |  2 ++
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+index 42e278a..33f64ad0 100644
+--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
++++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+@@ -17,6 +17,8 @@
+  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+  */
+ 
++#include <vcl/svapp.hxx>
++
+ #include "kde5_filepicker.hxx"
+ 
+ #include <KWindowSystem>
+@@ -57,7 +59,7 @@ KDE5FilePicker::KDE5FilePicker(QObject* parent)
+     connect(_dialog, &QFileDialog::filterSelected, this, &KDE5FilePicker::filterChanged);
+     connect(_dialog, &QFileDialog::fileSelected, this, &KDE5FilePicker::selectionChanged);
+ 
+-    qApp->installEventFilter(this);
++    setupCustomWidgets();
+ }
+ 
+ void KDE5FilePicker::enableFolderMode()
+@@ -232,6 +234,28 @@ void KDE5FilePicker::initialize(bool saveDialog)
+ 
+ void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; }
+ 
++void KDE5FilePicker::setupCustomWidgets()
++{
++    // When using the platform-native Plasma/KDE5 file picker, we currently rely on KFileWidget
++    // being present to add the custom controls visible (s. 'eventFilter' method).
++    // Since this doesn't work for other desktop environments, use a non-native
++    // dialog there in order not to lose the custom controls and insert the custom
++    // widget in the layout returned by QFileDialog::layout()
++    // (which returns nullptr for native file dialogs)
++    if (Application::GetDesktopEnvironment() == "KDE5")
++    {
++        qApp->installEventFilter(this);
++    }
++    else
++    {
++        _dialog->setOption(QFileDialog::DontUseNativeDialog);
++        QGridLayout* pLayout = static_cast<QGridLayout*>(_dialog->layout());
++        assert(pLayout);
++        const int row = pLayout->rowCount();
++        pLayout->addWidget(_extraControls, row, 1);
++    }
++}
++
+ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
+ {
+     if (e->type() == QEvent::Show && o->isWidgetType())
+diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
+index d999f7b..c979a5d 100644
+--- a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
++++ b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
+@@ -98,6 +98,8 @@ public:
+ 
+ private:
+     Q_DISABLE_COPY(KDE5FilePicker)
++    // adds the custom controls to the dialog
++    void setupCustomWidgets();
+ 
+ protected:
+     bool eventFilter(QObject* watched, QEvent* event) override;
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.1.5.1.ebuild b/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
deleted file mode 100644
index 482cddcd51e0..000000000000
--- a/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
+++ /dev/null
@@ -1,572 +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_{4,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 eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-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 mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	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=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-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.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
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!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
-
-# 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/intltool
-	=dev-util/mdds-1.3*:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-
-PATCHES=(
-	# "${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
-	xdg_environment_reset
-
-	[[ ${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() {
-	default
-
-	# 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-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-qt5
-		--disable-report-builder
-		--with-alloc=system
-		--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
-		--without-help
-		--with-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 gtk3-kde5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(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 mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	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 )
-
-	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
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	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
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
new file mode 100644
index 000000000000..e59e17836c29
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
@@ -0,0 +1,575 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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 eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+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 mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	kde? ( gtk )
+	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=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+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.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
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!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
+
+# 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/intltool
+	=dev-util/mdds-1.3*:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+
+PATCHES=(
+	# "${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"
+
+	# master branch
+	"${FILESDIR}/${P}-gtk3_kde5-non-native-fpicker-for-non-plasma.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
+	xdg_environment_reset
+
+	[[ ${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() {
+	default
+
+	# 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-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-qt5
+		--disable-report-builder
+		--with-alloc=system
+		--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
+		--without-help
+		--with-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 gtk3-kde5)
+		$(use_enable mysql ext-mariadb-connector)
+		$(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 mysql system-mysql-cppconn)
+		$(use_with odk doxygen)
+	)
+
+	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 )
+
+	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
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	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
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
index 1855739d749b..a09fbca2670b 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -63,7 +63,7 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -103,7 +103,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/mythes
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
-	dev-db/mysql-connector-c
 	dev-db/unixODBC
 	dev-lang/perl
 	dev-libs/boost:=[nls]
@@ -189,6 +188,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	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] )
 "
@@ -246,12 +247,15 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+	"${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"
+
+	# master branch
+	"${FILESDIR}/${PN}-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -402,6 +406,7 @@ src_configure() {
 		--enable-randr
 		--enable-release-build
 		--disable-breakpad
+		--disable-bundle-mariadb
 		--disable-ccache
 		--disable-dependency-tracking
 		--disable-epm
@@ -491,6 +496,7 @@ src_configure() {
 
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 6536b71f5351..0c48e2a46a63 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -246,7 +246,16 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+	# master branch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/009-kde5-allow-multiple-mimetypes-clipboard.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/010-kde5-fix-selection-clipboard.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/012-qt5-initialize-glyphcache-for-psp-graphics.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/014-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/015-kde5-no-images-to-clipboard.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}/020-qt5-filemanager-drag-and-drop.patch
 
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index a606da444b03..f6c6b012e59f 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,4 +1,6 @@
-DIST moneydance-2017.8-amd64.tar.gz 132109962 BLAKE2B 4984b6266eed96337ab284168db1a167121daa6b454a338f348d1d724587e6dfd6a52c25ff739ca0e09a9c0441b1b582e59a571f001e8b2ddc6c5e10917100cd SHA512 53e46ee63ee89b86f3108045e9a16fdda637effb5edb719ccf7192632e6ebace607f40871ee54b5c5bde40821fdf2cbf89a5abd6eba0698618a8db8d848971c6
-DIST moneydance-2017.8-x86.tar.gz 134851425 BLAKE2B 4c40f30798b66d01b5abacc5cfbfa584a107f351de8bd2eb8c291aea6d96c122a36feb5ed092ea0aec4a99be7e1507f79551a1c6a1cd79365b8dfc52892a57bc SHA512 434fbd0c941a455c862963e572b7c1489fa19ccf30efb315af33eac3974acdad57292943d129433e6a59d3f233cd797b6697c0e82d9293ce0464d25ab8c32912
-EBUILD moneydance-2017.8.ebuild 1414 BLAKE2B 1512bcddeb14697fc637eae397c8391b5b6694c7a2f0244e921e10cb969cdc78c1c5d355973b3d1cac22db3ac5874550c8ddb41fb30ff64bb76e02463e49816e SHA512 3a3091dfc72decc00faaedeaaabd46c077b0247ff3cbefde057dc99330800660a0911e5dea48a5b50ce2443913e5bd74e4d1d75145a984c5bc819e33f7d55241
+DIST moneydance-2017.10-amd64.tar.gz 132116528 BLAKE2B f5ba44a89944657c6c1380226dc512729825b084783e6d70dd7b2b731411294c7333bae858b2be3d5321e5145230257b325dc2b72a22744a877673c1c934d854 SHA512 175ff470b5fb5c3851eae708cc641777d7bdf1ede40366ccf5a135d6c813c08d9ce32665a2307c3aefa63eeb2206ad0874cb989aa998415abb86184a2b114ce8
+DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9ed652036cf1f633c2cab57f19d1dbb18a2542361fc2bafab8852c11b941a24532f662351ea2d05bc928818db24a4cf3cae7112 SHA512 18d9d4ce7b0b65566ac81fea66ba34d66173559ca90ac166cc9b90631400845ae1c9d92ae781a618cacc57cd4f630f079736101d29b66d9c6cee7d32c7c15c22
+DIST moneydance-2019.0-amd64.tar.gz 132467602 BLAKE2B d58df88166f73c80b755863bd9ea18fdadf192ac9f0016313ab59c209c895ef8c1203d0b7627004521a9569343c3269bc1854e4e7925ec6e438148059d8adaf3 SHA512 2ee22626b0b3918c3ebd80f7ca4ce9c1ad39716fb837887ca84a970f2f3d64d7daff36eff31eaa22753e55e0dcfc49ccb2f10e5c8dfbf21e67e8627b17d9de59
+EBUILD moneydance-2017.10.ebuild 1505 BLAKE2B 0c35144b542cc5f2b0334f4c2f9db317c3a22b1e5d6c9b82ff733d326a1e0a32843e9d97eef1bb09e8b80df2671e4f3ea418bad54f76fc555023fd6d88f7e4ae SHA512 446046b28526d8f00135499857904b2c2925a7233ba36c53f3c2cf784c13198a2f0e996c7b5ad6232bc9f2864670d79a5923e3bf5ef6c68788b3a93e854e113b
+EBUILD moneydance-2019.0.ebuild 1273 BLAKE2B 25d322421500a3e42f3b7a6243ee669c7b84c566562e35b4f5f6253b8bd647d8a7a58bf2f587678c37e9cf50eb2105e3ad3a6583934e531273551bc2a3ab3aa3 SHA512 4524749b35d7d77e7abc4c266bf78370ab0d2725daedbfbbda34c0426fec7befce8472c7d1b1a11d58835833c8a3e832ed1aa693838e1da0942a17328032d370
 MISC metadata.xml 601 BLAKE2B da75b9789bf828531d9a23f3143bf6977af23efdefd4c2d9cf1488c7d3a66a304f202b1cd496fc807cdf52d271f7a50bf3090e1d7d60d427656ab2bdec4f9ce1 SHA512 a77ece9db983b7955d26e760f6d1951cafaafac57c217cd916070a3d477daaea93338a26ff523d87e4ca4227e1ce02d122f5939069caf8c7bbbb3d0fda9d8e6d
diff --git a/app-office/moneydance/moneydance-2017.10.ebuild b/app-office/moneydance/moneydance-2017.10.ebuild
new file mode 100644
index 000000000000..bce4b6c2cfa0
--- /dev/null
+++ b/app-office/moneydance/moneydance-2017.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eapi7-ver gnome2-utils java-pkg-2
+
+MY_PN="Moneydance"
+MY_PV="$(ver_cut 1)"
+
+DESCRIPTION="A cross-platform personal finance application"
+HOMEPAGE="https://moneydance.com/"
+SRC_URI="
+	amd64? ( https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz )
+	x86? ( https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_x86.tar.gz -> ${P}-x86.tar.gz )
+"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_PN}"
+
+RESTRICT="bindist fetch mirror"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_$(usex amd64 amd64 x86).tar.gz -> ${P}-$(usex amd64 amd64 x86).tar.gz"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_prepare() {
+	default
+
+	# Modify .desktop file, to fix QA errors
+	sed -e 's/Application;//g' -e 's/.png//g' -i resources/moneydance.desktop || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_dojar jars/*.jar
+	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
+
+	doicon resources/*.png
+	domenu resources/moneydance.desktop
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-office/moneydance/moneydance-2017.8.ebuild b/app-office/moneydance/moneydance-2017.8.ebuild
deleted file mode 100644
index 801d4007af9c..000000000000
--- a/app-office/moneydance/moneydance-2017.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Moneydance"
-
-inherit desktop gnome2-utils java-pkg-2
-
-DESCRIPTION="A cross-platform personal finance application"
-HOMEPAGE="https://moneydance.com/"
-SRC_URI="
-	amd64? ( https://infinitekind.com/stabledl/current/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz )
-	x86? ( https://infinitekind.com/stabledl/current/${MY_PN}_linux_x86.tar.gz -> ${P}-x86.tar.gz )
-"
-
-LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/${MY_PN}"
-
-RESTRICT="bindist fetch mirror"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.infinitekind.com/download-moneydance-personal-finance-software"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	# Modify .desktop file, to fix QA errors
-	sed -e 's/Application;//g' -e 's/.png//g' -i resources/moneydance.desktop || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	java-pkg_dojar jars/*.jar
-	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
-
-	doicon resources/*.png
-	domenu resources/moneydance.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-office/moneydance/moneydance-2019.0.ebuild b/app-office/moneydance/moneydance-2019.0.ebuild
new file mode 100644
index 000000000000..e205b32533bf
--- /dev/null
+++ b/app-office/moneydance/moneydance-2019.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eapi7-ver gnome2-utils java-pkg-2
+
+MY_PN="Moneydance"
+MY_PV="$(ver_cut 1)"
+
+DESCRIPTION="A cross-platform personal finance application"
+HOMEPAGE="https://moneydance.com/"
+SRC_URI="https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="|| (
+		>=dev-java/openjdk-bin-11.0
+		>=dev-java/openjdk-11.0
+		>=dev-java/oracle-jdk-bin-11.0
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+RESTRICT="bindist fetch mirror"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
+
+	doicon resources/*.png
+	make_desktop_entry "moneydance" "Moneydance" moneydance Office
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index adfacc74bfcf..32c2a587287b 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -160,6 +160,87 @@ DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz 12192098 BLAKE2B 8
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz 13435858 BLAKE2B ab60a610cd30d3ea0726f0a6111fa47c2409b9c7347d51b2aa10d8a09f4281e053595e017db5a5f98de338f9937237988163c7d31274ec494893dc04447cb919 SHA512 648af13c4c1aa8e68e765afdca078203ec08edd130bfd65cd1e81b45e0ee7c6ebf1c06a114b82cb36a1bbef9148bf9c2dccbd090fa1e8d828c67bd42d0872a36
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz 13870834 BLAKE2B 6eebb98351195f3712ac5db2134bfe97df9f3c5df12015f998d3b8dac18394c4b5f079f7274ba1d755350118f5159190c4735161dfaa652b75d8b1d20e6c00b8 SHA512 5a63e88278b18d76a497fc60829f533da8c9ac1c1af11d9b217942e57f14516784022fddbd1943ec4ed49efd64616f4496de11de9626e6787b8b35b6a06f9634
 DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz 14082525 BLAKE2B 3799b4c5a5d282dd78e7d93687acacd0a4c0c08f9558c2baa2aa444425c5eeffd0616c0312b65b326619ac8865c505bcad6cf813a5bc338e424862273ede5617 SHA512 f82ec54a570c81180b0b98e026ca0009ec1ae890e25d92fde07a83bb285515db59c70fc7859c470233bedbb823b092ce94e7040589b37a24a6cec7ea042fdcca
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_en-US.tar.gz 163655877 BLAKE2B 4a232f56f8fd511e07df93a3d6ccb873bb6d586075b1c8aae34d3ff63ad5790c4ee7587a7be41be7e2c71942291ad859b848af82e6a039f4e3bc09d299510420 SHA512 5618fdeff361fa2ec68f87d9ca7da2cc56158e941889cb464757b1ec852931a8063a5cf6a43b66da51d063a6230d19380a790b76ea777efbe8f2349c866001d6
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ast.tar.gz 18753459 BLAKE2B 8d9e1fb6108403909546ab5ed688a6a6b39fd5cdcadedd2f3636a1024913c20e1964bb9e9152babab9fedd084e98126c8db80bebfd6daa6d921f96cd4f6bc302 SHA512 c3835453831903df9b133661de06dbada6e329aab0f80253ed4a20c1dcd2d97d0f7b513294dbc712a854840b20c33d7a6df6b0e3270ac867480c64fb86579c06
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_bg.tar.gz 13608507 BLAKE2B badf53b10f6ac444d5d66fed932517dbc04a269b6796ebedb8f6ebe7899c9ca557526b1949a0a9557a25e07ab2bace1f8b57223b73e6b71caf51cdb4774acc7f SHA512 63ef4b253bf5909f17e3a1e2352dc8a2fb17ae7dbaed59fd5f5fa91e0d7ca78944ccba8db4e42476d57ca67e6bcf438011ef12d6199b227c3260e76e536b6858
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca-XV.tar.gz 20190793 BLAKE2B 4b943b0bcad9f8b6f676b00f03f2b06ee139b7b5ce8d8f74e8b9f9846f77471b013ff19da2e03c49d404e7df54656202e8e8dcd065121c05e383c5b4928306b9 SHA512 bdafeea03a3788393b4d0c21058e9ee34091eb8e22d145ce615253fcc38098839297f0d4ee3d497b2d6afe699713265d43ac5297d2c0f0f6adcfdd77b042037c
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca.tar.gz 20184423 BLAKE2B 03be904ef2f76ae608efdaefa1351a1a7248cbd0db2d790ca1c0b472a682244b5948bda26224330267ab5ed3ed3f49012544507284548f0e38d8cb03cf04903a SHA512 94e245f092acab015796fe40f9d79cfff333445434b1ed203285f10da83b8406743da27e99406e61a4955b078625c8b410b97434dc6ad7cb67a62feacea1db6d
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_cs.tar.gz 12651354 BLAKE2B f7f6a5c8c42f494275cf05a248cddb8332684f48cf9dfe7766892944a404d2ee21725342dc10233a3839a247add39c2f663af069b83025b5ea481cf716df20a9 SHA512 1678889ef07560c363185611115b107dd0b9c9d53b11bcbc259ed928c931e7f1a875ef819927ee6a74099d79dde212a9b8295d8dd5d7a6e539eba76a2b7d2ead
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_da.tar.gz 12441160 BLAKE2B eaac2fc97039c5c7972585558aae379e88d6cb596244c3b12d30661a38bb519779522777b6d0f7fdab92ebb8480c94489c40a1b65d78775b01b7c2e34121984a SHA512 965b439cc0beb69428db94970bb6be60e2d4d6b32fc58250da05a904d1800436d9271c21531342c0eaa1f922f95dd244c5816c31df2a96435ea5764370bb43b6
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_de.tar.gz 20372524 BLAKE2B 149e1bcbc14b2b852eb11633dd455052a3e70ccf314a07a4d310799ac584a8045116962bdef4163ff2160a9ff28c1da3b161c4af52d1169426a0e874b0aef070 SHA512 032c600940593089f26f90ef923261277548aab56369bedc7b7b66ebad55b964f43f5d2170707b233c5c54207365d7c37770cf3a1aa73760dc5f6a718138c0ed
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_el.tar.gz 21712932 BLAKE2B 091cbc2b262b5a2fde58ac1da6144e254b616da9845ea6123e351b9a8c870302185810634e56a9d77236ed3c95387c880eac19ed3b8ec5092933af1133fc5cdb SHA512 9488893ebcd4a0bd9da55e663d0252ffb51db1bd6f9e1d22b47d958cd8cac14bc497d42171ce87f2986841466d14a34263c86310e5c9098a4e34cbacd81a3dd8
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_en-GB.tar.gz 11401535 BLAKE2B 31a8aa124f077475d027b77165a954fb351593dfd5f6395cd77b7a58af427be068540e399be8bd85628a34d16d9807a4b522493fadbb244355291ef66158ad23 SHA512 ba05170d3cf1eff561b37fde8ae42bb4ae8e4ca3f119da407999264c19acff3d3f4aa4567f1e3f12273688f5c29f1826db62916d9fbf4d44163da2d0aa8c18dc
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_es.tar.gz 12840832 BLAKE2B bd475a84ae4289c25307c5c3fb2537a7194cf8a71dd19da1058b5418abea5244349e0f6509e7be2c76e50e95acb022bc0597479c7055458e2d4dee85e8527e2a SHA512 be977df41be38e37f9362deeeddab7b06938f5f7b16910b142102e6f5ece2ee986d756fb64dc46272a021a2e8c1634c2eb9ca1bbc7e1bbc1d3c6cf83077ee27e
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_eu.tar.gz 12691279 BLAKE2B a82d9e9ab459e9aa981a99798792e15342bf32fc3bb0a694cd255db57e64cc66f10c2637c768a723377a78628aaba3478fa353c1627864811ea14fe2cac96638 SHA512 16d50b74f44aed73c4ea3d0ecdeed316f41d0bd38654ec34f43cce5b5a22c736dcd6ae0d1fc838c80dec49464b89889fe064b0ddd10ede6e387f9d04f46226dc
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fi.tar.gz 20454946 BLAKE2B 627db94ff783bbf1b0714f53f6f8f0978c12a88c5f01eb514709191457249ed921606cf74e79aff6ecefe41820d742179a666571ed7a758cc944c2388f031ace SHA512 e86de9f6cb52d74c7682ae2106a95f3c16c879ae3005df1811b5d71135c82f1eac9a6d9d7d48f1b99d5b2f70831257ddcc0c313715740bc963dc437e51b49a8b
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fr.tar.gz 13066867 BLAKE2B 7c7b51102d15787bf569f60ad780a3cbc712678230b91b75e26947294efb84f630762d27009b19281dc61f8783bdb968432cb9121ef272724cf2461043e18a2d SHA512 000ffb291f11da39e79faa23ddae2c898c2eba378bb5a8a18645cc2ca2edb650ce8189ecd734a3741ff9bb73a2e5bf0136b8bffbdfc6e50e9baee392406b6213
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gd.tar.gz 18758514 BLAKE2B 5c90912eef710e4d0a01b548caad44ba053976a2dba3dd8ec14dd889c6d790d0f13d5de4404599d64051e48421f47257e982fab5a38450e04602a66eedd473e2 SHA512 e21ebe89344128ad83e93012ebb5546e1e0875d26e405d6a50f0430ee8fd9b75b663aefadbde0fd9bd64cc4fedff8e8136071b68e5f7f06a6af83bb7319da4f5
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gl.tar.gz 19776753 BLAKE2B b7cbd70be76868e43e12640b6b76450897dc31c8f3db347b1cc49a36c2ab517f72cc14da4ccac7fff8cc7e2b420816ceb52339b84248aa4aff7add917e90bcaa SHA512 1e7807424dbb00925a16b9f507235ce4d677402eb5963571378c4fd4190323b9634398a039f3a5f7b842088b295607b9fb4d0b4c02fb2172e0dd4e429f2bdf2e
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_he.tar.gz 18778426 BLAKE2B 2e99ab4b251a9e496a64b396ff447c7e1d00d5dfe115d065e642fe5ce8573ea39b4dcc8b79bc37527e16521a8eab45e0fad08d45bf89ba9b80a3a1899711e37e SHA512 b14c1a1cd36850c4628d2cf00e9b280f5dbfbe315d9fc779282cf15220a06e471586c28d7bc1ae0cca8082da28df98eabacb6676145aa23e80e010e1945017b8
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hi.tar.gz 19738628 BLAKE2B 968c4126127dd5b1e21af592eea9e438982d2b65422cdb7e0b1b91e1e05db3b830d47eb25b425778b02dbabba0a0e96a7f8ec11050f3d752929223c1c0c123c8 SHA512 92f8c8c1e18281789789ce9f909f68c5e0cf7b7b196e825a375b72157c8e66611674d9e9dd5866815621b4d9b767bbffaf2ff4db7b8735cdba99a6e293e8edf9
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hu.tar.gz 13105240 BLAKE2B 10ff9f4b651bbd242019cfd78302abcb4893f1faa80816587d636e833c34ff96b6e4ce4125a10bf9b1dd1100c4dcc9ceb23d42d09b9b83d148572262eee5b733 SHA512 a6e24ff185ca396f41e70208bacb78b8bf7c6b4e35577aec2d044d91c3708d0bacecd593207b93662bd5cc1d3268eb30ae4aa9bc6e3ea8038ee5b9018db85db0
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_it.tar.gz 12810928 BLAKE2B b5cd385f2e73ee329b1f72269ef23f99c7ef35a0a2669b47a57e3889d70e2edc07c9acaf72bda35e47eca37247940c38042d29b0685fc2ad349c266adae60675 SHA512 10d051b78ee1bbfc0607f4b974b51c92cc25e3772d9432fe8f282d761a7880b51c34402e6ba2d59be3322573bc15a6319ba17b246de89d8c8075326a19ec890a
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ja.tar.gz 19054212 BLAKE2B 7b7b070e2d19b37679e257cdccac5b64f7d5505049852098d2feb1ef8b9c6daf8b2e7fe2b9aef3e7c288fce2f56508fb295abd8f65df6113943ef82d6948dc92 SHA512 accfee4fd1e620cd47ad80e8397ec22dfa08276a1928122fb7bb7a32b9f767050205346ede1037271f610ba69482d04a00f5875ff9af89bd7a63d2754d4d56fd
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_km.tar.gz 15959459 BLAKE2B 2b6901b6c492d61413568b8bfde94398e2fdffc51c11c6b05f99200f0018fc08fdd363f01d3878defaf5c8280d44259e3bf02676e0dff1e79660ab9effbacd5a SHA512 2620effa6bd1709eab2060caa580d7b382f38db16a4466f901b0d897b7460d05d59d675671883bddd9abc16e5012c5fee0c66f04f889c6eab928ca294e2dae4e
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ko.tar.gz 12556735 BLAKE2B e38d396bc68140a4886f5b891610e2d7b953ef487255fa7682f5ebf9e63a9d6f1152e17592d0e680a571ae4d10dc989180839b858afc97546a6fa86dd4c1564b SHA512 fd83dc8808c361170a0a8199a294f5514372012ce510ec1dbb08abb18c099af64c5b7ebd25041c399161456f45ec3e98e30a28e34e7c0ee97bea832182a83a06
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_lt.tar.gz 18655444 BLAKE2B c40746f8b954d2a467de8ee19616b6f7725a2c71d2c779c74e74bc956220e5e7e1ae8b66ebeefbf4fe768198f52bfddb86bc7ba2f1b55d6786a74b862779bf38 SHA512 f5619463a860c16341ad67f23bdca73210a266f7ba91a63e0b8ca6c6f1f6d9a90e049905851e3098f26bd21235425a1b2461fe2e9271d7f79e13b053a197389e
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nb.tar.gz 19895321 BLAKE2B ac61c45904072f62ba55671d4948657d3fb771f9a227ea349b4cdf96eb7b19bdf52eeea17a47987652a2a9f74e24991a171334fec3e7beb5852f7ea5e17c773f SHA512 3a621b6bc0e70138c1fb888404127b313b4d1de68927be6dedf3186f0d8ac6be73f800b9ba40a8a420bff532e55dc1d2540444d29d007eb7a1005772b84d3565
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nl.tar.gz 12647731 BLAKE2B aeec58cd6a2bf9ed3d93033b18b7c123affc2077a313a551090a3edb281292e28738d0d3a0f223e9ecb0664f3c6567b481d9579de59dffa207b4e1e27b566811 SHA512 74533061d9b2055d944821a81ba56fe5830d5f65e82b317617809c5094baf8d7d8fdd5fdf7429ef2e76436e683dd121220f45ded2a99541c7d20d5eff5627beb
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pl.tar.gz 12989098 BLAKE2B ccf4a6db0595768a4f5ea35e1d594556ab836810756d8111ec902cfaebc0ac5461659ddd6a91aad384943b43c4eaedefc411cd46eb4aafe957f4d3dc7cfe1f3b SHA512 4addf577ed1ac32ddf4d29d0eec45b2f203695f57e25a66cc2bcae56356bac173214bd2ca8f3f9bb6e511f48f8ca797a807660095b44980c4966df23b27167dd
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt-BR.tar.gz 12662908 BLAKE2B 7a5f5dc6d5c8cfc04a4fed136af3318a64050da2887c9f4e35050c6f48f5d8680b037af270bbb73b6bba3559dc700abe24add9f20ddabd8e4fcb1685a01bca22 SHA512 10dfb04cb5215726d2c6d4a2c75bdca16b15a5b156275ddc05ab5b5fd7974702086eec3ca8a8eb797f17dd7a27ce7efc1f93d6b390223c8fbbb6b5bc2be0f939
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt.tar.gz 12657515 BLAKE2B aad9d39d021a1d0fb3ece8d76ba56daa844422f7076a7bbd2850551300783bded99e4bef2667e657e2216471484587300f75acd0cc8e0920992261a01541ab96 SHA512 131b8d8b8ca268446a670c33615f57ea4a8af3b1c34ff01a08ec5137fc7eeadfdc64a6e90e8addf0d171ba2e5028c55589d83be630a8d3b073417b5fbb1e19c1
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ru.tar.gz 13744671 BLAKE2B 10447de93d091dc301f2ceb4899a53471b2c1537c254c74979e56a9570ac6a6c7b1bf717441c59dc32ab08b5f84c0df2b0567090a715d5efdb35093207fe31a7 SHA512 50a4359b5efb4388f992e0ece9226be06c255caae499d1a71a9fe012a39d63aeebd088ecedc13d9510e4cd64f7cecb1646a6b8bf7b8fc852fbf9e5e0dc3fc2eb
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sk.tar.gz 11845678 BLAKE2B d8b6be6ca1c9b4b8d43ca98de87014a8b3f15848d9a95327e7e3857e5fb449b8f5d8046b3a5801ebc8a0431883a3fbbe4c53a96a2ffa359616363ce035d1c979 SHA512 7ca6910a88c0c5c593d899532a3cfa943cb2d933356f61df4c52d6b3dac6c70ac0632de7a5769cbbea7788d841833251c291818a407363da15b691561e4e7d43
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sl.tar.gz 12587279 BLAKE2B f4e66324fb420601358610e0001179766ae5d9739c88c7dbb5db91aed50edc0b78792d2fb3195aca948a7e0df3f3aedc9409ddee25496f8dbda59bc63d8504af SHA512 d129f91f819fc09f22722d8545cc26ff008163278051a2acbebadd947c3a27205dffa1e790f6ed7522fbe8cd9a57381b3d24b171aed24f8eb18f2fc84d9bc3a4
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sr.tar.gz 18739687 BLAKE2B 77367768815d41f624b60170e672f7972718c692ecb879b4571b4914ffd96bc108555d41647e2749b8c1539f7e2c8b4fa2eea74b332727d578366560568b4b22 SHA512 c33c8555ffe3dfaa4e96fe5c5427d0ff1b3ea8551af5904597ecda4c78175d0dd82ef2ee6a14c009c1d89e6e94556496af4d541f0620f5255219392e7d0e3675
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sv.tar.gz 12480908 BLAKE2B 269172d93bb5f03188b0dbb9faa20c94dfefcdfe21380ff2a08474a5190bf544825428f947c602fd4f423070c7a0a63b5d843489e62e60f2c0f080e5c5646fed SHA512 87a98d1c65eef08738fb6384c1b3ed9e18575c2122bd8017791c62c8611e4b1415a57965a49ab83e8b25b5d1ec849d9030441433534a00e42b6165398ed1ab42
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ta.tar.gz 18758998 BLAKE2B a2d857a97d5937408712a28ddd256ef285f50b389c614a5e9d93f4618ed42dbbdc910753a9c1a0b5aeca594e30c93b4e0f39f0c461af0d5baa100293d8c8e93b SHA512 9030ffb35ab7d9460ea5b6a27c192e11831c95ab974fbaa8f6f4eb90fb9a6d721d88fabaa39efbcf80478d665f4e203869f25c1baeaf7e4da0bfeb8a60145eea
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_th.tar.gz 18709813 BLAKE2B 8137c4fe7bfcad491d7edb79d19f34be376e1386a01881b6cd2b4937ca3e264d23974641f21adf6289d31bf4ef8c21bcf097e139a3a1a2020fe07d693fded86b SHA512 9b93a459d7af3b5de1f15a8caed0b0824d8aa5dbbd5d57be9f79b1861bb14256c6fd54b965570cdb56a5ef13b7708ceed6b3a00e2451682a3b71dfdcefd43f66
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_tr.tar.gz 12182835 BLAKE2B 98b075a743f8df43f559f72381cecdd78f8c66ee67937d60a7153358f6c8aa0c0c329c297bb510f1e8f20ec8ca2f678bdeaa38c1a0bf29466b251ec583db7bf2 SHA512 262158ed748943a23af21e48416cdd1713c6d02eb937020d2a377ba548e3fc705233118a149f368265f1087cfeb5707785c0ef830aa969c790094a3fa2a1650c
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_vi.tar.gz 13428036 BLAKE2B 1e0df5e8077a321b3573703bf29af1dc4386652814b7b30aea6e9bd883d20956a313d239c29b9f764b71334558024f6988f9c6acd85516c6f47a62587d191e6f SHA512 4e44e4c550d2f5d3596bd53b99fafab47b3b567b13c1183fd274a8ebe7ceac585c3edab51d860ec86f4de42d5ce37974b4770a006c68d1520e5fc1b43412e893
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-CN.tar.gz 13865208 BLAKE2B 44eb061eb5ea255b4af663c9c929893ea87b923ad1abccc277dfbc3422a15c3370305e6cb01a4e25d521ed509ebe1cc27448453bb654e71278273cd3dc2675a6 SHA512 5f384cbe98ca8abe0f6501713002d9d4cb5a56405c904023d6b240934f096cfca0420ce0469bf24c1b238bf5d098bfe9ed114dfd681eb9224787c0dad8191ccd
+DIST Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-TW.tar.gz 14074759 BLAKE2B 3250dd5e6b13b6812e62c9208b05f160f19306bd7d6f11555d7281f10e860785d8f90b4f7497fe017db1f14d1b4c49ae69bc70de0df2dba03b0a45a19fb051fb SHA512 4eef2271b473fec44e4e3f68c60d05634a57a14f563b28e9d1f48c45ebcab295c9de5bb2a00cda6d96735f58467fdef44f87b0f69edfb80dcde6634eaeb6e9b3
+DIST Apache_OpenOffice_4.1.6_Linux_x86_install-rpm_en-US.tar.gz 156322235 BLAKE2B da5c28d3c7bab633bbfd0486208c9bb278aac0dfbc9702315ebee35abf7f9ae1d82ec4a0224a9fb530e89a103514ddb27261842ded8fff6f3010bed108174988 SHA512 bcddf14ff245c1314dc000efd909d376ab77d46920bb9a311a41685c4e2d4e4cd49b471e370fedf7d9ad1d695460e5c5e88b7a78ca842adf2e8c1112cd2b21d6
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ast.tar.gz 18762044 BLAKE2B 69f901974e1d9adda8dfb3e4e679da6a751a4e13846c96086cdc127b795bc529b990d871d8ea606d41527aaa17f9c30db1f419cff06983752bfd07098b6a37c2 SHA512 f5d2d386a43ab0e375df15e5a03fdf8c1bfd20299bd93fd9cacd37da45bc08024406ba3297643ef38d378b8bc9e6aaf55886984e8f23aa2d42683c046a2ebe93
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_bg.tar.gz 13615618 BLAKE2B b4dca0578d002dab18def030e828fca457532d9c90922ff19a4d6d25bfbbfdc7cf465c5927ebb63e6652fd209fb1930c6994343d4740b4e8a3392f2a11c0c534 SHA512 d720b38d0c282972f05da38493368dbb5bb5d5325aac5ea0f3e90590c357c3e1543e64602a7e0cb04f0532f963c14f237b41c9a6cbcb441ca805547f9d9a5b74
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca-XV.tar.gz 20200493 BLAKE2B 308dca56d16e5309673252faed09c8c51dbb38a3b2d7bf3f5d5d5c5cc78deeb8941e50c8602413b08bac92ad00ab3de7eb5b2186ded30e4dcbabee4aa59170b2 SHA512 b758db1908cf5bc867cbf86a361a42b4f4387ae35a353408764a1f3354204ed2bc659beb95f07cb5005b429c39acc6f379c40e39476e174b2a4cd21f2af56c62
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca.tar.gz 20193242 BLAKE2B 819a253f5794ce9a077317b6d9adf205ba071c14b47152824813b759d1fc68cc21f62d37c1632b042548cec02cb17b65a076980855a6f030d049fc7d34f29326 SHA512 fbd521d7d646d046ff811258720a6566e309c561267b59a88f978873d62f1902e910f55b9f714d978cdccdfc5275403f30bcafcfaba8cec64b2dad4be7719f16
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_cs.tar.gz 12661534 BLAKE2B 9c2c11dadc1f375a2fec20710ab1a49764ebef129566ece32b6d11ea69b01cea00f7a50f095c12c9d5aa959e19aabba9bd6abc5a3eb8262ad17abec30d97fc65 SHA512 33a5ce75ea8c3e474f88519decae342ff3dbf54d3f49a45ba83d5628c49ba12eec893482ebd303af35058df6cb7f9ac757cc10b3b4ec404848c89fecb3c0d4f5
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_da.tar.gz 12449109 BLAKE2B 4907cacce6686eb1900c3b1dbd2d0b97b3e2eab19cd307f126df51aa9005f6b67a5725f1ed0c9c81449bc4bcbbf398107cebe90b19bebc0c81e86ccfb7487415 SHA512 fc2cf1b1b44710a45bc068b2bd5c800b71705f5b21cafbd0e57396920ebdce0852f161a0bef1ca9cbcc00794e37a88a14d68e227763737da4a413f1c3a124386
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_de.tar.gz 20380645 BLAKE2B bef019c5d7d7b34db03b37487c405d83041809410d038e6b022cfb447fe356ae6ad004bc256f1dc280ae2abdc90050edc52c7bad1aa913e9b7106e3e97ef80ad SHA512 ceda9f9fb91ad221f32df711eee3d8a2ecde3f0628442b998c3ce6dac6e65e4c1fadd64b1b537320e412b6659fa9a847080c215e71cfde4a16c81c802ac3cb7a
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_el.tar.gz 21723477 BLAKE2B 019ff8989a588cae466014d1cefbdd117ef4e98c5c3b5f82a440ec537cb5dca4c35bf52c4e1fdc9455457bb30df8d7d14d2e3863d99ef8b241e1e53be3e7f8de SHA512 377d02a6a112fd2db9369d0596622d8dc6ddd55aa50565ea053667f3c9ef019a3c97cf66a2f93380532eb48788782696302b58a4c361ed1598abb554843973f8
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_en-GB.tar.gz 11411623 BLAKE2B 65a060a7567336a6b142c406018a479f0692eae7da9b682595df8a25455eddc6183a90b4a272e50a1e7ba59dc9d2d64f56ccb5c48cd63479c43fed11a5d68040 SHA512 96e659d85dacc3a2150006d78eb86f3ccfd82871dc8fc9a72c4091a0abca3cfe35f4f9e90a43c868e2ff49f0fa5ccda7c6a23343c2c1b3669ea63b431425da6a
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_es.tar.gz 12848897 BLAKE2B cd01fae7af4914614964164aeeadfc4decba702ef35fcdbf0ce049bc2e3bad6a59f4486b3266e268baeb3796e28092b8e00ea0fda494a20197d9ee20f29fb0ab SHA512 608d5495b7e1d1de6af5f29348885533eba78d7cd2c8f6c0df2211ec960603119abedf525ba615bc7030b7e014001ef0bfe41f8a570c933e5d4958469d8ea652
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_eu.tar.gz 12704895 BLAKE2B 7086d39f074908280de8474d43631c0054fbfe648fceb0c6304c81e80dd6d138a9f5f6e026bdf955674d8dd903da2687a84d7610646747c3f66ccd03677f5c7f SHA512 1378fa5c94d5e82578df2dd139f66ef37b097c4e805cf32704f9ad7bf9563c5dde9c437aeeb232ea232671c563794b1da82cef2419ea82852ad9c4e8dbf3e620
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fi.tar.gz 20478098 BLAKE2B 74bc27963d21f772d4f711f253ad6ad5f0007f68d0783a883aa0a319daa69605ea924003d1ba77f6c2a2c2d85f25e57d341517f350d17241764f867f8353094c SHA512 79975611989c7d1d6dd125a9c90c939f85495df11804f8d21c217182986095d6e86d3318d541c51d69be7a21a1b1c723fa1ba9213d83cc82ded6f03f28d2ca72
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fr.tar.gz 13075375 BLAKE2B 4d9ed8ae3375adae061b0c6e04a2440149d85f34c4215dbf253e87a2c911c95d67d3d27cfd2bfb17ae01107241206679b30a1fa261daf94e742c0fa5687c5424 SHA512 97a47ecfd64adaed5a3a2adb889636db223fc5b11256cd63be3afcee714704467d619fce784c37df8ddd3e0bc65e3d137a7351e3e5ca1c43c7d93ffcceb1f654
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gd.tar.gz 18767783 BLAKE2B 02ac428d3ba4ad45087867a3b3bf1d89186674ec07db74f0c63f40504da24df3ee3c4e57654dc1b12a9ae1620d2261c6a4796da9cce12eb61683e0b2eafd87c6 SHA512 9cb41552639e9ffe2e58809ca405c8ce2485187e3ecc995d41ccd58694b6072456e7aa934de5a06a847dae18bee6bf8050c493c14cc424dd7a14c4b64d960072
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gl.tar.gz 19785316 BLAKE2B 12a552fbbbbd5dc6efb301a50dab5d33b5fb9009c885c7f2483ba6c7b7f3fcc78f0eef52042ba63d016cae47805d6094efb816c09a3f3eb2f97e8e89d01c6b99 SHA512 75c7c7a059734d8715a444e6e0b722252a0c4bb2f013676f3051d9bf6edb0ee1a07baf2b9c1631b416c501940e7dcba8b01b19e29536dc44da72d938007a2db5
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_he.tar.gz 18788677 BLAKE2B fa32433a2cff27c65d85fadbfdeeb6f44d625dd2d988c0c7453cd49fbe4f37f2faa13c5144bd090dcff630fbf9082557ed1122da5312365f275913296885c5b8 SHA512 ebaff77d0810d8b181f40ce8e0dc28d54b1a44e0dcf850a6db6198719b2ddd16415a63ce2500be664057e94758641cac99b31fd9fe86703e124709146efe986d
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hi.tar.gz 19748073 BLAKE2B e5ca85268e054f657437d574e923d880c0c1db79f83c7eade52f20436cdcbe2889d18c3b6c2fc07cd365662f29c9df46c191ea7367d3185046364113960725b3 SHA512 5fcbcb5cfa2920b1d082e135a61b47b8fa34f0b43301d03d2ef6fec3efa29b010e9755af5518d98c9d86bbc00af1c353d427bf5c075b9a0db8be29342405ba82
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hu.tar.gz 13115368 BLAKE2B b35501b4895e98d85fc0e77b5370b790caa22b33bfb7adf74d1044b8d039623e5a99f8dcd8888e591432aab5040b7a830d91e021c1cdb8696a72661e1f2cc296 SHA512 4eb15ae5524a9d0bd386111e0879e061a951c792c211b73876fafa28e0d8f0d511ba7897d77b99fe33b147e9347c325dd0c954251a2e82e295ae73b5a462453a
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_it.tar.gz 12819621 BLAKE2B fe491d5d63b8b6bc348d4def5ce2e6e8f48a9d0b054caf21a8b1f5dd5c0956a8b2c337c8370bbcb9a28a5f9ed7fbd89bc0736c8fd1eb5875b2789ccb374da235 SHA512 8bcbd3140e4bab202aff116ac99071157ac498cbbb0ec411387a350056bd1a9b1ae1ddf475c344db093df14a53139200c1417a05c066476fa43db0b789834262
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ja.tar.gz 19067803 BLAKE2B 74df3853ee644dffd1da2b59862eb5db247d06947f3fb2a6d7dcc411ee8b6bd82da7cc0585bdcb892067ec3c33c69fbbcc55ad02f9a5e943d434bd93e532d2aa SHA512 31c3f9819fdf57272dad61489cddc1ceb3bbf43b176ab74c5fd6748bd369fc3d45c41c5afa1027abc56f746d7d896bf604c1bcaa5582f148e3ba793ee96fb7f8
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_km.tar.gz 15974645 BLAKE2B e25ff7d2a302101f3dd6724056a43641e4ade85f0dee92a87e11dd0704b2d5b894b4b24a6a505b9ba8b52b17e058a7087b09d42c1966ef506e3208f9aa15b8c5 SHA512 801a061abb5ccba940d369c64030396ec1df7b828a7305acf3910bdb89d7608805df8a80913848787c3aa68cbbfb18cf029dd051f852b9372165f78b9855ed50
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ko.tar.gz 12565117 BLAKE2B dcb09e2fda3230896dd094110abf6c805b51b8d39fd064adfd46d44d01bb45a19c4e1c686d04cf3a91507f8ffeb7fadd1db556c048e3ba1a409eed030811f819 SHA512 ef903d22d15d03fec1a1f0767ea9283cc41277fbb517e465a3d5f5cbec7cebc72a66ecef45143aed07f0afd33e07c57bd57c3e3252bf201a516f6a7b8b9b2fc8
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_lt.tar.gz 18664636 BLAKE2B a86c1b135296512d75722760bedb0554962aed282827e74b111ddb4d1c961497d4fa514b1f3ad16c578dcb07bdb11ed9b8d60a5e2f546afee264ee141ad5a7c6 SHA512 4bb9d00ffcb1cb971ea8f41d2b4416dcc31ca861f3f7e09fdcb9d13149660a74ce46c112ea19dc42f6e230a50cf4d6561e8714976efb1631bdd7829b9e5e2b82
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nb.tar.gz 19903280 BLAKE2B deb80f9b9afced0a497e1ce9f45b9ee9e387caf1cafe34e7b49f8ef00a07a099dc40afd44871159d9a592b85f90288e121557fa35c27bb0635b8d39d146ece6e SHA512 e8f3156621d009dc8ce7e9f5830ecf3703aa2bc307a116090bed8be6824756038a57c3beb4a3ddda655fd3dc13bab2879ceff825a662478053ab17b7645ee7d5
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nl.tar.gz 12653988 BLAKE2B 814d670a3c36270a97be0b24afa6cbb91a356df09c8786233832b302760dc197b817005de714b5f8adae705c530555d5c13dc4c2cbbb90b6a64869c37e8331e0 SHA512 e9eca007edf401a7a008226cb5494fe1ec665f360343f8a4b65c1f5f55ce802efc6fc61c58e1e78df6e75ead6d74bcbe734adddaa18ace7e4af388cf2967af64
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pl.tar.gz 12997757 BLAKE2B 8f22b80b0ac4175442d6827aa3c41f60a8156d60f1387b0d5b07e70acf4086cf019a4b3d2659cf32dcbdeda3a24c5673484c17567021743aa31ca93a6c0bb1c5 SHA512 823b581f65932f436a4397f6ec8c390786ecbfb3d2dacb45868b0a307ac81cb896d04821cb507df178a2f701d030c358a0d8da04a54781cf07c5c73df31689a7
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt-BR.tar.gz 12669424 BLAKE2B 1dfdc4765d5e430d1f5d2741c24d4c53e3dbbef7135fa8369b5b5ac0c484f2f3875b97279a8423444effab4843ca1a19f926881c6379e1ab416f765c277be274 SHA512 da7093845a44ff07895e0982044bf0368b234a355a094a6691762698614fbd0f191d767833f8fe9b070b65d4ba4df561908856b3d652ba6f73a8aa150b548573
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt.tar.gz 12667729 BLAKE2B 17847b1d05ec47b3f7df945bd09bc49cceb0a8ec8adc19f7ffcf6cc233bb0e44408bcb6d0088e57034588129a5e5f1541d934b6fc4c7295afd49d5d6c1df5421 SHA512 922d05fee1cd0906fc4eb621ae01978d0395fa63d98aaae2a30126593a7b0802ce032702de869e43c62c5a1c277115b16492632c9c469a303199d977d353b5b1
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ru.tar.gz 13752250 BLAKE2B 73412cf24dc9ee9298fc86ad101015fac5d6e3016328d75dc5f41208c3e5baab1c8a63aba7ce2c9f219fdcfa7e50056bf51b16f12e95853c66686f528ffe65e9 SHA512 0871b4b89ee3126329dfb16002714ff281f6cf5a88ae53bcd8ebc4b4858f873f9448ab91935bcf5adbc64e674149b62bf298f211705312d4837119feef3b8386
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sk.tar.gz 11855919 BLAKE2B bcf1294ff12451805189f765b2611becf781ec549f58c7009224d651d0d19085accdeea5580388915fbe69b824e25feb2f3495ba231a1ffaf40c8cc36ba22cb4 SHA512 bdc784456c15d4a4806b543a6dfbb5dd9654fbd907a83ae3d4b210344bd534750752acc1b89e4f90ea6475dfcbdcf738e3bd976d6db34e69cc5c707655742950
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sl.tar.gz 12599268 BLAKE2B 63beda0ad2c88226aa795015316353a8f3b7c1c131bd666230fa8675c078b591b7b0d814e5b116271c41f5801822fef8ee1c0863e71fc21a569f779ec6205e84 SHA512 0446e3d2da03bc8d654ab2b70ae17f8acb161389f7bfdf63f697ae75fe4cff939e5f5f307fa2f6715451e1d041dc8501b4e513f78ca880a7ccf83635170df829
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sr.tar.gz 18747955 BLAKE2B f0e4f1e0074704e20c76ca926d7f2ac4de660a1d656651d2b59108c2a1ff15ccc05bb005f6979393d9a4e854e145d1f3741efa69e2af616e37a17707a3f0d0a2 SHA512 3b2319291c9a406b8bcf9ba4cde5299adb573ca82f4ec948fbe07f1e19ef34bb8346404bfb92e96d073762b2a2171d210493a17090fba034bc956615b10c3c3e
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sv.tar.gz 12488582 BLAKE2B ed8799ccc24e25dcaade14b0ddbf80091e44f6df99e5c4f555cc3b15e23bf56435fb36c072408489fc995b2da602cd68158ac45dc65ebd2282bc8d333baeca62 SHA512 4487cafd057c7d9aa850bb33bd8aae9dc2f9cb082fdb33fc03912f799bad8ea6b2a187f869c5b6e8a632b4c13a51b668565bbdb8e5fec7250ac29c648f5ffcfe
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ta.tar.gz 18765716 BLAKE2B 036fbaeb942d6cb803e0a5d649d48fb0952135e981581dc560b3630f014ebcbc722c78dbe8a9f49f0577ede9eda2749a5f70e0810c653189aa4731e44912ebea SHA512 53fffa489e76ff7d0b8792a460822af9d2fdb0a41275b758f1b689da657c2de08fc8705862aa99cd6a5d587e5711a2faadcfafc88e64d9dfffc5705f27eacf05
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_th.tar.gz 18718923 BLAKE2B acd2ae11c6e0e52a0570cafd948389034cbf25e870d974e481defea6260643f36924ef0367f34605ef7940583efb67cb027e499f7a9e79bfd70d78fe6b769831 SHA512 15484277419eb13253199397f2cc1d40679d75edc0b0861ee45ff11fd6e3a2607b43ab98e2f2bb3220d12acbf1442832fc57a2fdbc35f4d0f9977825d71101f1
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz 12196002 BLAKE2B baed70f0a841270725ccdeaa7be7b318296685dd1a74a1df1122ab6ff65d4a032c2bf2d28cd6dde9b020c8a546a63d0046d5ee3a9dc80c5162c172832057d3ad SHA512 fb4f36128fe92c1b208ed8644dbc8a0b198ed63b52cf82484c87fb213f6ec978b5488f38424a3d02233fbac59a485c89c41322139d2780345b6d7a2c97849ac0
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_vi.tar.gz 13438574 BLAKE2B 78a946da888cdda4edfcd7398386925f1e7e27ab10dc0f9d6e43b1fa7269b5282574774185e8e964fbbbc2aaf60f960862feee2927e918e46defac5b94ea604d SHA512 f406f5f4e7d21ea9031f316c73bfaa8e06f6eeb724a79db0bd38607e5dc73f043d55e37528c5d48bf7cc031bae751f792447fce70feee9ca5f2e46b738d1c7f1
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-CN.tar.gz 13874438 BLAKE2B edb1cc8b0a6b94f7fa47166ad26f45d58774bd9567cbb6e3a1643f038d335f33f92a8ff2b2d84bc59a5b4cd020e3f68826fd9b7aacc4f1534683288c58c5cacc SHA512 722b8a1e8fb39a01dff92ccc5db61428348b4f033efa6e9d150241a2e34010444ae43dac54b8bb72b90d98304c62328db8e39cd2de8077dc49f2e1cb3a475c24
+DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-TW.tar.gz 14085971 BLAKE2B fba2234bf067ebc12e691ed32800bdbabd6cb328def31dce7fbbe589437c7490b6ef6d2bbd543240c7be7be3a4bc6ef4a1685ad0c3f1ae7ed3af7a1c2268bea8 SHA512 775184deade61bc8059a5adc8ad63fec4b157491edb8c4094ec8f80b3c66f2d7de574bf20817fc3077203bdaa029f6c5e4efc4ec39f15f41ff93d760be44e213
 EBUILD openoffice-bin-4.1.4.ebuild 5183 BLAKE2B b16a34e620c9292c59e187acfcf05fb4899991b7f0e1d625143fed9701d54f00e9f7bf5f78605bee9cc61ee045b6b4c8c10582d8120ab3fcefeac80c6affd196 SHA512 59f864f576ef11230a0cdfd343e7d5fda2b2ffa4e89f37302935a9aa4987477acb35d4af6e33ecf004f1eb1e87fc908b82fabfcffd741211e1b26ecd94dd716a
 EBUILD openoffice-bin-4.1.5.ebuild 5183 BLAKE2B 8161daeaa62e31d496d75d9ced3d3b40cda67d86c36f56764ea430e0514768e42c76a65d24f582ef68908c271cda2d948097930730252b51d8346bf967779f2b SHA512 98162b99db3f5775567f14138b2d58159c4ee425d92a19df8478e3c197fe567b76eeea0a7052d7b3bba12cad2100b573cd44a015594d59ed2b07d1828e41889a
+EBUILD openoffice-bin-4.1.6.ebuild 5200 BLAKE2B 169435fed3d02fe1d99fc43c296905c5b767a436b95c85544449940db80c669bf255cf4e17e5651499fd8135e39477014b9bb494fc804393ef9af1fab216c85e SHA512 44d3f049a9cc4ef8813846be2e29872417e44533513f9171b72259eb9f0088204577b8c2a449a5555ba28c6d2985cf63a35ba5e62bcf01c3f0bcf2e6105e5375
 MISC metadata.xml 654 BLAKE2B 2373a48bc130966ace2a26ec4b666e4e5c0e533922ac41be7b13983cf8a905ae8b62c59f06b0d7c0eaa0219e2eefaf0d1f1edb8b57d9ad4a37687f807401e93c SHA512 e797f235f01e6f92a5bf7f10db539429aceca40b1c2fb703b736e83ee356126671977a8145907a43e84eb05e3914923ded9b0db4d4755954d9f4f519040b7162
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
new file mode 100644
index 000000000000..cf8b1f274412
--- /dev/null
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib
+
+IUSE="gnome java"
+
+BUILDID="9790"
+BVER="${PV/_rc*/}-${BUILDID}"
+BVER2=4.1.6-${BUILDID}
+BASIS="ooobasis4.1"
+BASIS2="basis4.1"
+NM="openoffice"
+NM1="${NM}-brand"
+NM2="${NM}4"
+NM3="${NM2}.1.6"
+FILEPATH="mirror://sourceforge/openofficeorg.mirror"
+if [ "${ARCH}" = "amd64" ] ; then
+	XARCH="x86_64"
+else
+	XARCH="i586"
+fi
+UP="en-US/RPMS"
+
+DESCRIPTION="Apache OpenOffice productivity suite"
+HOMEPAGE="https://www.openoffice.org/"
+SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz )
+	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
+
+# TODO: supports ca_XR (Valencian RACV) locale too
+LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+	SRC_URI+=" l10n_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
+done
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!app-office/openoffice
+	!prefix? ( sys-libs/glibc )
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/perl-5.0
+	dev-lang/python:2.7
+	>=media-libs/freetype-2.1.10-r2
+	sys-libs/ncurses:5/5
+	x11-libs/libXaw
+	x11-libs/libXinerama"
+
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+PDEPEND="java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="strip"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
+	QA_TEXTRELS="usr/$(get_libdir)/${NM}/program/libvclplug_genli.so"
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+	eprefixify "${T}"/{50-${PN},wrapper.in}
+
+	for i in base calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ogltrans ooofonts ooolinguistic pyuno ure writer xsltfilter ; do
+		rpm_unpack "./${UP}/${NM}-${i}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/${NM}-${BVER}.${XARCH}.rpm"
+
+	for j in base calc draw impress math writer; do
+		rpm_unpack "./${UP}/${NM1}-${j}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
+
+	use gnome && rpm_unpack "./${UP}/${NM}-gnome-integration-${BVER}.${XARCH}.rpm"
+	use java && rpm_unpack "./${UP}/${NM}-javafilter-${BVER}.${XARCH}.rpm"
+
+	# English support installed by default
+	rpm_unpack "./${UP}/${NM}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM1}-en-US-${BVER}.${XARCH}.rpm"
+	for s in base calc draw help impress math res writer ; do
+		rpm_unpack "./${UP}/${NM}-en-US-${s}-${BVER}.${XARCH}.rpm"
+	done
+
+	# Localization
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			# Map ca-valencia to ca-XV used by upstream
+			case ${l} in
+				ca-valencia) m=ca-XV ;;
+				*) m=${l} ;;
+			esac
+			LANGDIR="${m}/RPMS/"
+			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"
+			for n in base calc draw help impress math res writer; do
+				rpm_unpack "./${LANGDIR}/${NM}-${m}-${n}-${BVER}.${XARCH}.rpm"
+			done
+
+		fi
+	done
+
+}
+
+src_install () {
+
+	INSTDIR="/usr/$(get_libdir)/${NM}"
+	dodir ${INSTDIR}
+	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
+
+	#Menu entries, icons and mime-types
+	cd "${ED}${INSTDIR}/share/xdg/"
+	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
+		mv ${desk}.desktop ${NM}-${desk}.desktop
+		sed -i -e "s/${NM2} /ooffice /g" ${NM}-${desk}.desktop || die
+		domenu ${NM}-${desk}.desktop
+	done
+	insinto /usr/share
+	doins -r "${WORKDIR}"/usr/share/icons
+	doins -r "${WORKDIR}"/usr/share/mime
+
+	# Make sure the permissions are right
+	use prefix || fowners -R root:0 /
+
+	# Install wrapper script
+	newbin "${T}/wrapper.in" ooffice
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die
+
+	# Component symlinks
+	for app in base calc draw impress math writer; do
+		cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}"
+		sed -i -e s/soffice/s${app}/ "${ED}/usr/bin/oo${app}" || die
+	done
+
+	dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin
+	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
+
+	# Non-java weirdness see bug #99366
+	use !java && rm -f "${ED}${INSTDIR}/program/javaldx"
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+
+	# remove soffice bin to avoid collision with libreoffice
+	rm -rf "${ED}${EPREFIX}/usr/bin/soffice"
+
+}
+
+pkg_preinst() {
+
+	use gnome && gnome2_icon_savelist
+
+}
+
+pkg_postinst() {
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gnome && gnome2_icon_cache_update
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
+
+}
+
+pkg_postrm() {
+
+	xdg_desktop_database_update
+	use gnome && gnome2_icon_cache_update
+
+}
diff --git a/app-office/sc/Manifest b/app-office/sc/Manifest
index 36152af3f40e..a67e76124f3b 100644
--- a/app-office/sc/Manifest
+++ b/app-office/sc/Manifest
@@ -4,5 +4,5 @@ AUX sc-7.16-lex-syntax.patch 207 BLAKE2B 02ef6909652247141eddd8845c83879789133e8
 AUX sc-7.16-printf.patch 3242 BLAKE2B 824673b0798f0a268cfb755ddd661d9f84673a49ef456341124669d0f4119e23b21f3ba3e0786ea5cfaafd51ce0ceb32b6a4236ca01bbf58d647d9f8adc126da SHA512 2ad30d2394256ec1c740565507c5672d37d0380a3e2b619fdddff65749e03c57bb3b1a9d08b962751120aa063b39f3042b29906a6819076c1777c726d903791b
 DIST sc-7.16.tar.gz 210809 BLAKE2B d497d935342e942662f28605be60504e71afa0a3f148275afb19a317c546eb39c849b80195a1f1eeb2dc5e5250e3907673713585459ecde5e10714864860d3cf SHA512 efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b
 EBUILD sc-7.16-r1.ebuild 1390 BLAKE2B 6adca89debb8e39450db181c5e6bb065eae573037e0cdbbdc774669d74eb7c3eaa601e187c64888665b5fbc0970bde8e15f593e406a606c2a9f1a95f307c97ac SHA512 2048804999b3dc18291d46d7e808a3ea7a6cf86e69cf9b5ebd18dcf66e7b1c551997030429cabd1cc53ad477add853c552a83de98a7e6579b5de779090b1aceb
-EBUILD sc-7.16-r2.ebuild 1393 BLAKE2B a75d23ce8024943e3678d82004f5966eccb080109d6536b646b503983426d1b27685135131129c61279c4be9927bd7e82b2857a22144276cda72460bd788d2e7 SHA512 e81b51073d8a7b0ffc66fc9cb6d2abbd23a12480bef111007d04774c99a9644208b2804536a41f8f937d02da334c7599331f33ac27039e6e461417ac4a589e27
+EBUILD sc-7.16-r2.ebuild 1389 BLAKE2B 2ba7902e4a00de984c48aaf33e5ccba382f01b5a004f763054690c6d9b20cfc65575910b3ed1bc0367499b6f08a39da89ecc817f931b2bbefbb1f96f0cce285e SHA512 b2959e7e82a5e4798cb9da705f6fc10e860edf7ebb1629d2af46606b2b60af8eec75c652ecb5c99e0c0cc9ed98421fc2cfec5573fe211f2aea84e10b8c46f1d7
 MISC metadata.xml 305 BLAKE2B a30ed0bef58b07807c1bbc48c8530277e2ed3f36c4dcc2c5f3cf39a0aebc8983297660d7116c747a97d31db38df8b3ec0c9ce9c87d7d8cde724bd4c56add283d SHA512 b023b745f213339706f73ad2404536ce259461346d33a182aed31d9f7904fc8e392629794561f133953cbe22010b1e2b41caeee56472a6ecda0444f6594317d8
diff --git a/app-office/sc/sc-7.16-r2.ebuild b/app-office/sc/sc-7.16-r2.ebuild
index aaa70d2052d7..e1a756d7a2cd 100644
--- a/app-office/sc/sc-7.16-r2.ebuild
+++ b/app-office/sc/sc-7.16-r2.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
@@ -10,7 +10,7 @@ HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
 
 COMMON_DEPEND="
 	>=sys-libs/ncurses-5.2
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0b0ea64b616d..96c4b397584a 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,6 +4,6 @@ DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef66
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
 DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
 EBUILD scribus-1.5.4-r1.ebuild 7187 BLAKE2B 477cbf6e32b2b05eb2a66429fc80dbee31733bb80b035b8b52a0c830415ccf75648ecaf5b9f3e1c002aa6f2414cef2f83e8d5bd0711172ab8d0ba683aa83ee02 SHA512 be389ba247a5e4ebc583314c13b612bd7e7ff5496683cc373b35df84bf2fc38441435db5bcdbf6ca986291d1aa99eca80eb01f7ef324c27d5ba1e5e6c89e4b21
-EBUILD scribus-1.5.5_pre20190124.ebuild 6973 BLAKE2B c5d81fac259694e33229d99b73244c65517145f8be5875aaccfcd9e51cf68c443155b9f9bfc2a0cebc08529e203042b518a5a6f439facf2116f8fc969345d729 SHA512 1d31fd037e90a5539e2311f34e3afce6f7f791c38617e148a30ed0b0d7084f5159888382b7049c009fb91af56cb0bf9bc3051d06b7bb155398d16e7d6aaac40a
+EBUILD scribus-1.5.5_pre20190124.ebuild 6978 BLAKE2B 1c9d361d951469c9a6fd54e74c663805d13774f073d4ac505c2e2cd2b9b8297663e97a26c9665036fa81252261dbeb1ce52a8e2f63d81df53f07b44bbd78c3a4 SHA512 ae561d07c870292f3dc67ba769a14c0ef26ff59946bf46985e7d62728a334d959b4b644686ca0267f711264dd3594fe9b96cebfa1ead8c48cefb3d29ccce2256
 EBUILD scribus-9999.ebuild 6870 BLAKE2B 1fb6ae7e846178429e4c4380d7d8d50addf2eb9e9eda75caa23448eb31e3dd65d5eed2382a11274bad92949b43d063a24446f119b2a38098a8788dc99878dd37 SHA512 904507847c4fbce1f80748ad754685df086b27cb3f28c62aaceb4ede07bc16a6011c9508c22a798dda57a9f6aa0a3f59ee5c611d5a640f8e1ad43ee24217c7d6
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index c926514f24cc..011a8953706a 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.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 ~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 2fe44edafe6e..b26ab1c10260 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,6 +1,6 @@
-AUX skrooge-2.17.0-noqtwebkit.patch 783 BLAKE2B 681447209c263fbfb3def61a5b3ef7a98a4a431bf7d9c4ab00f8e30df97f9447e0ca125f15f7b8cfaa1e8cbc76d928cedf055c46709297af550435b8e16b5967 SHA512 e42fb804dd941ea190ab5d2e9e9c556b206b85430a60308f5fb0ecabf66a4bb9659fa40d9bc187ee52a48be345f6ff003182d02842847db84c83c6d69068ab62
+AUX skrooge-2.17.0-noqtwebkit.patch 1093 BLAKE2B d0798788899494bf794b2b7859ba8313e94d1c61b9b9b72a989c29eb02c703aee3aaedee474b2596077fd685f1206dfc187715af295c2425b65b66213bca8496 SHA512 6f745a69beb1e41a73a058940d12609c2dc0d990d777b410b2c8c269e9e314e03f3442cf58277f95229e1bf54f3c54ac90b21b497d0039f3deda6bd86e7dc3d5
 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397
 DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47
 EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e
-EBUILD skrooge-2.17.0.ebuild 2579 BLAKE2B 619aecc69ca29e7cc6ae1c04691566b18246904d3e76d97b7e700be4226c653dc9ecb803428831e2fe89b7efaee5133c1bc88828605417ac10e27d5016fa27ad SHA512 d18c09c8d4c506d47025af5c80f49235bd2f08c7a24a5ee379c8ec455c43f644169a4b6c0cea2546cc17bcdddaeca69639598a1152bc5265f4e3f96b680175f5
+EBUILD skrooge-2.17.0.ebuild 2534 BLAKE2B 26757a0ebe2a5cb9ffbb2797b18eb07968b7e54ad8ff353c5d3989ceaf3e5b2ed948ead8e5d63189137eec29511c23230369edccf44ab9c6a10f1f9033ee82b4 SHA512 7f35aefaafb18774ac51fc7c742ba6738e2f7a53884fbb9e13f305665f2211bf470caba81a9bca720d05000d72163d647bc55cb06a5326c59dba94e73ff40107
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
index cb56d16388f5..588c4c116e0c 100644
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
@@ -1,28 +1,36 @@
-From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 24 Jan 2019 23:20:09 +0100
-Subject: [PATCH] Fix build without Qt5WebKit installed
+From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001
+From: Stephane MANKOWSKI <stephane@mankowski.fr>
+Date: Sun, 27 Jan 2019 17:13:28 +0100
+Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal
+ error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575
 
 ---
- skgbasegui/skgtablewithgraph.ui | 5 -----
- 1 file changed, 5 deletions(-)
+ skgbasegui/skgtablewithgraph.ui | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
-index e1a3058aa..df93115f3 100644
+index e1a3058..b00273f 100644
 --- a/skgbasegui/skgtablewithgraph.ui
 +++ b/skgbasegui/skgtablewithgraph.ui
-@@ -151,11 +151,6 @@
-   </layout>
+@@ -152,11 +152,6 @@
   </widget>
   <customwidgets>
--  <customwidget>
+   <customwidget>
 -   <class>QWebView</class>
 -   <extends>QWidget</extends>
 -   <header>QtWebKitWidgets/QWebView</header>
 -  </customwidget>
-   <customwidget>
+-  <customwidget>
     <class>SKGGraphicsView</class>
     <extends>QWidget</extends>
+    <header>skggraphicsview.h</header>
+@@ -173,7 +168,6 @@
+   </customwidget>
+   <customwidget>
+    <class>SKGWebView</class>
+-   <extends>QWebView</extends>
+    <header>skgwebview.h</header>
+   </customwidget>
+  </customwidgets>
 -- 
-2.20.1
-
+cgit v1.1
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index 063a50e94080..2aa99f0b78df 100644
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -77,10 +77,9 @@ RDEPEND="${COMMON_DEPEND}
 # hangs + installs files
 RESTRICT+=" test"
 
-src_prepare() {
-	use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
-	kde5_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index db7b0aa5b0cb..7d5b89474a08 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 6da594c14e7e..24dd2640f055 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,5 +1,5 @@
 DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
 EBUILD pilot-link-0.12.5-r1.ebuild 2915 BLAKE2B c2f046807b4e573861361f522d59c318e800114095addac35d7f08355e7152ca35f5d4ba3450ed23ab42df1e3aeb671a6cc667567a8111a3053e42ef344c5dc8 SHA512 9376978300128ba5b930a36a497c4f8ce36640ad6cac9b0ca1412fd285f9202cfba1254f95d2157068cf42f66f44a16b73fc5bd0d59896a3b9bc88fef12acf57
-EBUILD pilot-link-0.12.5-r2.ebuild 3064 BLAKE2B 8dbad643c3855415b7e673458f7c624a90ba12f6b8609afd54b8a87bca58bca951163305f08fc5e2eb4eb0f208e5ff3c0c653f68f68aacc36becf37ca7d49d62 SHA512 f221e381a64fb2307081fde04a416c43f914e1486382a016696a1335caeb493bb908fc2852fb6a0f4944a9e2467fbce360ef8fa0fc78511caad37e59c75ff90c
+EBUILD pilot-link-0.12.5-r2.ebuild 3089 BLAKE2B 5dde51f06d2f15d4e2abb8985181212e0ca7f8c10b51fd43b625f05766772ca78a48425c671ff8b4688829bc72b3f519a412b113dfba6d540ece5b5de0e30fab SHA512 8a6d5528d8882cf1c17b72df76bbaddc183c223cbd7f4ae1435ed919d698fba8c546fd5da47cc2bc97d8ca320fe256e872bf330d2223faaf716c109a88575d62
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
index 0c758b2a6338..42343ddbfde2 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-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
@@ -33,6 +33,8 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.4 )
 "
 
+RESTRICT="test" #672872
+
 src_prepare() {
 	default
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 131cb6a18941..d07df00bb3df 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index eb789e7ef9b8..e5bb9a610224 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -7,5 +7,5 @@ DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
 EBUILD portage-utils-0.64.ebuild 1296 BLAKE2B 32d3375e708bb4e55f2addce4366d88289b47d928e9c331ebbe559f7954f76bac2240a90adcbe1b9f6828b54a20765810ed3d663a4972b3aad6b7af65a2b2c1d SHA512 6ca693b29d59ef4b46cd2179f92fe200ed846611d785e6440d94beb62190a53507d88560bdb852b7a0661c3ccf1ad616c31706710f20a4769fd6d8a3c469fb7c
 EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
-EBUILD portage-utils-0.74.ebuild 1070 BLAKE2B 19f53675759986f2ac29011321e1d06b23303f4ee1d0cae81369bc06d0856b9f10d547a338b7f37cb9a009f5265fd5079c700c692f85478a24c68e99d8c7e9e4 SHA512 00691ca3df9d56767f787604517bf73c7b42f844d10289baf80ce0bde79f9c935411a8b2fb024aaacf1ce63b558af03342b2bdf313d9378070f45015f9dbf2a8
+EBUILD portage-utils-0.74.ebuild 1068 BLAKE2B ceab61d296e01159ae80d9fcb0864cb81f7c314a30537991513202d1592597d7ac6125435d84850363ca8cabcce46320fb6736e20d0b7b0ab3bb009b551b7907 SHA512 fce8c36716c53d7f76c44b35254e4a4670e2a3805e130263ff72130fc9dcaea05a0902afb426e84602f1d6bf187a539063227c5d4ccdc09b2a8a2c28b586dba3
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index cb0eabec9f42..3eec03bd63ca 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d71969187387..75fd2d9ed524 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3617fa2e924e..5918a322c12b 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -373,7 +373,7 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
 EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
 EBUILD bash-4.4_p12.ebuild 7127 BLAKE2B a5909b73ff2daa32a6e3af1f25f15b3bf1d9cb0dc1a176a8826f2d47d370367ec91731b062f1916f664edca442cdc91971fee227ff51f0a80d53d1ad146011de SHA512 92233876cf54b44c82ee67e4b56089a83b589a5c2570f3a1d53b1b647e29ba498c5a7128bf7b1b6efc9384c8ebb0afe7843373a57a016066260de546d8d90eba
-EBUILD bash-4.4_p23-r1.ebuild 7386 BLAKE2B d6c39d6108a74bbf6fa49446f373ebd1d61c832dd1a4e78a1de44bbde23ef8b53bb1ee99f1668ad88c3662bb66d25a49dbc512ac92ad87e7a44b6ad9c1b0c6da SHA512 f7467e10c43ee718420d170d2f5b1c9eafe863ce5e221d7283252977713a694a46e6432ca484e8bcd669e02b055aed0367f55cd7be8bd63745f3dbe1dc898837
+EBUILD bash-4.4_p23-r1.ebuild 7384 BLAKE2B a0f4af7f005a835afb706f7c70a25678786f6ea4e372d481b04fb86f840133527cb31ad1350cabd30da4cb31ee63b45ac2054b94a0fa33267fbc09554462be09 SHA512 ffecd6f68bd742b78dd1d06c3d2f99ce31735f50c0e3f36778679d55275c96789b007458987b7cf0fcdda3b89591b5e7f0fc5939f11f4de12e984690ace2bae6
 EBUILD bash-5.0.ebuild 7332 BLAKE2B 267bed85678ff687485811fd399403d4224874b41873c27ac1af9ec84b79c7f74e7cea281dd9e90f1ec5537b77c59849a909991f17897cff30b7558886949eea SHA512 d48a77249bf2173242dc81fa37ee933b34a574c129dfa0a3fdda9c5fd405004c8b29b731f331fbb8c456b012c4e9fa4fe4658ad8323665ffc1bedb77c5f2d369
 EBUILD bash-5.0_p2.ebuild 7271 BLAKE2B fed8e1be9d9378cb797a311c022315456c24b3435ae538f30713446a150c9f1577c59eaad3418b10fd5f5f89d7f220b8e13710d265c9dab97edca5e67391c5ee SHA512 864d8599f8dab8aa5cb315c6478458825466b347b5339b7029e9678e8ab0f3e7ac266a6a3be24c80182539902f1ce25b7edabe61ad4849dc5ffac1b49777a253
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index 86bdec0c2ad9..6d85bb7685dd 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest
index acb1799d3dbe..c77861d3a6ef 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,6 +1,6 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 AUX fzy-add-utf-8-support.patch 2642 BLAKE2B bdece2ab5d9122c9c2f306271b1c795c1130c145e3a434d4b831dd680bbdc09e5241763391fc2efa16a6af50cfbaf49b3fe98364f5f56a25b2d78af8fcba8a1b SHA512 203c0e8e7a9583661cd7d85cc094016eed2149a82fb55a578075e5d2fe513cbe2f7241ea76660e5990efd6b5f573f584ab3345ae832439fbea80950c64f7803b
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
-EBUILD fzy-9999.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
+EBUILD fzy-1.0.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
+EBUILD fzy-9999.ebuild 1108 BLAKE2B 74ad203c978e5057efcd8b4a0dc69c08893e4e79074e4cdc3791d721a645b79437dae4aea10871280e457a2625d936b183dbd4b7c9bb11f518df0d92b37211a8 SHA512 905ae14042d9cbfa2c17ba61cbf2f9eca83c1f10bfa8097070379f111de62d9c12759a3c96c6b191c43dfe1db0f04f0314a6a238ad376de39c9a496644f753a9
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index 5ae58b36b8b6..a3c83e613fea 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index 5ae58b36b8b6..a3c83e613fea 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index d444adda17e8..9c2c31cba097 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,3 @@
 DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
-EBUILD loksh-6.4.ebuild 613 BLAKE2B e3d3677ccb7a0dfbdc1f089e48b568da0ff2be45385d948aeb35bef7b1f6ae3fbc272f7b51098af9083339180e81e313d2c10e7792016de0351648b7eff36462 SHA512 0a63c2ba6be2e9ce194796abadde741238f8a18695386ef4a884f8d9d7137b6cf58486e86a2a7600f4be61697d017cd976cb0522a9f94a0be4e7ab5a2e4e9231
+EBUILD loksh-6.4.ebuild 620 BLAKE2B 0ac882c2c726d01536b191d54573f188d5353d7f9c269e492bd7b0885032ef433591e5d02f23d7c24e994a950494b72e2e6f9c036eb3b68251e3c631e53f9a59 SHA512 fcc94d5db4969d0bc231a46f5d0ff59cd9d1507aad1b7b0462729817ca1ae7c37160556e5122985ce7228e568c07c37a680195177754375a53cf38996940612d
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.4.ebuild b/app-shells/loksh/loksh-6.4.ebuild
index 1e5d4a69359b..b297e6e61ac3 100644
--- a/app-shells/loksh/loksh-6.4.ebuild
+++ b/app-shells/loksh/loksh-6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 14d188657720..e7f2d207edff 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,8 +1,4 @@
-DIST mksh-R52.tgz 383814 BLAKE2B f0563f19a3ba3b32e075bfb2d3db3a03ae9ada129d4b514573aad65f84ffa0d92a81a09baae0744e75a3d82d774a640dbd3a04856ccbdc7781ea3a1cec32efa8 SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285
-DIST mksh-R52c.tgz 386254 BLAKE2B 027cf8e2bff4b8cc00ccd574a8a11b0e5d0164d9e59a9ae18c1684a2b0f7c45ccb342d1cc0f8812b42c656a6e253cc24d14e25f55c1bf12d6f521b3f72bb4cba SHA512 f2434f2e165da290cc3f5d78846fb4774115a6e35ef3299d0343b1797b3773921d614396b0da78f8e9a451d6029df9abff503575c5cdcb232e18df7731d18da0
 DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
-EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
-EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/mksh/mksh-52.ebuild b/app-shells/mksh/mksh-52.ebuild
deleted file mode 100644
index a68670f3d6d1..000000000000
--- a/app-shells/mksh/mksh-52.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-52c.ebuild b/app-shells/mksh/mksh-52c.ebuild
deleted file mode 100644
index fd3888862257..000000000000
--- a/app-shells/mksh/mksh-52c.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	# we can't assume lto existing/enabled, so we add a fallback
-	sh Build.sh -r -c lto || sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c539fb62c85e..2a10b19ed13c 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,8 +1,12 @@
 AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0
 AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
+AUX zsh-5.7-fix_infinite_recursion.patch 1102 BLAKE2B b5bcf1cec800e83726479be36525870329e6543220e58b72c9a9ed89d9c28f459fc5fedea2986a8e6b89bbeeb303e4d9a1e00e3ab2a3602e9c09389d745a9a16 SHA512 f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
 DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
+DIST zsh-5.7-doc.tar.xz 3062428 BLAKE2B 1ee818fd3625c3c96add6fb8f0ccb42dd05eeb33b4f4513e4e436974f835465fdb9dd4092c652bcda24762bc39307946e14c4969e03038ae43f77c24871a5449 SHA512 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
+DIST zsh-5.7.tar.xz 3124708 BLAKE2B 6b3822d3bb647aaf1072b9d499dbe9a65dc6cec0b83fb7fb09050e26bcc71fc0fb2846a1b754f9f206b602632add39e52465c1092f131f9000a149dbd2b469de SHA512 cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
 EBUILD zsh-5.6.2.ebuild 5849 BLAKE2B 4e665d07154f52a0cd12ed3eb5b3b7facf5dc802f2fbb8faeb77b33c897c9aaf05f843f3670b09b92ede76a1d34b0f4c30469b1e07a176cbb9cfafd9e8340bbc SHA512 0552a4a7dd72536eaf8371cbfc5a2c7e479c93e3632bede86803b7073cf31f293f77668e19b3101957cdb2ce91f10ac7b955b36c61b6ce77c4fabff3ead4f0d0
-EBUILD zsh-9999.ebuild 5862 BLAKE2B 8a4e5cb785e200bd3f60aba78cc74a69e05345e26a82c88e36a734542ebeb81b425af6d98da77514cac667e93acc2e00c5beeac208777890371c108a311dd229 SHA512 2d55595c2a9184ee6fe478e21f2e999fbe286bc9c208830de718cb41757e024f759a7697301e78a2d42784ee917c9944c6aac0c5aa82f82e22ca01a395f86739
+EBUILD zsh-5.7-r1.ebuild 6009 BLAKE2B 5bf15af8a761a17510505bf53bef50ed23a115194db4e22e30440aad51a83841a08da5e00bc146efa56b92872f4f557821f3501a0a40e32bdcfc70d709e784f5 SHA512 1eec250682c62a4fad3fc52d1d5ac28281cbd7b284a52120d42f921ff62d4607b87f396a920bcb0014e867a03195366fb1fa792fc5441d8b781bd3b90ff7bc72
+EBUILD zsh-9999.ebuild 5947 BLAKE2B e3e0d42d2e80a8329ad215408a5c2e8a6b16451e030b4ec57255d1911ca4fd20bf91f80a922798947b8e3d1218195bda77dd104158af20fa821c08e55537f219 SHA512 041f7afc610f666384665fa3da6ad27de66d3a3353a6fd5b7192032a24ffe0e042c06903b3d12be157e2c0176857b5169cb4cf21b2aa2a302d9bbe2cb2e1baad
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
new file mode 100644
index 000000000000..042b948b23d7
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.7-fix_infinite_recursion.patch
@@ -0,0 +1,35 @@
+From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Sun, 27 Jan 2019 00:26:31 -0600
+Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
+
+---
+ ChangeLog                                      | 5 +++++
+ Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 81668ccc9..be243c1b8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2018-01-27  dana  <dana@dana.is>
++
++	* 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
++	infinite recursion
++
+ 2018-01-24  dana  <dana@dana.is>
+ 
+ 	* unposted: Config/version.mk: Post-release version bump
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+index d171c68ee..5ec21da9f 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
++++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
+ }
+ 
+ 
+-(( ${+functions[VCS_INFO_detect_p4]} )) ||
+ VCS_INFO_detect_p4() {
+   local serverport p4where
+ 
diff --git a/app-shells/zsh/zsh-5.7-r1.ebuild b/app-shells/zsh/zsh-5.7-r1.ebuild
new file mode 100644
index 000000000000..113f397ad17a
--- /dev/null
+++ b/app-shells/zsh/zsh-5.7-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+		https://www.zsh.org/pub/old/${P}.tar.xz
+		mirror://sourceforge/${PN}/${P}.tar.xz
+		doc? (
+			https://www.zsh.org/pub/${P}-doc.tar.xz
+			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		)"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	!<sys-apps/baselayout-2.4.1
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == 9999* ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_infinite_recursion.patch
+)
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# fix zshall problem with soelim
+		ln -s Doc man1 || die
+		mv Doc/zshall.1 Doc/zshall.1.soelim || die
+		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+		# add openrc specific options for init.d completion
+		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+	fi
+
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-etcdir="${EPREFIX}"/etc/zsh
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+		--enable-function-subdirs
+		--with-tcsetpgrp
+		$(use_enable maildir maildir-support)
+		$(use_enable pcre)
+		$(use_enable caps cap)
+		$(use_enable unicode multibyte)
+		$(use_enable gdbm)
+	)
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf "${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == 9999* ]] && use doc ; then
+		emake -C Doc everything
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+	insinto /etc/zsh
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		docinto html
+		dodoc Doc/*.html
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 6b7bbf5c1e4a..7455f1937729 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-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=7
@@ -12,7 +12,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
-		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+		mirror://sourceforge/${PN}/${P}.tar.xz
+		doc? (
+			https://www.zsh.org/pub/${P}-doc.tar.xz
+			mirror://sourceforge/${PN}/${P}-doc.tar.xz
+		)"
 fi
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
@@ -58,7 +62,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
 	fi
 
-	eapply_user
+	default
 
 	if [[ ${PV} == 9999* ]] ; then
 		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a01928d63a48..726f5e54f481 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 3d9cd62e8638..cd3fa5e853d5 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,5 +1,5 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1565 BLAKE2B 321a8fb7c20cf54eaee41da434d1d053c5b82d7285b469573c7e4d7d1986ffb865664f19eccea3b1b3dd9b1ec3fef8c084dd77039720cc3864fa0bebd3ccf735 SHA512 d4f5996b503f9307ccff06b8e3af81b24d37ea5280596146fd9faa48bef2f07638070f59f4e5a7e0e2bde4d9e470d865e91e772cc4e396d18b43a9752310ae04
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1561 BLAKE2B fbb5bcb09fee5b3dd50c81338ac09011d6f92165423f23bf8af0363a276a6f03892efacaa7c78a31e297b9b7f13de8f869c32ade38d5209c9741e4700d67e1c6 SHA512 46fdc7be06cbc42641e50bda218fa9bf067f7304b4f8a719fed8d5e59f3165a2752482b64333fea50f93e4257fa2295b190f6aabff4092c1a430a5e8a3da54c6
 MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
index 2cf6e40311d1..fb5677d34ce2 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-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 is blocked by Gentoo bug 497052.
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
index 96ba3647c85d..227d8adbf6a1 100644
--- a/app-text/docbook-sgml/Manifest
+++ b/app-text/docbook-sgml/Manifest
@@ -1,3 +1,2 @@
-EBUILD docbook-sgml-1.0-r1.ebuild 571 BLAKE2B 1e4bb9bb1b1bdc2c1ba7fe39553832b2a2ae85e58614e294aad176e4e7a202ef7cc0708da95338f6ede81f42514c6e64dc00428635a43ce24918cb0782684772 SHA512 1f7d016a6026715c021f9ccb01324c99389c91d52e648c5d5085d0df3cdcf56f3d15f1707a54aeadb45d853abaf82e2555976482b30fe7c106d5df88b19e2b7b
-EBUILD docbook-sgml-1.0.ebuild 568 BLAKE2B 21830870bfdf71613c2b6e1597b93573dc4fd35a6eb072320c8981db54a350a06c6f99c3ec546b8ebc16b1d1ea3fb2af47fbba749c24d077f8d1656ce4f60dcb SHA512 be3ec3040ae17bc95db4f68cd3789d84f57ee22ea731a650de79ac961d3545c69ffbff4697886184bf68ee2ed98692bee2cdbde1df88cba5bdc7e1a6d7a8c2f1
+EBUILD docbook-sgml-1.0-r1.ebuild 557 BLAKE2B 03a73fce2b117fcdc0edee1fa7444b05df6ed6dcbf97f8e3d7c18d3f211ea4795324358ecc7f94d6d5fdf402c698650c13014318cae84708643a5f300d9f82a4 SHA512 98b7ebeec8ab5a8ac8ff8a424c8e7184d54cb84df030b0be3c1539d5d18b363f34fd55c500f8dd3667da4a0c4f849e1718b0a238608d1f9c7cfe95275072d3a6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
index ad54610f23a3..aadcacdb95fe 100644
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ b/app-text/docbook-sgml/docbook-sgml-1.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=7
@@ -7,7 +7,7 @@ DESCRIPTION="A helper package for sgml docbook"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 HOMEPAGE="https://www.docbook.org/sgml/"
 
 RDEPEND="app-text/sgml-common app-text/openjade
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
deleted file mode 100644
index 88cf25ee6cbd..000000000000
--- a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A helper package for sgml docbook"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86"
-HOMEPAGE="http://www.docbook.org/sgml/"
-IUSE=""
-
-RDEPEND="app-text/sgml-common app-text/openjade
-	>=app-text/docbook-dsssl-stylesheets-1.64
-	>=app-text/docbook-sgml-utils-0.6.6
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index c97bcb99641e..36c77d9531d8 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1295 BLAKE2B 5b3272e0974907c12c4bfc87cd4ed918831066d78e81ceb4beea7f3d7d1cb571ce3bdcab09188e9a13516daaf6eaa16efc595a7b1badc5ca4fddf2f01be6d02e SHA512 0bcd7a13d6af039c90e8ffd9c34f88c50ef83153245bd786c5aec474a0894a483dc81b471a495b9ffd99c76b7cb7b779b2373247d7aa2685bead65ce740756f7
+EBUILD dvipng-1.15-r1.ebuild 1294 BLAKE2B c4bdfb2b64d8c81b410b03cc1044e62047f000720d00a48f5cbfc7340c39a6c6b0a5080bed826434a6b8d146e765dd7b9a2985ce5ed45ddf895fb94b350fdd46 SHA512 74ee4cd8c6b6e1e85dedf0d70e70280233d76032167c4788a2e4dbabf70d40d675c89f3b906ad88d0527fc93f9fa1a6484d4960391ccda672a2d575f57ddb86f
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index 4f7f255a1b52..ce06c6f999cb 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 7c820c985b8a..6211dc45c275 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -4,8 +4,10 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
+DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
 EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
 EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
 EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
 EBUILD enchant-2.1.2.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
+EBUILD enchant-2.2.3.ebuild 1171 BLAKE2B 73259403ac20a282d251d9941bd2aff8dde977aab3a71766b896e7e57d2e52c8e95eeb8c4688630b8a9960fc7ab4d03a433878a92ccdd93a67129052218e1ce7 SHA512 b270abe29c3c3f0c705a7c7d4f0115047386e89620212db4451b50284ec30a6a994f4e7c40035ba44e1471823b2842c49631744075eb52cd9d4ab93c6e76206c
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.3.ebuild
new file mode 100644
index 000000000000..b9445634e884
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+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 ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index c2aa68ea2f9e..9578db8569de 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
+DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
 EBUILD gspell-1.6.1.ebuild 1029 BLAKE2B e788cc6815412d4cfd157bf37700e38fd3604ab1ca51a2f7bd51c560a126ab5de9a9b8d1303d02f8da22de4207813693771469d0d80730bd91b6386559204073 SHA512 bceaaa706a10c980c184738664a0645c6e70d13ed3fd2a10e7ebd62daf51f502dc475794eb5782beb7f7bfa2f2a8974da8e4ef0fce76ab35e2b9d532a5c65100
+EBUILD gspell-1.8.1.ebuild 1031 BLAKE2B 0c22cda83a62fdea9ffd07cd5cf2c8635d38bcfc259bbd092572745687220f949391742a7d6c8574c8bc8c70a2bc8945b41a30c1c92c688fb020e06941b0fd5c SHA512 822f18b8dc5fe96a150de0482d304263ea3ce75b21afed141dbdd242db1739eae1acc5797a3535c50e1ec710310d59e6ad0d10b11b0d3ba6c162aa278fe1136b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
new file mode 100644
index 000000000000..3226d1b01c67
--- /dev/null
+++ b/app-text/gspell/gspell-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-2.1.3
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 18ad7b200507..e8fec5ccea38 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,7 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
+DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
 EBUILD gtkspell-2.0.16.ebuild 942 BLAKE2B ef168b07393e46a98497b1fa3a7d0e999af3d0a943a72e7c1b07eea830745ea6f56c7b1d6f9da3c392ec76fb56fa9ceabcc01ea26d5880ead6d281a0b5088d63 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53
+EBUILD gtkspell-3.0.10.ebuild 1073 BLAKE2B 63ffc838848ab6585ade092b37e11c68148d73ae15a8fb8248eb799aaed0ee2f9b80f99a13d7b0692dd37cc065075176640b85884954128147e11f8e6f5dc5bd SHA512 ebe3f1f432f0f12c256c9f1f83f5dfa91c96c042764814ba68766cfc8ebd2d3decc8eea143f3fdba659234fa60a42218a64072868cb4210c0abfe8d20ad87df1
 EBUILD gtkspell-3.0.9.ebuild 1073 BLAKE2B 3ec89c21b8057ac6dc4db2e492b58044879f215611ee6c4dc5da55fe2ea5d5b4826d65ad3458b77029bb413426cad8c03e0cb46655f0493cd48b812b9fdcfbeb SHA512 39aaa3a31784ec025a8b6fd0a54cb7c05f7f5b346bb06062c8d467887977019dbe0131bf83c5e8e563a1c179977db821a03831df67d045d6ecf64ef734b406de
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
new file mode 100644
index 000000000000..a87cfe4fc106
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 vala
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+MY_P="${PN}3-${PV}"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="3/0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-2.0.0
+	app-text/iso-codes
+	dev-libs/glib:2
+	x11-libs/gtk+:3[introspection?]
+	>=x11-libs/pango-1.8.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 07cbe125d07c..3ed76313d660 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -4,6 +4,6 @@ DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c32
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
 EBUILD html2text-1.3.2a-r1.ebuild 994 BLAKE2B a6ecf556040564c64bba93dc0dd4d9fcf5060df5a6b9a487ea91f4b2b1fac6da4f4783910a86a98cc2e2c02c9f2ee19bc7ab9f7e40d0441f56c07f28b2979a45 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb
-EBUILD html2text-1.3.2a-r2.ebuild 974 BLAKE2B 2e2c23b127324b054e57c6d4927c43b39baf04fa977329f5b5a9f168f242d5ced6e2db251b6429d1aa4c020dcb29d6d0730606b21c711ab9909cd633d3f5aee3 SHA512 723302d8745c83cf48c1dc8406d4b6bf575b975164b3123ac2b40d5e882ccf7449709229975dc4bac23da0860ef86283749f4ac89be5ef68e30f5d344fbe12b5
+EBUILD html2text-1.3.2a-r2.ebuild 968 BLAKE2B 9e852176b6e2471af0681fe473d200f4e9b9a76d6d0bb938e2cc0d3e3c627c239e310c96d1c06fb1963195d954837ed231eed91f2f1e1ed01b52e6b64642522c SHA512 5042914ac32951cce2cc23394037ecae44ecb246b61491579fb9a2b6f08329f7a1788bd16e9675b70594882d250894874e97c93b2b23bdae0d0d85edeb7dcd4a
 EBUILD html2text-1.3.2a.ebuild 933 BLAKE2B 79617efc95c443681009563030126da8aadc589ae081b7162a700622367647112fae06271797923f0de4ed462aa4b89d17f2ab36084dae3edfbf67784cdb0797 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a
 MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
index f96c4819e230..f0f24d8c6dd1 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-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
@@ -14,7 +14,7 @@ SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index fe31c1db50ea..e957847b2261 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,5 +1,5 @@
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 722 BLAKE2B f41a4bfbc8f66da2208c4c3a85fdbb0e64b399688cfc43980f2dd7ac0eec1fb932a999674c25dc4938a797d4ead42cf5f875b39726cc8b01b0120a295c12b70d SHA512 f2514266fa029136b0ea9561033624aafd61a89ff51e9d512bb2046663495e2ee281d4390826f724184527c48e4a571a3a5c700c103b987f2a6f460edb68f60e
+EBUILD htmlinc-1.0_beta1-r2.ebuild 718 BLAKE2B 9f6f6208f9bb395c4db942f589fa7becbfe84c150bea3b0e3696273ed663255b380b397cffce873fc5e9440b2eddd6fc0552839c16deacc3ca018aeb2a926bd9 SHA512 8011704a4ecb7a97305058292c92015475189999d2e0bf551e8d983c6c8c8545f1d36346eb22d48aab6b9c1d59acd40c2137f58017a2fd5257a549703492566a
 EBUILD htmlinc-1.0_beta1.ebuild 528 BLAKE2B 34f15f9f94bfa769fbf258cc81b2878acc4c0c9c29b71de890291127c73b8cb1ae7e95973be9a6a46987b0c91aeab948829588afe17b6b1ee28e1bb76ca8684e SHA512 5cfd9473e10c5b0676c59376070438f8c2c21f5e8a9659ce19ac9ab951575262664f7a1fe3754743afe8f171b0dd7a03c1cd3f75e9eaa55a13edd8be47ed2d03
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 3a6d05570bbb..fe99dabe2c32 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.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
@@ -11,7 +11,7 @@ SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/htmlinc
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
index 8e5a0b7cb594..6b96f5517fea 100644
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@@ -1,5 +1,3 @@
-DIST itexToMML-1.5.5.tar.gz 155205 BLAKE2B 46edba14bc30ee06109433f3aff1d2449a0f9ff31d3c1c8a2541e0b6ec7d6f426cd230bcd3957eea758517972515a13daf21ba229ea382966a36dccf2612784a SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d
 DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171
-EBUILD itex2mml-1.5.5.ebuild 605 BLAKE2B d47ae666c119872d55730afb01a57b617aca32325bd0dbc2dcd4327498e06984ab8b2bc65a3de4ec3873b5fa346f4bcc68035b8bf5d38f4a6bc704f29c82b4de SHA512 8965086d25edbb6072494f70330010c19bbb0989c958c4efe9169daf8ac3fd4842189e6eb41c9ffb5345dd927f9134b967c0fc23d78587668484d019c3568863
 EBUILD itex2mml-1.5.6.ebuild 612 BLAKE2B 689cf14ca4d3a0f1fbd5eee37a42aafd7f50b2d1564e55fe00147ab594e06c9a9bba4326527a35d805b06c5d59c6648072dcaadea0c76232d8fa354fb306051a SHA512 15492c37242bef67fd24739c8b846aab0e45f3706ce3cec8d4f3c171f1747fa31c00fb5edc215a14e54126e403b17d6e4c25c3ef99617eeaa5c7f0c08e35a430
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/itex2mml/itex2mml-1.5.5.ebuild b/app-text/itex2mml/itex2mml-1.5.5.ebuild
deleted file mode 100644
index 205585e9b93a..000000000000
--- a/app-text/itex2mml/itex2mml-1.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="A LaTeX into XHTML/MathML converter"
-HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/itexToMML/itex-src"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin itex2MML
-	dodoc ../README
-}
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 8bd78a0bf010..0960816817e7 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,5 +1,5 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
 EBUILD libqxp-0.0.1.ebuild 746 BLAKE2B 442391082f776ce32a738301f1b979a21301b3db40fb8c7a5535c9e35bd7b913b189cfedb36c7bbab79bd8a1aaabdc4bba52c5bd90502996c0ce021f7203e29a SHA512 e51af28d5f65c24966d06bf89fac96bb8fb9b9c4a4b694692c6a1a35d544ac8e39b0be67c3e45551720f941488f4b7941211ed698fa2b29c3701cf2285cbe687
-EBUILD libqxp-0.0.2.ebuild 791 BLAKE2B 588537b7b9ff032603ab626503e2427088a295ed035148038b8dd14831b6e2965db7920bab3557cd95858cb579b00c92ca2ae3c3b88838c780e487734f8f050d SHA512 9f5ddf3a157cff50457ddef63636cb1b0d8c426464c80c61ebbe5b9a8d8d2bace584c5b0659bbb021fc8e9c0a035aa63d1cb28dba4982be1bf78f5a400816d4d
+EBUILD libqxp-0.0.2.ebuild 796 BLAKE2B 0b45d760aebd4b1b75ee46ee9f497f4042353bff363ab02efd3a87edd4469b9c14c35d2bb48cf2746c7a86b868130b1b2e829639424478736d50292c71f34643 SHA512 0663c2c2bb3993a89064910a7da742c9b7c1c05e9b8069b98742e0a4989c7a180976da94eff5901407ae102f8a70ab4dda5f93d00d21ec768c38d043b62e6c19
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index f1095915cd1f..7f26f61cd684 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 34b5d2621a59..4e53fa2c95c1 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,5 +11,5 @@ AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 EBUILD openjade-1.3.2-r7.ebuild 3700 BLAKE2B b80ec4f9088cfe7d15ceaa84fd14d640e33f48e8a718034e1d7812c25a8376d93b68ae4a7b3e73e7ea17f6ac91a59af227a4f22c6bd5720b1d43e2fbcc744e0e SHA512 5a7df1f6187b35f1ca79777ba33ccc50fce08dcf3528dbe4f8439034104da58152d6fbdb13f5f303bf33cf18ecbf5a1e6d3760c4a293c7bb1c08b0cc0bd70d5d
-EBUILD openjade-1.3.2-r8.ebuild 3713 BLAKE2B 8b0d77dfd1fb724f4af91bf120e73f982520ea55b86180c1e45415cff6676b2d8d3987867820105b539db5ccb8ffe1495682d73ad33bcc0e5e95cf8c88a3273f SHA512 9e271fc764e90bc592cfce95858e179d0f9bed6904ac2872a633006609fa15336b7aa557c953783f3d94f1e399e44006e683bb770c96e24094a2c5daa1ef3fb1
+EBUILD openjade-1.3.2-r8.ebuild 3712 BLAKE2B ce55471d2e2e73b1939f3a88fc454908a2a0b3b2dcaa3c210b684fd256e20893ff5c6419db606c68a42f449fa5da9342ff2d3971fdc950d002603109e484b871 SHA512 faa364ac6b268fa4f7fe48d31b5d125befee7e1eecf17a7f6154fa8abab41c714137916a50a31b1fdad248b07dae6f62d07cc78e16926c2fd00113926f363f32
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
index af2595cbebd6..975f0df40525 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 665351e01594..50d9497a4db1 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,4 @@
-DIST pdfminer-20131113.tar.gz 4080763 BLAKE2B 6cfe2c48f3294c6d491f47620fe0bd3b54daa5211c95b32db39c574485482254b7d6e61e461994706d364a8bfbcfa7776aa0a9dc2cd27fc26cf902ce794cac05 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
-EBUILD pdfminer-20131113.ebuild 650 BLAKE2B 7b8c71aa5a5f04c69d9d060f8e44ab7064c8545cc27b4f73d04ff9b5cc58187e933194aface3eac2e070345759ff3eec021cd64d220382cb772e4b617a41ec8a SHA512 14618d50ba8a7eefc9845b7efbe38ea178354f3d8b1775236e529795414ac799debbe32727ea9423bf196044d703add87f7f7afb7eb3e24089c046d3b9cfd1a0
 EBUILD pdfminer-20140328-r1.ebuild 691 BLAKE2B 3b663daca3079290a88be838dd6381dcd029f3209eefad30881b89e10f0c37169ccc84372b464333accd467885e2e8dec4dc164647648a9d6a1e8e98dca19441 SHA512 8d4a9ba66c8ea67faa802709c799971262c08cfafe72c12d8e2549aa4c5da81f56dc9b7510c354f3c77b33eb6c225ce5122c2f1aaa8c376c7e53fcf9626d4963
 EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20131113.ebuild b/app-text/pdfminer/pdfminer-20131113.ebuild
deleted file mode 100644
index 737235045c34..000000000000
--- a/app-text/pdfminer/pdfminer-20131113.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-python_compile_all(){
-	use examples && emake -C samples all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index f5d3b916b171..deaf8316dd07 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.54.tar.gz 2686485 BLAKE2B f33f1e27bd24e4429ef8edbdd999333714e9a50e4af2c60ccffec91098bf330776c4ee9de9b6d4cdb459b67a26a1a6e4b8a0ead7efa82fe97584405a15245ef4 SHA512 5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130
 DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1679 BLAKE2B 1e5ad4809bf26a0b6fc31b9b88e7aec0a639d7585693d19e0c83461dc10be62b999f6dd3b5375dbe1f81fa4133aa7ed51211a6ea9f467634a5ac6aeed8f53c3a SHA512 9faf0ae116996c07bafaf1fef5c9d6ae0c23b85e4ec813e363ed4476bb5d62f890c267c1360df3a42bb05fac94685f97f8ad51e3616b15491385246cd5137633
+EBUILD po4a-0.47-r1.ebuild 1639 BLAKE2B b87cf534057df8788fb681dd3475290ddd90066ca20fe87a621b36e21065743f0c211e5dae2aac4ce02f543b6b93acb7bc8979447f935e26555b391f68f817ac SHA512 562bb377b7d2c504247632f69d0ee3720b496e75282f4e96751bc46ee967476ca491312d848544d1b36e6bc1187e9659763510b2c30142d0a225fd8b425f87b6
 EBUILD po4a-0.54.ebuild 1295 BLAKE2B 30c5351226ff055e5c1252abc4be74b533b7c9a32927dbd99d25ed0d361668f48cbedc23edb915e9df9101575f984ee4d207511377f9f8288d9e0779dc647a68 SHA512 3738487c57b8376d993df7116dd181f3b5fb2a8d5b780e2490d311ece4ff269b097b3de83c35fde0f222551368f61e7b95d83840b99e8fd7ca9973b1c7116cb3
-EBUILD po4a-0.55.ebuild 1295 BLAKE2B 30c5351226ff055e5c1252abc4be74b533b7c9a32927dbd99d25ed0d361668f48cbedc23edb915e9df9101575f984ee4d207511377f9f8288d9e0779dc647a68 SHA512 3738487c57b8376d993df7116dd181f3b5fb2a8d5b780e2490d311ece4ff269b097b3de83c35fde0f222551368f61e7b95d83840b99e8fd7ca9973b1c7116cb3
+EBUILD po4a-0.55.ebuild 1297 BLAKE2B 1e4957e353bf250fe9350a60c3c106cd697122231b4f3edaad19e26d446f36013c01e619e37255f138bd98e758d965eb64f035ed1dcfb052362b7a55dcb9fcc1 SHA512 ad840f6d01112b838fd4666b4db171816bc1f726002f8625d4a42b65ed82594b31d7cc1f0c7f87a57201995f307a23b705c70a1072e8c9157b6b5a0ebd7e91e7
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index dcf757c2f2b7..48553f426ba7 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -17,20 +17,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
-RDEPEND="dev-perl/SGMLSpm
-	>=sys-devel/gettext-0.13
-	app-text/openjade
+RDEPEND="app-text/openjade
 	dev-libs/libxslt
 	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
 	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N"
+	dev-perl/Text-WrapI18N
+	sys-devel/gettext"
 DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
-	test? ( app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-		virtual/tex-base )"
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		virtual/tex-base
+	)"
 
 # Running tests in parallel fails
 DIST_TEST="do"
diff --git a/app-text/po4a/po4a-0.55.ebuild b/app-text/po4a/po4a-0.55.ebuild
index 45fe4908e046..2f7af51c8354 100644
--- a/app-text/po4a/po4a-0.55.ebuild
+++ b/app-text/po4a/po4a-0.55.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	dev-perl/Module-Build
 	test? (
 		app-text/docbook-sgml-dtd:4.1
-		virtual/tex-base
+		virtual/latex-base
 	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-man.patch )
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c4dc95634538..1042d88f7a8d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,16 +2,13 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
-AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde
-AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
+AUX poppler-0.68.0-bool.patch 1208 BLAKE2B b0baebfe06e4e140ee5918b521a792e87b57153f043c55ef1149af1a2c9c87302c9f7acaa19a21da1b3fc9f2399af68add637381da0d95db83105c11335d6b4d SHA512 85b7359bb4c3ac332afe0be1a0fd51d6249491b1fd97615604eb4d116d621a866b5c1b9febde52b54eb76c50706da8d43040a475a3ce5a0590be2904fa599e13
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
-DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
 DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
 DIST poppler-0.73.0.tar.xz 1507068 BLAKE2B d88a7595d0d8b779d623b56d8dc25c753f2cfc6f015092ec9d254a2b2d701d0e760a069324a15d3a03c65c9c85c3398ad142d7f8cc259e5455f53b4d391596d3 SHA512 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a
-EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
-EBUILD poppler-0.68.0.ebuild 3481 BLAKE2B d5f6d958d65bc86c9c80d6850cba3bf472ebc0249169c6a7af0e1f66faeeee7cf634e82d0096a0cef3bd82ebd51138d658092f5569bc65637ed88f85de73161e SHA512 d49dbe9a37d399097cfba2e4c96dedd8df5a6d162e687f1d50406e59cd93f5420a1b0122869e233d197161834d8fda54ca2ec044b76efcc46b6dd89f1c6795d4
+EBUILD poppler-0.68.0.ebuild 3519 BLAKE2B f32a7ea6a326f046e0295c381a625ae32e17b140b6055bc5a7a1cf651337c36537d65c40fce39fc379339c1d737a929e92f96056d0f338eef35fc6da817af067 SHA512 81e0874f4f4beb316ba8b24eee1252fbd486d96b44ccf150372cdcd46d7c97a54f116bae7544022f4ca3da0e9c3a00147806eaf18c22396b85f5f25356e699ca
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
 EBUILD poppler-0.73.0.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
deleted file mode 100644
index 6808e91601dc..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-glibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
-From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
-Date: Fri, 15 Dec 2017 16:56:20 +0200
-Subject: Honor configuration for building glibc copy of strtok_r
-
-config.h didn't get included and HAVE_STRTOK_R was never defined.
-Now getting via glibc.h.
----
- goo/glibc_strtok_r.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
-index e779bf5..e323bc2 100644
---- a/goo/glibc_strtok_r.cc
-+++ b/goo/glibc_strtok_r.cc
-@@ -50,12 +50,15 @@
- // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com>
- // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com>
- //
- // To see a description of the changes please see the Changelog file that
- // came with your tarball or type make ChangeLog if you are building from git
- //
- //========================================================================
- 
-+#include "glibc.h"
-+
- #ifndef HAVE_STRTOK_R
- 
- #include <string.h>
--- 
-cgit v1.1
-
diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
deleted file mode 100644
index 789090cc9b22..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Sadly the CMake side of openjpeg slotting in Gentoo is broken.
-To reliably find openjpeg:2 we need to use pkg-config.
-
---- poppler-0.62.0/CMakeLists.txt
-+++ poppler-0.62.0/CMakeLists.txt
-@@ -193,7 +193,7 @@
- endif()
- set(WITH_OPENJPEG FALSE)
- if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
--  find_package(LIBOPENJPEG2)
-+  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
-   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
-   if(NOT LIBOPENJPEG2_FOUND)
-     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch
new file mode 100644
index 000000000000..a2d8ba7bd402
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.68.0-bool.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/670252
+
+From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001
+From: Ed Porras <ed@motologic.com>
+Date: Sun, 26 Aug 2018 20:24:23 +0200
+Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib
+
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+---
+ goo/JpegWriter.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
+index 16c97afe..26fa77a7 100644
+--- a/goo/JpegWriter.cc
++++ b/goo/JpegWriter.cc
+@@ -11,6 +11,7 @@
+ // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
+ // Copyright (C) 2017, 2018 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2018 Martin Packman <gzlist@googlemail.com>
++// Copyright (C) 2018 Ed Porras <ed@motologic.com>
+ //
+ //========================================================================
+ 
+@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
+   }
+ 
+   // Set whether to compute optimal Huffman coding tables
+-  priv->cinfo.optimize_coding = priv->optimize;
++  priv->cinfo.optimize_coding = static_cast<boolean>(priv->optimize);
+ 
+   // Get ready for data
+   jpeg_start_compress(&priv->cinfo, TRUE);
+-- 
+2.20.1
+
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
deleted file mode 100644
index 568a800956bf..000000000000
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	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/73"   # 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"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-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.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-glibc.patch" # bug 643858
-)
-
-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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed '/^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_XPDF_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_GObjectIntrospection=$(usex introspection)
-		-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)
-	)
-
-	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-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 2c3f948431bb..e2839fc0c540 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/79"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${PN}-0.68.0-bool.patch"
 )
 
 src_prepare() {
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 30cd8d698bc4..55dde53c5b42 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,6 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
-DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
 EBUILD xmlto-0.0.28-r1.ebuild 1530 BLAKE2B c0435791043c1c0c5f3ab90b90b6e5e1190d53e108c41c13c7952498cd76af41e36af22aeacf8b6b254ffa472afa477a43934dfdf2eb40b494011d8fb89cf238 SHA512 8c922e63f42b23db4afb8779fffaf40f2af039a045d7e9b066311298507a3d4e112ff2ffdfba84a964967bf42bef03bf45877080e705f71d91b0fa96ba5dfd9d
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
deleted file mode 100644
index 5f0b782929a1..000000000000
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	app-text/docbook-xml-dtd:4.2
-	app-shells/bash:0
-	dev-libs/libxslt
-	sys-apps/sed
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
-	|| ( sys-apps/util-linux app-misc/getopt )
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	text? ( || ( virtual/w3m www-client/lynx www-client/links ) )
-	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-# We only depend on flex when we patch the imput lexer.
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-}
-
-src_configure() {
-	# We don't want the script to detect /bin/sh if it is bash.
-	export ac_cv_path_BASH=/bin/bash
-	has_version sys-apps/util-linux || export GETOPT=getopt-long
-	econf
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 2a904cfcec99..6ac578584f61 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
index fd1ade8e02a7..ca7835f14f52 100644
--- a/app-vim/ferret/Manifest
+++ b/app-vim/ferret/Manifest
@@ -1,10 +1,5 @@
-DIST ferret-1.4.zip 38210 BLAKE2B 98aacb570a13a5b90c2eda14457c2e28febbb6de0aea6084af66f89e87ca394aabab2fbd45590e69e44f5dd98ca5664dd5ff00bd9ce28d5e6a682522ed28c1b5 SHA512 e4dacfb996c98be2ae922520387b2b37511fbe33cc934fe89d1bc3096682d74e649fc6a1ba469e1e2efe01bdc11526f0f72d06354b28fd74b884db215068655b
-DIST ferret-1.5.zip 41822 BLAKE2B 934e6bc99d1bce09701f9d15950a7a7fe53255f2b3046faaf0544d6f37551d28c638897d63944503075b54584744256579c3755915aa5d411e6d46e42d220948 SHA512 50ae3cea72b681507f76e7fde4cb5712305bc3b9e3a98d9fbfb3797d8834d7792967e76d87435442b7809b800c739108eaea1da52c7c5c7495710b564a41718a
-DIST ferret-2.0.tar.gz 33070 BLAKE2B 11e00b2b9f09238b6a598b9b85952ac0f295a3e7026a6f6aa04acaaecd5f6ddfafaed106646bd2e82d2f629d78d09c3c1b2d1bd66a23a9d6b99745ca05a88118 SHA512 305784624c06b662e83712e2348619bc5998e85553dc860681177278a766f2a315920913593108fd147f2d4bfbb5bc02f064fba628ffad05b965814b52a1ca71
 DIST ferret-3.0.tar.gz 32291 BLAKE2B c4fd3b776db97c44f93538ffcc193b0e207d5fb8cb0d982fe7fb737c2473d9512a81defc10613c6741de645e690d1f6f8c97a5c74ee70cf35f204f21aeb5c7e5 SHA512 f88575654c1990cb9c943b36242ee9786a5c234a853fc6fb321cdbf4f8b13f066fe0bad93bf80e94be407ecdba5014ac39ea0727df775ea2b3af4699a9fc4c03
-EBUILD ferret-1.4-r1.ebuild 513 BLAKE2B ec90d18794aacaecf2d70af7715d59937bfe1677ed0fc4d13d6f8ae570899d033aef0b9fa5e4c44e96349559f613a2e0eebde3f275a6c324e87bdf441e6e35d7 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f
-EBUILD ferret-1.4.ebuild 429 BLAKE2B b9b14af06387ef658ac189d98e6e71d6fc032ea7d2b69ff8c6111119271e0281be0404317bd45d0201b87148a946b87f8f18f7ef0a801ce976cc6e65683e582d SHA512 b0a5634b21e4aa90a62a7ac33fcf273240ea8245494eb46cf3cc9234b8cfb4a3df8042feade4d4b72ec7a8bdfbaad19bd6371bba7a1803eec948c395d9878212
-EBUILD ferret-1.5.ebuild 513 BLAKE2B ec90d18794aacaecf2d70af7715d59937bfe1677ed0fc4d13d6f8ae570899d033aef0b9fa5e4c44e96349559f613a2e0eebde3f275a6c324e87bdf441e6e35d7 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f
-EBUILD ferret-2.0.ebuild 494 BLAKE2B b6e7a2c740bce1a009500ab8f7abd3280722ec3889dbc0a77b107a6059e0c84cfac0dfa93ca14d636cac16b65c5eca2351e28a13567d679cd73145d89684cb39 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333
-EBUILD ferret-3.0.ebuild 494 BLAKE2B b6e7a2c740bce1a009500ab8f7abd3280722ec3889dbc0a77b107a6059e0c84cfac0dfa93ca14d636cac16b65c5eca2351e28a13567d679cd73145d89684cb39 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333
+DIST ferret-4.0.tar.gz 36867 BLAKE2B 0c386d5ad24fcd0662108e8e6005f94900c68099af0fedd181eb63d1c0f762ece02c0daf65dcbca1205b5c3c724ed73c523089da0b3db4f8c7f6d5aed737f113 SHA512 4d3e39a172a7ef26ddfd49e0582cb11f44851a486dd5ac298e54b9879966b5d09e2f9b0a76dfb5f30157035989ccc21269c3e5adbd5a4c8c7d0797bfe729eeb8
+EBUILD ferret-3.0.ebuild 489 BLAKE2B 33bdb03c5b9f8e000aa30f0179f5f6ccf06f3d0fbc14a9f4913e7b69c093a74867f6aeefb21801f8302a7f891c53fbb2c9a1da7751e1d3d48eab74b82057486e SHA512 d8c78b61b4491cadffeaded004d4cadf6c0ff967f981621d353b6ca542e9ce693484ea2488a4602b87b03d2d9f96e7261609b23cb881dda080b1ee761c9387a5
+EBUILD ferret-4.0.ebuild 491 BLAKE2B 483e7b37cbad16ab56a19b09561a3a02e6cb25d1f65e04103fff1835aac730088297c7c5069f9019c4de49ab348089a3500b30942609a81b1b65c6e2c510dda3 SHA512 78aea0281a52ad49c6a3385cc5cf715da727d121579d0a56238556723bc563e238593737ed9c2c4ee216d2dd1bd21d85f279fd1693d4fb9121708dcab408611f
 MISC metadata.xml 440 BLAKE2B b0871983d30d46d6e350449f58f2c9b363349a3d6b564dd684e246b196e10d3539d61de4253761a3242d9eb560ada5f52b3f081c1b8c001daaf2f8959334bbbb SHA512 d7bd2e675190a561e1211895efc03cf373117842c56f6ce92a0f5e421f4a5cccf3ba2cc94deabe063697612ff3bad3eb0d7ccb620715119c34811f4128aaf81c
diff --git a/app-vim/ferret/ferret-1.4-r1.ebuild b/app-vim/ferret/ferret-1.4-r1.ebuild
deleted file mode 100644
index 1ff874a4a8d1..000000000000
--- a/app-vim/ferret/ferret-1.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: enhanced multi-file search"
-HOMEPAGE="https://github.com/wincent/ferret"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	rm -rvf test.rb doc/.gitignore || die
-	# See bug 612282.
-	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
-}
diff --git a/app-vim/ferret/ferret-1.4.ebuild b/app-vim/ferret/ferret-1.4.ebuild
deleted file mode 100644
index c6e382c72335..000000000000
--- a/app-vim/ferret/ferret-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: enhanced multi-file search"
-HOMEPAGE="https://github.com/wincent/ferret"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	rm -v test.rb || die
-}
diff --git a/app-vim/ferret/ferret-1.5.ebuild b/app-vim/ferret/ferret-1.5.ebuild
deleted file mode 100644
index 1ff874a4a8d1..000000000000
--- a/app-vim/ferret/ferret-1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: enhanced multi-file search"
-HOMEPAGE="https://github.com/wincent/ferret"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	rm -rvf test.rb doc/.gitignore || die
-	# See bug 612282.
-	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
-}
diff --git a/app-vim/ferret/ferret-2.0.ebuild b/app-vim/ferret/ferret-2.0.ebuild
deleted file mode 100644
index d6d32cacfbdb..000000000000
--- a/app-vim/ferret/ferret-2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: enhanced multi-file search"
-HOMEPAGE="https://github.com/wincent/ferret"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	default
-
-	rm -rv test.rb doc/.gitignore || die
-	# See bug 612282.
-	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
-}
diff --git a/app-vim/ferret/ferret-3.0.ebuild b/app-vim/ferret/ferret-3.0.ebuild
index d6d32cacfbdb..016dd6866cfd 100644
--- a/app-vim/ferret/ferret-3.0.ebuild
+++ b/app-vim/ferret/ferret-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="vim"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/app-vim/ferret/ferret-4.0.ebuild b/app-vim/ferret/ferret-4.0.ebuild
new file mode 100644
index 000000000000..143a9d7ac040
--- /dev/null
+++ b/app-vim/ferret/ferret-4.0.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: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	rm -rv test.rb doc/.gitignore || die
+	# See bug 612282.
+	mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
index f2e7181d354c..b2727ca41099 100644
--- a/app-vim/gtk-syntax/Manifest
+++ b/app-vim/gtk-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
-EBUILD gtk-syntax-20130716.ebuild 466 BLAKE2B e201ec0e17a09e3176aa39107b929f096396369572b37356c0fdc78bc833e5a915d605e3811acab0ee2424ca74a148d04eaabf4b93c1207409bb2673e6d9a9c9 SHA512 e66853cb49eeb3a3c3de4c2e6d0fec15ab1547f311370db6c1cba2529c87af176df751845104c8cdfa0b0bb2e92b479ef9472eb345ebf1d2277ef6a971b28b3a
+EBUILD gtk-syntax-20130716.ebuild 462 BLAKE2B 81100fd21d3f401a588fcd717938b511729e29c78618949d73f9310d994e60a6c8c9ef39f51c3789478b19e953ed9687d7cbdf748b71c7e0bdab12429b2846ef SHA512 7b11261605b5afa7320cf169993dbc8cf71db21e409183ab1937fd79a0b692c917fd8cb2e0fab1b6d9b1a6771eeec5e1025bafe7e7ba5ded3dc8f77d367cbb22
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 6b9d88d9d658..16c851a4f71b 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.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
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-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 ~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 ~x86-solaris"
diff --git a/app-vim/neocomplcache/Manifest b/app-vim/neocomplcache/Manifest
index 60743b07dc30..247248189d41 100644
--- a/app-vim/neocomplcache/Manifest
+++ b/app-vim/neocomplcache/Manifest
@@ -1,4 +1,3 @@
 DIST neocomplcache-7.1.tar.bz2 73724 BLAKE2B 16c04762164c6b086b4683bba71073eaed0a21b003f7d42bb7e4d5a7a1767f982b80840c229402312622e2f9b3f5c9a0759bfc8ece3b320ab38d94c406453cf9 SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b
-EBUILD neocomplcache-7.1-r1.ebuild 415 BLAKE2B 1befd69348909cf5b299a312208ee5f0e26a58489fd9f11e1a02859c4ed713c43803888c0342a56a06487e21ac348e3cb8900f6b9052e5fa16a3c97569a890f5 SHA512 d252c5978d7e51298c84f71a5e7b50fea7a31f7b9968b94d9c6f23480573ce9f5b39075ff061457e91df9d0e56f7612fe15b2f3008fbc59467d34edf3a2c97e8
-EBUILD neocomplcache-7.1.ebuild 336 BLAKE2B 4d96faaf4563a59e747278b96d9bc20c68acfc60f9218a8f7bbebaff169499ed229b7a59a257396736458c084179c3ee0bdaab1e766904596d5bbb12584daafa SHA512 b8b71334c04e4cca889fbd3682dcb9d9c8220ccf0c8a1904f8413dc79e85d0dd540be9f25801279f8a35714d8760f474db555acc0f8550971c651fa6de7b01e8
+EBUILD neocomplcache-7.1-r1.ebuild 409 BLAKE2B 1bb35645109e95df34c0c24ada5194543bb25ed73cbbe790ce79420bbd1e96681081b5a7acdf0a7a7d72b2cbac21d6d0742c168d6cccee32acf93998eb24e17f SHA512 5ece8cdef88464189bc80fd269898e659c487fe0e382eb90ccd1ec5aaa54a76c2665782e4e6c69f3bae89a7e0677239d6adb4085ad2b7bad7b9c0027ceb0ed76
 MISC metadata.xml 349 BLAKE2B 7c4db2d8de75be71de1de92126b543ad0a522c95d23c3a97422c02ca8dbc9dcf1211af15b32809ea4d39be09e8c89e323ed1f15cf851fc4c877fa34611b5faee SHA512 2fbc0b0ecbd013d0c7dbc2e4cfe560d46beecb157052c05635c25d9ebb836a4969879b121a07c429699d454350ddb2aaa97cdcc0e9a5e36d52eea2964df392be
diff --git a/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
index ea0fa5e98735..11ff0bc24960 100644
--- a/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
+++ b/app-vim/neocomplcache/neocomplcache-7.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
@@ -8,12 +8,11 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: ultimate auto completion system"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
 src_prepare() {
 	default
-
 	mv autoload/vital.vim "autoload/${PN}vital.vim" || die
 }
diff --git a/app-vim/neocomplcache/neocomplcache-7.1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1.ebuild
deleted file mode 100644
index 2e6bd637060e..000000000000
--- a/app-vim/neocomplcache/neocomplcache-7.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: ultimate auto completion system"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 90c01d6c014b..5ad0ccf8449d 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index d73380ce13c3..80904abfb519 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -6,5 +6,5 @@ DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
 EBUILD eigen-3.2.8-r2.ebuild 2578 BLAKE2B 106cce3438812d9d0800e4d9096d57532557ecdddd33b1f812d992a7d89bf107bd71128a18f9a9649408690f4bc61cc88037f5f623e7477a4a987cb500d70bd9 SHA512 4b7876b48f2bfbe54db5b764d1ec1e7ad371c46beabb4befac3bd980572a081f86f9c07ad985c11a8aa5d7f4b01afee172abe6e2f09d017ce9d6a7b8ce4fbe8d
 EBUILD eigen-3.3.5-r1.ebuild 2238 BLAKE2B e0777ad78a4a7bd919cca9bfc55a7d0170870e7471b625a81d816c44edc2594634d9f35775d4b74b7d8e518e1da7c74dd9460f851a511fa0a0f2832a9ce2afb6 SHA512 63274b3971cd5186c009023f06f1aeba9e711796cd57c5ffee12fbd76196c06348016f4ea801d7af791cc580cd55a05cbb8ecfeb7be5ab718851a1bbd2e8fe1e
-EBUILD eigen-3.3.7.ebuild 2181 BLAKE2B a354e7cae1a656c03e86715d4609d915bd938ce79c1cc6cac296858c95266e6b009b2e9e46f439a606b6fbc18c2682187c63f4cf0aa49f7325ab82e7dd0ba09e SHA512 06c61312661635d75d6e13fb04b613c94c6d0c18e66ee500f51e02f9bdf101f98e405a1ef4bd5697bc7c573c666fa425dad0889e2ceabcf832a74928dd49e963
+EBUILD eigen-3.3.7.ebuild 2180 BLAKE2B 5198db3ec06ef41e0483dc773cff386c03df599fc7e953420d560ee5aeff8bc3cbbfb4bb15432b4842f13b41a22ab50e91c044fccb305118da874bec4c87bb47 SHA512 1b1d4ce369930b72059a46d753d7f176e90b878b3aa13d4e115fc33f69ba8e6d4c1fa216d6bcfaed33c8015a9f86fda8f66b280801bc92de33cbaec93b0234fd
 MISC metadata.xml 945 BLAKE2B 1e9f416b0c69bc66b08934efc902a21f557bcf5b910439dee978b46a11b0b6767681d6bb298402b050b3e994b56ad9163b91c2d526f8fd04eeb5b9ac3c74f451 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
index 4e4ce83d41a4..a3682df66716 100644
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0eda6598c7a2..c71ffe518222 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index af86ee6ec221..1c2f7cf86d50 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,6 +1,4 @@
-DIST freetds-1.00.41.tar.gz 2904915 BLAKE2B d92789c9a08dc9f7f04e8efc828841c3cace0e5a3affd11d8751a785db70db79fedffb3745a681b960d30a11efbb4fa457805eb4f72444eecc20eb65d46e2d82 SHA512 dec3197a6478fc59b7386f9a7a562df8b581bba7184210c42f26827e957b9746e6820d687a9c6cbcd7c825fc5d4f556547c0483d06c786a064d5c4859db4daa1
 DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
 EBUILD freetds-1.00.341-r1.ebuild 1914 BLAKE2B a88a9d5ae6c21bd1d10fbe6fef807da75051fef2cb4a3e38db57ca88da923352d1c320ae54d737dc54eeec31169a4ed38611a2bf41cd788bf55d8bac130616f7 SHA512 1f2cd77c0a6a6b834ca81928de710ceefe169eb7d1292aace246d2644946ad9e196776de04b4b2529e82458fa4278d19cc74a1b1e5d5f1b0e32b7d4bcd7cdef6
-EBUILD freetds-1.00.41.ebuild 1988 BLAKE2B 58e5b9ecc1ec5196c3e4e50cfccefa6ca44510ba344b1d024f1280667e47d4351ce1946dea1f963cc3feb0a8a5382812e046173579fd961d522b3155ad422261 SHA512 a48ffe06b8303885d2e795d9cfe756979652460da4912de33dde0a06b635c3466f3abebfdad17ef7aa8cc35fb5f79eeca8457f18c2999108b13367eb2a8d7e02
 EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.41.ebuild b/dev-db/freetds/freetds-1.00.41.ebuild
deleted file mode 100644
index a68dba1cf161..000000000000
--- a/dev-db/freetds/freetds-1.00.41.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="ftp://ftp.freetds.org/pub/freetds/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
-RESTRICT="test"
-
-DEPEND="
-	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 )
-	)"
-
-# bind-tools is needed because the osql script calls "host".
-RDEPEND="${DEPEND}
-	net-dns/bind-tools
-	sys-apps/grep
-	sys-apps/sed
-	virtual/awk"
-
-src_prepare() {
-	default
-	# Fix the iodbc include path in the configure script. Otherwise, it
-	# can't find isql.h.
-	sed -ie 's:with_iodbc/include":with_iodbc/include/iodbc":' \
-		configure.ac \
-		|| die "failed to fix the iodbc include path in configure.ac"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=( --with-tdsver=7.4 )
-
-	# The configure script doesn't support --without-{i,unix}odbc and
-	# it will still search for the associated headers if you try that
-	# Instead, to disable {i,unix}odbc, you just have to omit the
-	# --with-{i,unix}odbc line.
-	if use iodbc ; then
-		myconf+=( --enable-odbc --with-iodbc="${EPREFIX}/usr" )
-	fi
-
-	if use odbc ; then
-		myconf+=( --enable-odbc --with-unixodbc="${EPREFIX}/usr" )
-	fi
-
-	myconf+=( $(use_enable iconv libiconv) )
-	use iconv && myconf+=( --with-libiconv-prefix="${EPREFIX}/usr" )
-	myconf+=( $(use_enable kerberos krb5) )
-	myconf+=( $(use_enable mssql msdblib) )
-	myconf+=( $(use_with gnutls) )
-	myconf+=( $(use_with ssl openssl "${EPREFIX}/usr") )
-
-	# The docdir doesn't contain ${PV} without this
-	myconf+=( --docdir="/usr/share/doc/${PF}" )
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index aaca04f965c4..cceb00c73aba 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -10,6 +10,6 @@ AUX libiodbc-3.52.8-gtk-parallel-make.patch 661 BLAKE2B f77c1184d648e4da54c05b3f
 AUX libiodbc-3.52.8-runtime-failures.patch 2033 BLAKE2B 943726b96d59fb560e1e42392d4d03c149ab55d4e237ad956f9b56d5f0a06abbab9e103412cb25423e9a1612ac2b74ff20a08e05d1561a3559559c80284e5298 SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142
 DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
 DIST libiodbc-3.52.8.zip 1188493 BLAKE2B 8439d0268b64d847c2bbb733fb203b3c2811f14dcd1cf2993472244e6430c2dac042f2b5056aed04049ba2cd139c83cd9c6c7ac6d4e1576dea58fc6e6aa0a5f0 SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551
-EBUILD libiodbc-3.52.12.ebuild 1657 BLAKE2B e9413f6bae682cc39639c6b304ccb7fb11512eb4a43f2073bed71fca29b6f532a038bff9f1357cea0ba5ac93533ebd1986487cb6caf02c045939848e7ddb20a5 SHA512 5cc0b63c95c0a1a365766a225557c18a63f774a4d0cc7bf182053e8516ffeaaed0ed01e40f21c0d0bdc1b9f1974df2bd9359985bb69f82a70e90a65cf193650d
+EBUILD libiodbc-3.52.12.ebuild 1653 BLAKE2B 2352ba5ce50f6fbcec3bd4e432a1d16be51985f75da5e68b06c22a8e39ff56de5f40ece36b3bd5c3dba548e23df6b737baad08a06a456532b626450cb75ca0aa SHA512 354b7a31036d59113b4cc4ec4791024c18bd880a51a50f99face6de8d4b0e5a3e9e78a5140d89092724c9b5e2f06e9859e039fc8c862976b0b7bb4dfd03f8901
 EBUILD libiodbc-3.52.8-r2.ebuild 1711 BLAKE2B 5b4e8870a2e2a782bed3e1b05e22fbfac3489900320c4b73263c7e722b21136a3299219859d5788b2eb56685b76190c3fedbefbd1dceeb6871a3fe83d492b1cb SHA512 9ac4fa353299828cd7419ee5c5502434a3390db1a3f6c3558bda884cf091fa31cec34c69d2e2612985bd73c0ad97ee8dfa6bf6d96af59424f34148706475c8b1
 MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
index 86a564be8a13..c7072ef25208 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12.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="ODBC Interface for Linux"
 HOMEPAGE="http://www.iodbc.org/"
 SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
 
-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="|| ( LGPL-2 BSD )"
 SLOT="0"
 IUSE="gtk"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b795449ee04d..3fec74bd28e8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -14,7 +14,7 @@ DIST mariadb-10.2.20.tar.gz 71876032 BLAKE2B cb170dc8e341dd4406112ec66aa3d975466
 DIST mariadb-10.2.21.tar.gz 71878359 BLAKE2B cad6a24480b476128d419ad85cfa67777bc0641c8cc30884f90ba61e73e2e009e51742bbe132b2c9736478ee6997fd576bd5c96660bf4f321617382716881cee SHA512 b723ddda5fb22ff41ec8a031a1a0f15bbd13ffec09099c7e0138d7b25028d0807b0bd3ac71957b825516386088bba28b0bf561706e99a6396e599ef21e720cda
 DIST mariadb-10.3.11.tar.gz 70669435 BLAKE2B e16346519b60aa11a0ffd2c19254ef888c44c054d55b7f98a8d696e3df2c0801c6141adddfb9169098ad5efa5d881c83681c3c5741f68b10c9ce4d15def34254 SHA512 1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298
 DIST mariadb-10.3.12.tar.gz 70666408 BLAKE2B 90e734a5617e44e2c273a1cd22ed2f81493e9458249dc0eb478c3b2b106dd7a0f81d130841be7632272bf6dc01e64350057c2d3e8162e8e8cef1f5a4ac2fb18c SHA512 9dd2939684c4591db306be6afb34663626dfaae133f88dd31125c759dce16b9e9d767a9254e30d9ee5fa2ea027e223dd4799effba8a8b0e4638d5de9e2512003
-DIST mariadb-5.5.62.tar.gz 45938380 BLAKE2B aa17d0e5740805d74f7f74f54605e04c4e29c4208a2efa6da2dde5855dfdc13e3225fe349e2146b11a6cbf5a0ac82a9e6c3e4f31e62afa71fc7ab1381040c68f SHA512 136668a54b404a303ee8f87e736bd14463b2323f0a517e7161c8729f4534bc1d653241d6b79f8cb7ad66ea09cf4190f9b95eceaa209b18a46822a68d9580ba5a
+DIST mariadb-5.5.63.tar.gz 45946425 BLAKE2B bddfd67d8393ec22c4bc8d7dab2838825394636bd690c04574bdc4da84fbf6c779fcae7f6be5d596458baa732cb5278475f308f03df083cdfcecffc486950d81 SHA512 4699d8af2210e12d0eea659a4d3fd4bfa68ce11a38cffaf939a96cb7a1fe64dd0827d39c3a0a36fa7cc1981a804a9af7a6d5cfaf23a8cfc8440e54c0163c2acb
 DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec
 DIST mysql-extras-20181104-2252Z.tar.bz2 328613 BLAKE2B c869dbdd8eb8ab6706b52815fae88e0789b955b9d3e89eac305e6de6e1bc9e78ea10ac58efeac0d6478c7f83587910834e9b4c44e3621224f006daae44dc2bf3 SHA512 e0dff23aa6420a9cfcf2f60464381d4b08194759dcd96910cdf94075fa71e90b74fa3dae700f279f421fee68315af37e47054c9422adeb6cc757fa968a1b65bf
 DIST mysql-extras-20181211-1735Z.tar.bz2 330779 BLAKE2B 4a41b9067a8b8bc5b595ff8dfeaa20d6577083ad1f6a0d1b56d29663cd436abc611a2ff394fafb8d466771c8676e2019a415554b830f20828ace31eb5b7e082a SHA512 03db4b1b483395eeba57d049c10a07ef50b26ba97f3fad74aa6a19f8835aea60106bbc86dea2a168ec613d9b2caa016240d8d888e42823d383fa3466f8b262d4
@@ -28,5 +28,5 @@ EBUILD mariadb-10.2.20.ebuild 32055 BLAKE2B 931c5143464274e5121a0b42caa7ccf3cb0f
 EBUILD mariadb-10.2.21.ebuild 32138 BLAKE2B 66e09920cd144d53ef3e8f34c24395348cb13b1751c796d83cab4fe7f9da63a85380c7249d4f31e40c08d63c1d2213fa7a84da155ed9386392de483e5e4b5ec7 SHA512 6f95abb7c46b434516aa82815be7bc43ca5c744952addfcc2ef20ddece0a1654a4ea15c4c2c677e3b5161cd64bcf7dbdd8b8d209846239f1878e5e38e0de2993
 EBUILD mariadb-10.3.11.ebuild 32121 BLAKE2B 369dc311230cd6a9d8ee2b3db819168c1b5c31321d39e8aaf462ddb5a5b66076ee1bc6e29a2f8eb477b0d2b45b58042c679ffda72beabe645f53db36dcdc10f9 SHA512 d1718981da061de1923f06dda39e75b61feaf5c2886bc0782d697b6867aec6184907a81fa8f5b48bf3c4f7f643fe8430890b22ed10af6b6175bd115b96b936ad
 EBUILD mariadb-10.3.12.ebuild 32159 BLAKE2B e88a0109fec3ed85753d5e7bb907a1f675fb323340d0e8ba6cb8ae2cee01646f8a94bf894dfaafaa69b7928e391a2a4638de4ac3fc714ef4d3eca16e611e7371 SHA512 c0bb9f9634cf7c6a961310648d871f7df95a82c39f38856df9692835b07a1b90f533cbea6b8e164e62be7a1e395efdffbb8bdd0b6c4d92877ca6ab942840a4ed
-EBUILD mariadb-5.5.62.ebuild 27071 BLAKE2B 528f4e740b597cad24ecfd5c03137bae7fd65fb6adaa615a9b5ceeeb9f8d138ad47e2c034f9b4a2727d0059148b06985e3dc9cc9223ef756959d730f319c4b07 SHA512 e79e999633aef9b04558d71ed6e3398d372816b3a343429c521c44b33d3bf7e0afece3723d2557aaf03106dfc880fcc0c1504e6d12eb2dbff9c08927af716b2e
+EBUILD mariadb-5.5.63.ebuild 27054 BLAKE2B fb6b085846137c6607ccb1b58fdaac6abe8999ad67102b3993b52340dd4c7805640379b79c0a0fe300b237438f836a8b62794c423ebc47707b414f7712214919 SHA512 d9356369a5e93dc1dd1a6c6c332ceac7306cc14b33068739d5fef621ea6f14bf2a36e0b8a9f39500ccb8fb7cf35dae013c9303ade0002459971f48d28097d3de
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-5.5.62.ebuild b/dev-db/mariadb/mariadb-5.5.62.ebuild
deleted file mode 100644
index c524ab73ffff..000000000000
--- a/dev-db/mariadb/mariadb-5.5.62.ebuild
+++ /dev/null
@@ -1,831 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180809-1700Z"
-SUBSLOT="18"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
-
-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"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-	oqgraph pam +perl profiling selinux +server sphinx
-	static static-libs systemtap tcmalloc
-	test tokudb yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="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
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-else
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
-	"${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-5.5.50.patch"
-	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mariadb-5.5.60-without-clientlibs-tools.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= )
-	!yassl? (
-		!libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	!bindist? (
-		>=sys-libs/readline-4.1:0=
-	)
-	server? (
-		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-		pam? ( virtual/pam:0= )
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-"
-# 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 )"
-
-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
-	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_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
-
-		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
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR%/}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	# Don't build bundled xz-utils for tokudb
-	echo > "${S%/}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-	sed -i -e 's/ build_lzma//' "${S%/}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/ft-index/portability/CMakeLists.txt" || die
-
-	local plugin
-	local server_plugins=( handler_socket auth_socket feedback qc_info server_audit semisync sql_errlog )
-	local test_plugins=( audit_null auth_examples daemon_example fulltext )
-	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
-	fi
-
-	# Collides with mariadb-connector-c bug 655980
-	_disable_plugin auth_dialog
-
-	# Don't build example
-	_disable_engine example
-
-	if ! use oqgraph ; then # avoids extra library checks
-		_disable_engine oqgraph
-	fi
-
-	cmake-utils_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"
-		-DDEFAULT_SYSCONFDIR="${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"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_ZLIB=system
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		# 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)
-		-DWITHOUT_CLIENTLIBS=YES
-		-DWITH_READLINE=$(usex bindist 1 0)
-		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=(
-				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
-		fi
-
-		mycmakeargs+=(
-			-DWITH_JEMALLOC=$(usex jemalloc system)
-			-D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1
-			-D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1
-			-D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1
-			-DINSTALL_SQLBENCHDIR=share/mariadb
-		)
-
-		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
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_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
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-		)
-	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
-	local mycnf_src="my.cnf-5.5"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	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" my.cnf
-
-	if use server ; then
-		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
-	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
-}
-
-# 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 5.5 for now and are believed to be
-	# false positives:
-	#
-	# main.information_schema, binlog.binlog_statement_insert_delayed,
-	# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-	# funcs_1.is_columns_mysql
-	# fails due to USE=-latin1 / utf8 default
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock:
-	# segfaults at random under Portage only, suspect resource limits.
-	#
-	# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-	# fails due to bad cleanup of previous tests when run in parallel
-	# The tool is deprecated anyway
-	# Bug 532288
-
-	local t
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-		_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	if ! use client-libs ; then
-		_disable_test main.plugin_auth "Needs client libraries built"
-	fi
-
-	# 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/bin/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)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	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/mariadb/mariadb-5.5.63.ebuild b/dev-db/mariadb/mariadb-5.5.63.ebuild
new file mode 100644
index 000000000000..6f578a9b7022
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.63.ebuild
@@ -0,0 +1,831 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180809-1700Z"
+SUBSLOT="18"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils multilib-build
+
+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"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
+	oqgraph pam +perl profiling selinux +server sphinx
+	static static-libs systemtap tcmalloc
+	test tokudb yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="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
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+	EGIT_CLONE_TYPE=shallow
+else
+	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+	"${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-5.5.50.patch"
+	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mariadb-5.5.60-without-clientlibs-tools.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= )
+	!yassl? (
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	!bindist? (
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+# 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 )"
+
+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
+	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_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
+
+		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
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR%/}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S%/}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' "${S%/}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/ft-index/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback qc_info server_audit semisync sql_errlog )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext )
+	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
+	fi
+
+	# Collides with mariadb-connector-c bug 655980
+	_disable_plugin auth_dialog
+
+	# Don't build example
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	cmake-utils_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"
+		-DDEFAULT_SYSCONFDIR="${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"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_ZLIB=system
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		# 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)
+		-DWITHOUT_CLIENTLIBS=YES
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use server ; then
+
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+				-DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
+		fi
+
+		mycmakeargs+=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1
+			-D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1
+			-D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1
+			-DINSTALL_SQLBENCHDIR=share/mariadb
+		)
+
+		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
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DENABLED_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
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+		)
+	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
+	local mycnf_src="my.cnf-5.5"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	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" my.cnf
+
+	if use server ; then
+		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
+	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
+}
+
+# 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 5.5 for now and are believed to be
+	# false positives:
+	#
+	# main.information_schema, binlog.binlog_statement_insert_delayed,
+	# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+	# funcs_1.is_columns_mysql
+	# fails due to USE=-latin1 / utf8 default
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock:
+	# segfaults at random under Portage only, suspect resource limits.
+	#
+	# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+	# fails due to bad cleanup of previous tests when run in parallel
+	# The tool is deprecated anyway
+	# Bug 532288
+
+	local t
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+		_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	if ! use client-libs ; then
+		_disable_test main.plugin_auth "Needs client libraries built"
+	fi
+
+	# 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/bin/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)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	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/Manifest b/dev-db/mysql/Manifest
index 11b19c8e6fa4..86f06fd95c73 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -8,15 +8,20 @@ DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e0711
 DIST mysql-5.5.62.tar.gz 21111902 BLAKE2B f1cbb1c6b4dfac11c2c517a57a5c6216ce43766cc247b3c9b387326a7f6446cbc21ddb42bd95afa658c3b0ed2568a29563ceea248c6ec63364ce210119d39cc2 SHA512 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce
 DIST mysql-5.6.40.tar.gz 32083035 BLAKE2B efcc078341bae239df28ac0504111aa34926885ae47edb5011352b56552a5a3abd1f824f8cbdc23d8d667592b8f5510946ef18c3efa61865dbbc7f4bb8a2d4a0 SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c
 DIST mysql-5.6.42.tar.gz 32201731 BLAKE2B c573328b37225dac090c32178f90e1419fc1848612e304bddc11eafdd48228981a846857be680978b72ef76edbd5d2422a98b5d20b4d082fabcc2b072e2b8fde SHA512 3104e6a3145a119f2b012de6af2a92fc37134aa402b889a562f5fc2391705d0bc2f718166c5fa8387d973fff5ecd9544c8b389b6d0c81d98bdcaf2acfb9b55e8
+DIST mysql-5.6.43.tar.gz 32200219 BLAKE2B 2aa1397ff5f011a169ae47650be8db7a097a62f53ff06d63760a419906841f0540db19449c1d71d60be7d684e49b4436e1d6e72e7a1cf99057a3f98fad11557f SHA512 8820aee9b34cfebc841d756b12713517c9dafed7bee7b09c8e82c8f359e2e12b25da47c4e49e0aa4afc26193b774e0fa0dfd422c2aa09c3112b6d6e4b62b9a68
 DIST mysql-boost-5.7.23.tar.gz 49025014 BLAKE2B 669f10779bc2cda866d6bd876b4efe55fb4b0c796f596f66513a3ca85f322e2a03e9879eecd72a69729a0cb71d408c46cdd9086ae456712b4adff6ae7c584c97 SHA512 e4317f89d108a68652cd95e41ffd670c37b6663aabd6af3985d18052fb7e8d8879b5822399caf9091cecc0a949ec588c121c87cfd60d69941f68d0ecbedd0953
 DIST mysql-boost-5.7.24.tar.gz 49110448 BLAKE2B 1cf64712d84cbb2dfd31f2a530470b6f7cbf5ae9107106d86705575ea9739fa582e1f079447d9a58c4762fffc636d69e448ebdec9172ee15dc09245bc39c3525 SHA512 bbd411e15cd9e6053a353146808b74881d2d950f09e94794a699e7604dadf767b58b661a8321fbe1424f2c2e6cfc3adaa388242183e759082eae47b64cbfbcde
+DIST mysql-boost-5.7.25.tar.gz 49107578 BLAKE2B 8a43479c496ce45e71df905b0cb6da442340b691caa15f9862a8c981e7189c50e73b1701c393fe46ab580c508f785d5f15259c2331c77e0790191f3d41bb385c SHA512 b111c64bfcd49dba584bed71a0c7ce33b2b0654654d8f4eaa1a2b7a5daed9674ebfd4a0dfb93c20ffee028feead4709eaf600bb5469f81c86b743d395dfe27a9
 DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d
 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-20190126-1919Z.tar.bz2 331144 BLAKE2B 27fe6846a2c98a3027d0a63ad08d72e29f0dfff456de2ad942760a5d1005ea6fe5bbebacacf44308975eacd3ed824883b74e1be3930bd329965e2ec1a4d0384f SHA512 e3a54f721e71cbd9db2b907500cb42c526914be1307a316bbba27e8124580b574c1c9a1fe6d30228cc6d2a1a6ba0797cee3628a69f1536e0467bbcb5151986cd
 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
 EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d62634028a042105ac4bff9a90dbec7803c6b1d348e35267be6b4b12afa8f12f4a02f969c536890bf7970cb4e466907c SHA512 56aa82fe363e091a6db7b307318f14ff93ded6eba2a61142eb3e026205740b02dca8587e23accf2ff757e941b0d4b2a0e7ab386b879d7cee35976facbb7aec94
+EBUILD mysql-5.6.43.ebuild 26062 BLAKE2B e1ff15d2b2ce79363f233516a9433b3bc82513c651f8a1554352dd5e33d3364620c9f9e20f6c4ead00edbe86e81e78e007e3444840d9852a2adf3313a2add326 SHA512 dd269ad6408bb554c6bde9c7615fee36c361946994dcf1be7894735361211880273fe9e5a712b0b5a95b11ce430cb026b1c84d5f74dcc605602d37e8b4ac669c
 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 30464 BLAKE2B 7e32811064277d7364181db28ebd1dafaf9af06b62336cf65644f34c5951f10bc961e6e5eb07df15a055dbfe6b1404e6b012261cde3f75f326e67b5071109eaf SHA512 887af8e5399c61d78f506e867d3d536e13917a1276b8c90634efff8d374aee14b634b1f9938cd66075dac764ad52fe65ea6e9ce8ceee99bd04f05a8ccbdb1fb5
 MISC metadata.xml 1539 BLAKE2B 0bc66c5855bd1f4353a7f0b551229d68a940478687b4f38653f973e4a5cfcb946c86bdc2d8318aa96aba43598eb476b995005f26727dfa176ced00fbe2b129a1 SHA512 bc0ce8a3de5e55d954f65eec657930af069d3550f485334f80dfa4c6d17c6298d0609d1ba4fe8b6c988f8ad007858f147c17f1354c207891ac1a062a36af50ad
diff --git a/dev-db/mysql/mysql-5.6.43.ebuild b/dev-db/mysql/mysql-5.6.43.ebuild
new file mode 100644
index 000000000000..e77fb13c4c43
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.43.ebuild
@@ -0,0 +1,799 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190126-1919Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs \
+	user cmake-utils multilib-build
+
+SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.6/${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://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
+	+server static static-libs systemtap tcmalloc test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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}"/01050_all_mysql_config_cleanup-5.6.patch
+	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
+	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
+	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
+	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
+	"${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.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=
+	)
+	net-misc/curl
+	>=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= )
+	!yassl? (
+		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=sys-libs/zlib-1.2.3:0=
+	sys-libs/ncurses:0=
+	server? (
+		numa? ( sys-process/numactl )
+	)
+	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
+"
+DEPEND="virtual/yacc
+	static? ( sys-libs/ncurses[static-libs] )
+	test? ( dev-perl/JSON )
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+	${COMMON_DEPEND}
+"
+# 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 )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# 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
+	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() {
+	# 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 use client-libs && [[ -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 [[ -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
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Grab the patches
+	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+
+	mv -f "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	_disable_engine() {
+		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	_disable_plugin() {
+		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
+	local plugin
+	local server_plugins=( semisync )
+	local test_plugins=( audit_null daemon_example fulltext )
+	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
+	fi
+
+	# Don't build example
+	_disable_engine example
+	_disable_engine ndb
+	_disable_plugin innodb_memcached
+
+	cmake-utils_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/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# 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)
+		-DWITH_LIBEVENT=NO
+		-DWITHOUT_CLIENTLIBS=YES
+		-DENABLE_DTRACE=$(usex systemtap)
+		-DWITH_SSL=$(usex yassl bundled system)
+		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
+		-DWITHOUT_VALIDATE_PASSWORD=1
+	)
+
+	if use server ; then
+
+		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+=(
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		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
+			-DWITH_INNODB_MEMCACHED=0
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+	# 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
+	local mycnf_src="my.cnf-5.6"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR%/}/${mycnf_src}" \
+		> "${TMPDIR%/}/my.cnf.ok" || die
+	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+	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" my.cnf
+
+	if use server ; then
+		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
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 MySQL 5.6 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in auth_sec.keyring_udf federated.federated_plugin ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# Bad test definition
+	_disable_test main.mysqldump "Test fails after 2018-12-31 with new warnings"
+
+	# 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/mysql"}
+	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/bin/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)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
+	fi
+	if [[ ! -d "${EROOT%/}/$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 http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
+	local help_tables="${EROOT%/}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
+	[[ -r "${help_tables}" ]] \
+	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
+	|| touch "${TMPDIR}/fill_help_tables.sql"
+	help_tables="${TMPDIR}/fill_help_tables.sql"
+
+	# 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 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
+	# http://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
+	chown mysql "${sqltmp}" || die
+
+	local cmd=( "${EROOT%/}/usr/share/mysql/scripts/mysql_install_db" )
+	[[ -f "${cmd}" ]] || cmd=( "${EROOT%/}/usr/bin/mysql_install_db" )
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
+	fi
+	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} \
+		$(use prefix || echo --user=mysql) \
+		--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="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
+		"--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/mysql-5.7.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
new file mode 100644
index 000000000000..80d8e5aaeeb5
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.25.ebuild
@@ -0,0 +1,946 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190126-1919Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit cmake-utils eutils flag-o-matic linux-info \
+	prefix toolchain-funcs user multilib-minimal
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.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"
+fi
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="0/18"
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling
+	selinux +server static static-libs systemtap tcmalloc test yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
+RESTRICT="libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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}"/20001_all_fix-minimal-build-cmake-mysql-5.7.23.patch
+	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
+	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-mips-ASM.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-fix-build-without-server.patch
+)
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+COMMON_DEPEND="net-misc/curl:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
+	!client-libs? (
+		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
+		>=sys-libs/zlib-1.2.3:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kernel_linux? (
+		dev-libs/libaio:0=
+		sys-process/procps:0=
+	)
+	server? (
+		>=app-arch/lz4-0_p131:=
+		cjk? ( app-text/mecab:= )
+		experimental? (
+			dev-libs/libevent:=
+			dev-libs/protobuf:=
+			net-libs/libtirpc:=
+		)
+		numa? ( sys-process/numactl )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	!yassl? (
+		client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
+		)
+		!client-libs? (
+			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	dev-libs/protobuf
+	virtual/yacc
+	server? (
+		dev-libs/libevent
+		experimental? ( net-libs/rpcsvc-proto )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+	test? ( dev-perl/JSON )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
+	selinux? ( sec-policy/selinux-mysql )
+	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+"
+# 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 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	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_pretend() {
+	if use numa ; then
+		local CONFIG_CHECK="~NUMA"
+
+		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+		# 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
+
+	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() {
+	# 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 use client-libs && [[ -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 [[ -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
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.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}" "${S}" || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	if use tcmalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove bundled libs so we cannot accidentally use them
+	# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
+	rm -rv \
+		"${S}"/extra/protobuf \
+		"${S}"/libevent \
+		"${S}"/zlib \
+		|| die
+
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+}
+
+src_configure(){
+	# 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
+
+	if use client-libs ; then
+		multilib-minimal_src_configure
+	else
+		multilib_src_configure
+	fi
+}
+
+multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if ! multilib_is_native_abi && ! use client-libs ; then
+		return
+	fi
+
+	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/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# 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)
+		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if ! use client-libs ; then
+		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	# systemtap only works on native ABI, bug 530132
+	if multilib_is_native_abi ; then
+		mycmakeargs+=(
+			-DENABLE_DTRACE=$(usex systemtap)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_TOOLS=1
+			-DWITH_READLINE=1
+			-DENABLE_DTRACE=0
+		)
+	fi
+
+	if multilib_is_native_abi && use server ; then
+		mycmakeargs+=(
+			-DWITH_LIBEVENT=system
+			-DWITH_LZ4=system
+			-DWITH_PROTOBUF=system
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_RAPID=$(usex experimental ON OFF)
+		)
+
+		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
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		if use static ; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-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
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	if use client-libs ; then
+		multilib-minimal_src_compile
+	else
+		multilib_src_compile
+	fi
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='latin1 perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-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 MySQL 5.7 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in auth_sec.keyring_udf ; do
+			_disable_test "$t" "False positives in Gentoo"
+	done
+
+	# Unstable tests
+	# - main.xa_prepared_binlog_off: https://bugs.mysql.com/bug.php?id=83340
+	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
+	for t in main.xa_prepared_binlog_off rpl.rpl_non_direct_stm_mixing_engines ; do
+			_disable_test "$t" "Unstable test"
+	done
+
+	if ! use amd64 ; then
+		# fixed in >=mysql-8 via commit 0a417e84
+		_disable_test "gis.gis_bugs_crashes" "Unstable results on non-amd64 architectures due to floating-point operation"
+	fi
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_numa_interleave_basic ; do
+				_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	if ! use latin1 ; then
+		# The following tests will fail if DEFAULT_CHARSET
+		# isn't set to latin1:
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_xa_prepared_disconnect \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			innodb.innodb_pagesize_max_recordsize \
+			innodb.innodb-system-table-view \
+			innodb.mysqldump_max_recordsize \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			main.type_string \
+			main.information_schema \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_xa_survive_disconnect \
+			rpl.rpl_xa_survive_disconnect_lsu_off \
+			rpl.rpl_xa_survive_disconnect_table \
+		; do
+				_disable_test "$t" "requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# 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"
+}
+
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS
+	local MULTILIB_CHOST_TOOLS
+	if use client-libs ; then
+		# headers with ABI specific data
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/mysql/server/my_config.h
+			/usr/include/mysql/server/mysql_version.h )
+
+		# wrap the config scripts
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+		multilib-minimal_src_install
+	else
+		multilib_src_install
+		multilib_src_install_all
+	fi
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+
+	cmake-utils_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+	# 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-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.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
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+pkg_config() {
+	_getoptval() {
+		local mypd="${EROOT%/}"/usr/bin/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)"
+	# These are dir+prefix
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]] ; then
+		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
+	fi
+
+	if [[ ! -d "${EROOT%/}/$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 http://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 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
+	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	echo "USE mysql;" >"${sqltmp}"
+	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
+	chown mysql "${sqltmp}" || die
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
+	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} \
+		$(use prefix || echo --user=mysql) \
+		--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="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
+		"--socket=${socket}" \
+		-hlocalhost \
+		-e "${sql}"
+	eend $?
+
+	# Stop the server and cleanup
+	einfo "Stopping the server ..."
+	kill $(< "${pidfile}" )
+	rm -f "${sqltmp}"
+	wait %1
+	einfo "Done"
+}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index eda9e03b17bd..78c2e2a501e8 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,8 +1,6 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
-DIST phpMyAdmin-4.7.8-all-languages.tar.xz 6218056 BLAKE2B 879ef6703711725781fcf3b4c9ab607741c4df0d2f1955f632087e33b599e54128c0811dbd125d9015a0ec597dd6d9af54e7136e91f8637badf698ad7a30b8ba SHA512 ae6edcfba72413a6e0af0b120a99809320a840ab332ae77263f21e14f3b34a38cca70591628ba5818d6732ff6d23551ea51cbf6a75012d2326d0fab1c2a1b9ae
 DIST phpMyAdmin-4.8.3-all-languages.tar.xz 5996528 BLAKE2B cf00bab32547c5a6e8c81f529e5b074e3a7c576a7991d6823239172f91cebad7e1b10e2baee589043bf8a5d1d37470a7614a038a0054eaa18e74028bf3cecfd4 SHA512 95998eda6a2db9020671073c62458d819cbd5e54c5f56f467b109401f6b9ebd2dfbc34cc840980bf2d3a7ee3bc93683b7fe20d9bd72b537d8aa066d39089ff89
-DIST phpMyAdmin-4.8.4-all-languages.tar.xz 6012216 BLAKE2B 3e6503a7f2d76c6c9e7d8064ef2eb3ea21ee5ef040c0439e24afe9388f8f47aef4fbd8cbe27ae809f45f2c789a289f529a3eda1cf91ef80681d1f76147d753ee SHA512 4f7018416fb925b28d5e061ebba4d99c45497f0e33c6a4bfa32aaa74197a429d61469d8084fd5ea6b23a34444c81905e072b5508f9a87c75e18e0ac596ff2121
-EBUILD phpmyadmin-4.7.8.ebuild 1560 BLAKE2B 5f4cfc1b75bf5c23897c14c46bf952f1dd2021a8be3e4e022305eae14f6155c14a5b4f6db74518e0df24d7529dc6362f83614b859f51599c62c8a7135cfb0602 SHA512 b53a8697b1a16a8ddaac4240639d81fe1d9e35130892949cb95fdbabdf4839d23d2cdf077a2dc43bcddc836e015c28b922648ea1e8ac3f5f981ecc07a4b235e6
+DIST phpMyAdmin-4.8.5-all-languages.tar.xz 6026176 BLAKE2B 6fea778544d266ea9950a5764a6c31806bfcc437edbfd190780218d841e55a21cd534fceef9309d2e1d6acbd8a780cb1d120aeb47e2e35705118ceb9d5ae1266 SHA512 590efd46f4ae5a9cafd3b33f3565d74e4bfd535e3de8763e72da7bccea06fabb2f9fb90af3fe144846573507c5eefc20ee412bf6b51adfb494402302dc81aa2f
 EBUILD phpmyadmin-4.8.3-r1.ebuild 1558 BLAKE2B 841f68f731b7f0c0c21b718ce1ee7823c151ec936c3060c6e61e75181efa1bf4cdfea8619a1a93e89f9fb2c04d36cad759d6dea2d6ceaebc418be0b2270e7a15 SHA512 8eb64005bf20bb5740207fc3e217a5e68daa0c0eb28a48c518dfcccd211ebb9e5578433edc364bd13f8096e6e112afca34556b4bf5f408d813e3938e6d2aa5a4
-EBUILD phpmyadmin-4.8.4.ebuild 1564 BLAKE2B 5ac1abd3d55453b52b0eb5c9a6c32427e15ee221f7641222c999396b7efeb1dc3c0e6af8949661106d3e49d0a78c1532cfad1b6bfb2743c08d7f8a54e9bfff11 SHA512 247d39125762dd7117b05d4655364784e717a5ff536ef730327e3e83f6fb5ae14eabbf42839c5f568b3ef5e9caa474fb1e8e5b2c21243de651b6d0d750aba50e
+EBUILD phpmyadmin-4.8.5.ebuild 1564 BLAKE2B 1b62fb393cd9c248fae68ee72ec9e9172f3ffbd386c11e5ebe87cb00155bf2b38b92746f6a6a6568525e01dec80f4116a7b0c784a00f2cafa1955555ab8cd62b SHA512 0545942949e94db25359418a96ca50c640357e149b030fba0a12d9577bf6612cabb1b03371f41f9e7bfe614cd0b07e79767a259dd11070bbdd9a3e1cfc994266
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
deleted file mode 100644
index 1d0f18f80395..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.4.ebuild
deleted file mode 100644
index 646226a38ba1..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
new file mode 100644
index 000000000000..b0e6be3d92ed
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.8.5.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 webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ca1f0d0512a3..dae6fa5c92e2 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -17,7 +17,7 @@ DIST postgresql-9.4.20.tar.bz2 17905682 BLAKE2B cb65228f8e78dc8b6303a06480a68de5
 DIST postgresql-9.5.15.tar.bz2 18707696 BLAKE2B f1be26085953d5a15a6545aed3527b9eec6eb57c72f2e05401e43200e628b3a42ee824dd1cb0138556b97fe4922a991489dffa77329b653475874766c1d5b944 SHA512 2ea241b6751a2812c689da9bde40151ebb7cdabdd14e93d92f8bea1e3fcf5bc0d4854834999f33270329e22a09c5aeaf8d59d36ca6e8860704f81f3adcfb30d5
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
 EBUILD postgresql-10.6.ebuild 13811 BLAKE2B d182148b6aa53049dc6387b9c18a98248ec6b2a66811c877c05b6c2e08bb3e10669b288fa96d4e39f6b29449cf86424176f3983df8146a4b230ee0e0d59bcf60 SHA512 043bd74949a04514b05058dc699e5876babd6b780c67760fa84a9a73d95c2c209d03c2de0b110083f7779d51815f0f093140ad052fc7ab7cf65a722858c2618f
-EBUILD postgresql-11.1.ebuild 13837 BLAKE2B 8253cf1e9ef41f4806c8cef2fdaef232030095d1262a27224a2d606663eaca0583a9479db1718940868dd714b6ad7357eca353d0c3c8c10f914b7258ed8f8c59 SHA512 fc29419410ce56da2f30791927ab94fc75f77928bb35e8ce9079a67caccf463c0877b2285da99e8f70de21f02d9f50d1b1c2abc4e706441b269e72ba6c6d21de
+EBUILD postgresql-11.1.ebuild 13835 BLAKE2B da93203d0a71a0a337b813025dc5eb9d1867b8df20e10edbce9ec4d8c3bb3dc4c79944a30336024ce32558076736f7497695a9fd8ad24eb65bb4aff125cafb22 SHA512 c3cc87ba82c93930296c3a02f1445ec52dc00c83ae94e76736c28e3151b0d6accfff7b71b897f8926d940f2dc04b195f61bb7ee13e62adcd9da1f01f5d2e04ee
 EBUILD postgresql-9.3.25.ebuild 13560 BLAKE2B dad258dd261b0db61ae0dab4c94824abf347d2b7c155e49811801b81ac2b3449b377614e940c91d70240a9cb3ee34013494f6dcfce8fe24b1301b7a47160dcec SHA512 43ecdccecd395977956b26c6376f42eb79e7389c87fcca17dd27effe4cc847d5548df8b368572af9f70b80a77f62ec4a7e17c3bb78105ce854faf5343e9e38d6
 EBUILD postgresql-9.4.20.ebuild 14370 BLAKE2B a7f2e2bfa0b5ee85c11d525b6f29c3194e040495bf49ebfdbcae4dae5ea915325d98abc672b4727a985e056b0f0e9e9c85eb079164f93e94c55df0be68a04326 SHA512 5745139858d20d62c90a843060f5a57378c7590b1b26cf8a41f84603555973f581d06120b237a0fecf1a9d239a7af885761c75483addb955983528da44dd0d47
 EBUILD postgresql-9.5.15.ebuild 14598 BLAKE2B 5b59320bd25c183a251ff9176e774e222a15eb68749f890c16f7657e0968d519229f3498730b26b3b2eca2e76fcb304d96616cf11287ccfdcc62894379771781 SHA512 f11b94faf2376216c5506017108a6282efa4e02106597f9502daaccd14177925aa363eab51f5aafb029ce7f3f5617778f71a26cd9a4d1b830f1176a8c68764da
diff --git a/dev-db/postgresql/postgresql-11.1.ebuild b/dev-db/postgresql/postgresql-11.1.ebuild
index 975cc54129a5..e96b1033f79d 100644
--- a/dev-db/postgresql/postgresql-11.1.ebuild
+++ b/dev-db/postgresql/postgresql-11.1.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/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 7f6964671b3e..f3f764b07819 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,8 +1,4 @@
 AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f
-AUX sqlitebrowser-3.7.0-unbundle.patch 475 BLAKE2B 1e2783eec7d7c054d18920fc88617f143220669a5c69c62b024fa33922eff9d13e3c4ba5e453d6b1767defdd8a918156094c1234ed3d6ad632ee4b3d919f6540 SHA512 4f90c4df8ef49943489b239f675a86259536b988585182c8b804f4ed6d38b5aabd83b32b21952329332d8520945304a4f9fea6287631a9a58ce5f311d9242fdb
-AUX sqlitebrowser-3.9.1-cmake.patch 774 BLAKE2B 5773d3f70bc45348a4e3fc35fce57ad7eac416e7cc4d94eceb31ecc5e0ca2ed9dce837c299083e800b1ec7d80bd67d10ee60cf44c5a6915f39c619ef07f048f4 SHA512 f1a64286036d5c05e279fbf430f55400eb8f840564c0d9460424a42f87c4bd8d4f4e2c52c39e07d0bd3a50fa4a1e59bf591c53b1d28d2ef367af2ba25edae299
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
-DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
 EBUILD sqlitebrowser-3.10.1.ebuild 1378 BLAKE2B 9ec28580c7efa201ae7907eed123ba36fdf497e67adcb75ebfa43f1fef3e7956fed44390d02161aba91e8085bb44e872f912c61ff2b6311eb7ddd9f77890bb28 SHA512 5918375456ecfa90e12f8784c3e0e5300f5cd056741a762096f9b65656f3d026015e26f338ba40a48ea1ad7a8649f83067272092ccb7de919ad758bae03e8096
-EBUILD sqlitebrowser-3.9.1-r1.ebuild 1439 BLAKE2B 355dc9a6af52f1879559b7774d93f226e46a9998de3557c0f52d2b8ecde160e9c777bcc7ac4c8d33d74337972d6def9ada5d404b36d456133df000ca552623da SHA512 ad218ab7dc42f42487868aeba8fef1f282369bfc2508e6cbd20f0da1c6101f93ff3b157970e34046be20dfd98a2418763941c679d31dde82940cfc2a480b0cee
 MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
deleted file mode 100644
index 8dbe870f2e87..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.7.0-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlitebrowser-3.7.0/CMakeLists.txt
-+++ sqlitebrowser-3.7.0/CMakeLists.txt
-@@ -29,15 +29,9 @@
- find_package(Antlr2)
- 
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
- set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
- 
--if(NOT ANTLR2_FOUND)
--    set(ANTLR_DIR libs/antlr-2.7.7)
--    add_subdirectory(${ANTLR_DIR})
--endif()
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
- add_subdirectory(${QSCINTILLA_DIR})
- 
- if(USE_QT5)
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
deleted file mode 100644
index cf1cde6c9197..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.9.1-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2563d678681fa6972674b47617015cb2515bd414 Mon Sep 17 00:00:00 2001
-From: Martin Kleusberg <mkleusberg@gmail.com>
-Date: Wed, 12 Oct 2016 23:26:56 +0200
-Subject: [PATCH] Fix cmake file
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 998c2f4..4c5debd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.7)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
- 
--OPTION(USE_QT5 FALSE "Build with qt5")
--OPTION(ENABLE_TESTING FALSE "Enable the unit tests")
-+OPTION(USE_QT5 "Build with qt5" OFF)
-+OPTION(ENABLE_TESTING "Enable the unit tests" OFF)
- 
- if(NOT CMAKE_BUILD_TYPE)
-     set(CMAKE_BUILD_TYPE "Release")
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
deleted file mode 100644
index 9e91c60df05b..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-cpp/antlr-cpp:2
-	dev-db/sqlite:3
-	dev-libs/qcustomplot[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-unbundle.patch
-	"${FILESDIR}"/${PN}-3.9.1-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# https://github.com/qingfengxia/qhexedit still bundled
-	# x11-libs/qscintilla[qt4?,qt5?] still bundled
-	find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
-
-	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT5=ON
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon images/sqlitebrowser.svg
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index b84369651dcc..d6700665c26e 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index cae7566628c8..88a5fedf45d5 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,6 +1,3 @@
-DIST libftd2xx0.4.16.tar.gz 2124501 BLAKE2B 700308bff3c8091a38ba32344943d13603b043d2e680b2511c78f944a0a7dd1779a8f46aed28872798cb73aba225bfcb382f209bc3263ac1a301f9e49100d5fe SHA512 3a945bd31750dafd08cb86e875263e4fdb7a641676e91caf12420769ff12b505e34ec3a88d80dd43590d039c2ace280f166d1ebda2dcc399fb696d9f6c298f20
-DIST libftd2xx0.4.16_x86_64.tar.gz 2099109 BLAKE2B 526d3b058fa789b913c15e067faec7767fc4a071a463f6ec9929717d811775dd5323a43e397b568ef753a655bc3d35d2f0f02add989d51da5d5d498fc476c566 SHA512 e11ffa917560b6fb974092bcd89ef95f21651a3ce84d0bc7cc7647c4fe031368209db3b4ab52f8d6240ee89c2e6335e89135d4f358c4271284f8a830655608a9
 DIST libftd2xx1.1.12.tar.gz 950540 BLAKE2B 6d55e8ff9b17a6b0220f5f4f3022c3495262b0ac47687ad9f28023c9f7b822f3956f2e42787edbdafe44ceea9b65b5ae687e2acb840f3e5546e5b2ac8a7ccec8 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a
-EBUILD libftd2xx-0.4.16-r1.ebuild 1207 BLAKE2B 2d934fe600dd9340eb9e013281a54bca7703f7145f414809174c5c14918a4908b11d47ff37e54362106ff32770b3a516d35e3c01cf9963660b7c05d95d6259c2 SHA512 bbe02a433d2e21a025137fa6bf35bb53c0c255078620c14e8bdd973ca29730f56ac4ac2d0ee3240f2587f7b497398b578cc83ccabec5b245f19869bca4f3a2f8
 EBUILD libftd2xx-1.1.12-r1.ebuild 1055 BLAKE2B 89740f43be1692559b24924b0012765fc564b714eb5a0d656cd1f56191d442b5dd3fb61235799d2655d102882bba77e1c969abd5ced2b333b3362e620b3f6dc6 SHA512 81422f5732455b1bac7803707904fbb72297c7756d488af0f0ec20ca807065e8a8565ad02bbcfcdb8c714b2ca5e465b35ac35f4eeaeb90151b156cc406489b49
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.ebuild b/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.ebuild
deleted file mode 100644
index cb661db60ed4..000000000000
--- a/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.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
-inherit multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Library that allows a direct access to a USB device"
-HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm"
-SRC_URI="amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz )"
-
-LICENSE="FTDI LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-	use x86 && cd ${MY_P}
-	use amd64 && cd ${MY_P}_x86_64
-
-	into /opt
-	dolib.so ${PN}.so.${PV}
-	dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1}
-	dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so
-	insinto /usr/include
-	doins ftd2xx.h WinTypes.h
-
-	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${D}/etc/env.d/50libftd2xx || die
-	if use examples ; then
-		find sample lib_table '(' -name '*.so' -o -name '*.[oa]' ')' -exec rm -f {} +
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-		insinto /usr/share/doc/${PF}/sample
-		doins -r lib_table
-	fi
-
-	dodoc Config.txt
-	use x86 && dodoc faq.txt readme.dat
-	use amd64 && dodoc FAQ.txt README.dat
-}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index fc2aff0ec701..df81add9a02d 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index 11de0a474ef1..a4c12226930c 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -1,7 +1,3 @@
-DIST delve-0.12.2.tar.gz 1127128 BLAKE2B 3728eea41bcad6dc44cb642b536730fcc75e29524dda7081c3a3e761f6c00bfb8b7ef9e65a16578c152313d19ce361a1766f8a7fa86742ac9c3b843a08b24196 SHA512 f2351340a1f9cefe2410535cda79ad5ef5ad3c3783cd5869d8f0b682d5c109ea6efd3041f9ccc9988ccef77922c9bfab59ca062d98f429f85466b3e2ccc1eeee
 DIST delve-1.0.0.tar.gz 1573015 BLAKE2B de9318cb1fa289984fd2c7daabcff61fe4a0ed141460bfa3020097fd8d1cde535ddf4825371608521e03cc0f9c25a59e2a7dedc65a781cb86911d0c2c2f2e025 SHA512 128311bb7fd61b5b681c89060d7c0817da649fdbeef6367e627ca537ad4c3f07771d638e7e803c052c95bace8a7f5c8fb07feda1e06ce0ef34fd87143c29fece
-DIST delve-1.0.0_rc1.tar.gz 1268859 BLAKE2B 6192128ace7b8896e2624f7fa25a5b70b748780097630b2db535acc4f8867cd015ff61f14e0cea255ed863591991addaee1b3bd5d1e1489522a268dbdf7ee23d SHA512 97e58bd7e00089bcdee7fa6e749a6c5b72cf5d63f776d56b6000703371091129ac52ab58601256429362d12c88a4ba7cd0d3d196d5cee2d6d2701a73963a9358
-EBUILD delve-0.12.2.ebuild 787 BLAKE2B d42ca043a0b96f78d1e04e692636bc961a2b4efc857738e7b80408e1784b029a8aec084301a4e9d3d4b7000ccbeee5812c949810052bd34f287aa9db6cdba6d2 SHA512 0ddade3a5c8a9feed1be1207519671b2595323608bfdde3160e6603d5be8d02561d6881c7ebeb0a6873729ff8a2191d2a413e4101e5708d2bde10b190c31e4e9
 EBUILD delve-1.0.0.ebuild 757 BLAKE2B f5f47a790bc9fe17c36a5d66a255a3e7478c058283eef8ad7bfdb9a7b67b219dc46f0765df0e75f0137c96de7d4fb45d8e8a61f289f8605789e275b29f72d998 SHA512 031171505ec107e84de8340fe35a18968ec9687a2449f702397182bf7f44898fe86f449a8f5a331a23a9433687a60db5ad9a0f25d98d56d471da8300fc8a0f56
-EBUILD delve-1.0.0_rc1.ebuild 796 BLAKE2B d8256f56317f8a8da8526d85a81fbe677c8908e4771fcce620a5c11769b349c83f38d55f4e0eaf46f9b7108a029a37520c6f6459e4e56cd372be75706a4db87a SHA512 6bfc9129cd54f01bd9b737b8db63dcad3bcd647fb278f003fc1f41cfcdb96a81b4ad30df0769288387bb26b45a29d892107cddbdc2af4a3b8e81404701ba9105
 MISC metadata.xml 249 BLAKE2B ec8ede4a2837793216bd27251c9575c40b75c56d32329307fd53b5ad978a8d92f9d81e41e1b41c82b5ea584ea58744e657f7d428120c8936dac79f250009500e SHA512 5ee3e6c2e8ed7c4a48ed28e46ad9e72430352fda564c03c8105b8dcfa6df9ffa6dfe2b15551379fb684c99d78857acff9b38f91354d081f08dc5fdde71c20cfa
diff --git a/dev-go/delve/delve-0.12.2.ebuild b/dev-go/delve/delve-0.12.2.ebuild
deleted file mode 100644
index cfd7a6c1f565..000000000000
--- a/dev-go/delve/delve-0.12.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/derekparker/delve"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="v${PV}"
-	DELVE_SHA="f605716"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A source-level debugger for the Go programming language"
-HOMEPAGE="https://github.com/derekparker/delve"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.Build=${DELVE_SHA}" -o "bin/dlv" ./cmd/dlv || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin bin/dlv
-}
diff --git a/dev-go/delve/delve-1.0.0_rc1.ebuild b/dev-go/delve/delve-1.0.0_rc1.ebuild
deleted file mode 100644
index 8ba6c142c24c..000000000000
--- a/dev-go/delve/delve-1.0.0_rc1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/derekparker/delve"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="v${PV/_rc/-rc.}"
-	DELVE_SHA="f609169"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A source-level debugger for the Go programming language"
-HOMEPAGE="https://github.com/derekparker/delve"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.Build=${DELVE_SHA}" -o "bin/dlv" ./cmd/dlv || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin bin/dlv
-}
diff --git a/dev-go/glide/Manifest b/dev-go/glide/Manifest
index 51a19d271368..705a12dbad42 100644
--- a/dev-go/glide/Manifest
+++ b/dev-go/glide/Manifest
@@ -1,7 +1,3 @@
-DIST glide-0.12.3.tar.gz 244609 BLAKE2B 49cac9d6cf5b8130c6dcded4eaa6b2160bb5f66120743b8f8225e1dbc4ee465ddb9b0c3fee9aba22c47c11cd11ee37329f255c92b180b3a189f5971afd7e4a41 SHA512 525bd73ed4941428dd2ad06fb5ecf87faa555eb48025a7f9ff57b4b4913b6f1a4202d9875d017080b3e96aee7b3d467c03a815e1845d0686223208f960ef9a99
-DIST glide-0.13.1.tar.gz 269877 BLAKE2B f1b654d04984ace4c2971c785784b9b60fc4d3777540c6bb22e78d799b5995b764fe7f91091dfd36a8d45dd4580bac7347cce7015e9ee53b45ccf646aa2bd4fd SHA512 bd3962a8c1ca528ba1eb9310e150576531131f0aa1fd3944bf0cdf764a7d73c91d8824f287554264b124aac2d8e3b7622ab44e0d919235f8b0ef640d3f0f087e
 DIST glide-0.13.2.tar.gz 271150 BLAKE2B 6c128b0454afa4d715940694161900d1165282f5091a397660a1c48b6a32be85f3796966ddcf57bfd9011713622d99c02c868d118a3f8e76531b5f6030676e1d SHA512 afc3b8f08bf4136370ff1a46efcf4d8b3cea053901883a17b1ac3d7e36c77140f48461169f2ca37c0010b4c6de9afb7f40b5248813cff094d7a1f319ed8e37ed
-EBUILD glide-0.12.3.ebuild 731 BLAKE2B 6b68224a93db60e30ca7dd8363c66d0b95dcb5ad995df1a3e1b3f8f1d5db2b27cd95bcb7ae078a46466be412361558cbcf03b57201aaf7d1d133fb2d7099cc91 SHA512 9b279c4a04dc87285c09f47db09ceff0d0bd8b5ff0ba8ea1ee015c2b2ebd14de009b4b442ad325f3afef55a41d975d2dbd5b71432ec89a7767cc0dc313f2f36a
-EBUILD glide-0.13.1.ebuild 714 BLAKE2B a17018a3b93dce83372294d70143b227f05a2522459621a9b4d66c31b820929751181354f8ab6928224bcdf23c9d729f9cc37bc2309f75601b295b56037955aa SHA512 4e0e7f90cae4a4abb95defa751d80c5e814f87c0951ce0b1d25f12eb1faecaa1a06700200d6e82d0033e38783dd40e3af340038709cfd91ca88d028c481f9ac8
 EBUILD glide-0.13.2.ebuild 711 BLAKE2B 59e9fef1091e2dff8a5595ee3ed95c7885c607e85ced191c4bbfc1527f69fa77770da82bfc4cb3f3c0ff24b10469a953fde1c1f65a6d7bd6a074113fd1e96d3f SHA512 7bb8dbf7fdd6d0bf2b495b09d8ccf6c14e62cc4674a084cbbc9bc701cda4d798ee0a42944cd208eea9b0987406856feaf141bbee03120d234296140c16eee10d
 MISC metadata.xml 249 BLAKE2B 5eac9f5bb2daed523b7aa709aeddddd19a7ed15baed35c969ecc75bc1b225591f4eb9d48e42303b0352c1f751d0324e09554a3d278bf9aae091f6395472c3a77 SHA512 ee4b58b4fe77b2ade45e556d4185ac3fc5299339005d7595988d4a149494234f3cd00aba4cd54d8169e2280afcb82b74bf3b67d39471e28dd69d115cb33dfae8
diff --git a/dev-go/glide/glide-0.12.3.ebuild b/dev-go/glide/glide-0.12.3.ebuild
deleted file mode 100644
index a08792a25dd8..000000000000
--- a/dev-go/glide/glide-0.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/Masterminds/glide"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT="v${PV/_/-}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="Vendor Package Managment for Golang"
-HOMEPAGE="https://github.com/Masterminds/glide"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.version=${PV}" -o "bin/glide" glide.go || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin bin/glide
-}
diff --git a/dev-go/glide/glide-0.13.1.ebuild b/dev-go/glide/glide-0.13.1.ebuild
deleted file mode 100644
index ea72460755a3..000000000000
--- a/dev-go/glide/glide-0.13.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/Masterminds/glide"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="Vendor Package Managment for Golang"
-HOMEPAGE="https://github.com/Masterminds/glide"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags="-X main.version=${PV}" -o "bin/glide" glide.go || die
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin bin/glide
-}
diff --git a/dev-go/go-bindata-assetfs/Manifest b/dev-go/go-bindata-assetfs/Manifest
index eca30250c811..0c86edb8dcff 100644
--- a/dev-go/go-bindata-assetfs/Manifest
+++ b/dev-go/go-bindata-assetfs/Manifest
@@ -1,5 +1,3 @@
-DIST go-bindata-assetfs-0_pre20160822.tar.gz 3798 BLAKE2B 275f8d0601d09534342d7cb2c533b4227b95593039990fcc194a0525f7659451f3375c5cbad10ed8dcbf31bb513224da2c7475c7ec3b0b946625c937cfc000d4 SHA512 1dfb49c0eb0ff52119f19ad4f0f4cf3f0c37b1451f17be54b4d5fd1aff8fea9f28de8a764a995fc6bff8b818628aa7240cbd97b7e7fa5972770aec156eab8739
 DIST go-bindata-assetfs-1.0.0_p20180223.tar.gz 3984 BLAKE2B 5493fd7546df6fad162cbf51f49ebec382bc39feea8b6ad9849113f3c65186423387b3db59ef376d0b3fddbf00d30bac272f982c526f0bce80aa98e5460d4864 SHA512 24fb9d55efb781b40b2caac01c7bed053321846b2f38ea317146bc87c008ef8e0c5b849011d856420e500caba655f1993abc6d0a398debb1b8a3ffbdd0d2238b
-EBUILD go-bindata-assetfs-0_pre20160822.ebuild 643 BLAKE2B b798b3a3441df9de2befe2f1403a882b5b6a37322489cda2b56d39e6b026d7de12925fab2159009e4cbfa68c0412272d48a09b362bcc99685f6b0d2a1040f4fe SHA512 76810c045658485bc6af4bbdc4a9c25daa3132e1a29689164845dac183e6053dbcfda58afd039a4f63687a42d20a8a72aeb4731fab80630f2168e64f9f46619a
 EBUILD go-bindata-assetfs-1.0.0_p20180223.ebuild 640 BLAKE2B 7fb413676f3d4864ebe3aa85eb1ebf7a4eb4e5a6e886ad4e367595e3f682451a6bf15b3ed652e58afac6b23cedae9eb6923f1997d2b38804b69074e24958455d SHA512 a1ca611d8ae3e2daa4f0980b873563caf9fb71ee4474cb777ed072e21afd72106cd115538885ddf7eb81ebab3b1431bdce89a7903606d6e836e79357eec828a2
 MISC metadata.xml 258 BLAKE2B 27bb554801679826c9f8b158fa3c911f946510ddc3085a0bf73a624e405d51ab19393066caa38a08f216e338c14eaaa278a1e775be10ad855a4d100308455c3e SHA512 55c43f39e49f4eb0e2874caeeec6fe3a3fa494c9882f8cd9de50d5b050963ffecc586bc17d21fa126b762910475d615e287521ba36c2fb58d124ffd45225b773
diff --git a/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild b/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild
deleted file mode 100644
index 55da1ec3e689..000000000000
--- a/dev-go/go-bindata-assetfs/go-bindata-assetfs-0_pre20160822.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/elazarl/go-bindata-assetfs/..."
-EGIT_COMMIT="9a6736ed45b44bf3835afeebb3034b57ed329f3e"
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Serve embedded files from jteeuwen/go-bindata with net/http"
-HOMEPAGE="https://github.com/elazarl/go-bindata-assetfs"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-
-RDEPEND="dev-go/go-bindata"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
index 908cf7635024..6525533871ce 100644
--- a/dev-go/gox/Manifest
+++ b/dev-go/gox/Manifest
@@ -1,6 +1,4 @@
 DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
 DIST gox-0.4.0.tar.gz 15766 BLAKE2B d2cdab2404f49bf658eedc8884185044e19df0a6250966633fcef2ffdb44fb927a1c7c6341141b2a1a8a336aca819a7f861232742805458fcf16eff622a9e1e9 SHA512 8e6e1d436710ae71a77df266eff1feeeb8d50695bca8a77268d9480286609db8d38e33a1bc17f71c0b3eee919e2a5d53f8e653f773751099ba3fc884b9a03da3
-DIST gox-0_pre20160725.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
 EBUILD gox-0.4.0.ebuild 637 BLAKE2B 706eaf1ed567a5f17fc9e782099f21aff2925761a8784226a08be8b2630cce3d4b54d9e7edf5aba30ecd3f6c81ea2684dd0510e47f645b3c6bfb5f9a87cca67f SHA512 a7cbceb9c28d2eaa76eaf9af45f62b65b98c676dd9d0ca02ab0197d9281abac1dddf66b95b319282e20a0c2731bf882d389c4741246d9a8c2603b07188eb2f15
-EBUILD gox-0_pre20160725.ebuild 700 BLAKE2B f6247d9425967116bfa730c6664f17f66b099da71b4a0329c4cfc2d9c08dadaa4a57671bc0e76bef42864ea6b4494f1c4436fea184248e5e67109ed8d02d347c SHA512 cceb276eef86d8018b35dc61a7acd908abd42684958a7cd80f19ada359812a7c5edd81da619698b5a116e6afdbaab1de4fed1bafec4b8d0da063c8128a158c50
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-go/gox/gox-0_pre20160725.ebuild b/dev-go/gox/gox-0_pre20160725.ebuild
deleted file mode 100644
index f7145c418b0f..000000000000
--- a/dev-go/gox/gox-0_pre20160725.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_VENDOR=( "github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7" )
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/mitchellh/gox"
-EGIT_COMMIT="c9740af9c6574448fd48eb30a71f964014c7a837"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A dead simple, no frills Go cross compile tool"
-HOMEPAGE="https://github.com/mitchellh/gox"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MPL-2.0"
-SLOT="0/${PVR}"
-IUSE=""
-
-RESTRICT="test"
-
-src_install() {
-	dobin ${PN}
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-go/twofactor/Manifest b/dev-go/twofactor/Manifest
index 26d57b96d5f3..318aa0dc53e2 100644
--- a/dev-go/twofactor/Manifest
+++ b/dev-go/twofactor/Manifest
@@ -1,5 +1,3 @@
-DIST twofactor-0_p20170917.tar.gz 6637 BLAKE2B e6090a420f7d98063aa01f1c88c1dbe20103cdc4fa30d8fa9b235431f2d8cdcf1aee3cf7773a97916716aa8d0e257adc3f854db138da7c2541eef7cf1ebd493b SHA512 d3cd43d7fe2c819fa9a4ea1eacdb9508d20d54d638239c379fa8ca6ca83ecd67a06aff054c023b55e4555a227a725fd21caace55159a544fd389e30e67c363ad
 DIST twofactor-0_p20180418.tar.gz 22515 BLAKE2B 460098bf0ff570a896eb9b596ecee05ecf35219aa6ad8a5b2e8763740f588c158d186941e873623c291694eb35a2390feb372e04adf1a667aed5f884fb0b436d SHA512 ed02ab278f753d05f34b8a1e1656174cf36ce7526501d06056bdf66aaa714515a4f585b0216f987fa1cc8192b0ecfd685c729bbdb25ffe7522ba7cb8076ff026
-EBUILD twofactor-0_p20170917.ebuild 583 BLAKE2B 5a3f2ed03a32572a591999606ad82f89b955b272eec69e9de56f2538e52d29ba84725081f3950db50440cf82e836832c7d64310aecb4d18ee635e8753b959e74 SHA512 ef5dfbc34ebe169cba4a49d71f0b989a7ac179b7b57c0c06b0d6668d3a8f457254dcea0ffb1b8404fdaa6002c10dfcc95617a839cfcc9bcc1158942002952c39
 EBUILD twofactor-0_p20180418.ebuild 583 BLAKE2B 4119725e06d1eb0d66f9bac1209463ae251bdbb587be0149031ca47aa4142d44fe3c374a87fee2744c4b5ee15fcece4007ae5700d7e72f9836c237161ccc89d8 SHA512 9cacda3d344bb56a5f77a4fc82303aee1c804d73bd48de8937d4afa37b9a5be33d5c3862896fdeee8df8b76d81bd37eb7a00099106fb69766e38798749625da3
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-go/twofactor/twofactor-0_p20170917.ebuild b/dev-go/twofactor/twofactor-0_p20170917.ebuild
deleted file mode 100644
index 7a71738b87b3..000000000000
--- a/dev-go/twofactor/twofactor-0_p20170917.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
-EGO_PN=github.com/gokyle/twofactor
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT=eaad1884d40f9cabff98a57a524c17afd00c9fe7
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Two-factor authentication library for Go"
-HOMEPAGE="https://github.com/gokyle/twofactor"
-LICENSE="MIT"
-SLOT="0/${PVR}"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-go/qr:="
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 1902b0777445..f9e016fa8610 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 50ad385e8d8a..78bfa6b78775 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1,5 +1,3 @@
-DIST parser-combinators-0.4.0.tar.gz 9130 BLAKE2B 368482bd968a4476366ac04162efe1d8ac502dbb964b21e4090bf48ee9f3e81879bce69a0cb8e72d3b51b4f278be23c3c6bb4f4fd434938682c680214b0a95dd SHA512 9748a8a23bef1cb386970722e148a4cc4e36e8f4100ac34794e2a2223b4bfe0f1e6e0f58d82b500e535cc42a0066be0c5bb5676892e4b607d8d6eac4c4f93a28
 DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
-EBUILD parser-combinators-0.4.0.ebuild 749 BLAKE2B f23ea4ee1d77ab09b1c4f1e7911de7b51f0397844ca5d6daa7dd23887de05c0ca9a153e8fb210baed43c63d3f5e5dd33a2103e473d3af385ad20a761a4033098 SHA512 c9b3830008f94fbdce2fec3c1b590253bb331e5f4d57ba5e93a16450bd1a735d8648d8716dbbe8e7747cbd392df6ae4697fe4d5caf6182ffb1fa38dee650c2dd
 EBUILD parser-combinators-1.0.0.ebuild 754 BLAKE2B 8887376129c5c1a47890aa9d1038cd3f94260174d9b1d05e0da4fc46fb7299bc817d0c90f8eeca0e2344aff15d3a10948845a39b5bb3edac5d328ddc78c13b8e SHA512 36c03376d2630c1dbe78b76840aa79acb423a5ded2bd71e02068c63280da1fdbc2195db5098501e9a42d83b4dbaa4279b541c56430b96e75cb39f8a77d12cc2e
 MISC metadata.xml 274 BLAKE2B c388b8c9779670306256f7b3098096fb2f9117ce45a8ae5c695e49cd84a9173dfa05ad46cc34dcba1d13597b51d28d5f6c8919a4e04bac85c6021890a82f273e SHA512 c7240baa772b5bec49aca595a472b5356289983126d38a7285dee7e6e22bb1f2b9ebf5e6996c1c91df3c8939976dbbe90d198806ac9eae35a64add5b604c5af1
diff --git a/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-0.4.0.ebuild
deleted file mode 100644
index 3f37e4341125..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-0.4.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
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 172ee0e8b514..cc8dcdd6f564 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 1149c2ecf585..6f8654e4bf72 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -27,6 +27,6 @@ DIST icedtea-bin-examples-3.9.0-ppc64le.tar.xz 1845088 BLAKE2B 95f98bf4d76241eba
 DIST icedtea-bin-examples-3.9.0-r1-x86.tar.xz 1862632 BLAKE2B ac63c7f38ec35dd63b01e5f9472a1f226fd3eac7f5e5f8a55e5d211b20344b86ad2d55cbe8f67acfe80a30bbddc72f8de091ae6d3b7df454bbe43c42ec957726 SHA512 d5b377e015550f14996deb040ce753fa4f88eb1fc0ed76babee6e187feff61c8947c54c4f876d25e5fc6344b1411c4c93b75d362206f966e69b205a14d18380c
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
 DIST icedtea-bin-src-3.9.0.tar.xz 45749212 BLAKE2B 2b66ddd1639e84c637775321648d24e6161c292f54af40d6ce1dbd07e9bbcbb177d5895548ea82a6168b35811d48807e58292533846091f13745f13408ee055e SHA512 05b4df389d84f7be144bc99c10cf544183db77b4a7c141826079edb445b5af333440a5bf0ac627133043e276334993969be22caca2db9edd6249560a4db031e2
-EBUILD icedtea-bin-3.10.0.ebuild 4386 BLAKE2B 720659af370151591be9a945ba7d3f030e0d63b2e27d957e1f4600f614f0b4c5cdf667f8b8854f8fe4550d178ac19183ae77f1aa6815cd8c18850f4d658f7d86 SHA512 b74d9c57e899871377d8f5edec1307320169b7ab2007af5aa4bd3a1b2688a222935427585a8fcfebc0963c7b8e51e1a981a1d3d48562ec8206b1485d5c784932
+EBUILD icedtea-bin-3.10.0.ebuild 4384 BLAKE2B bf9894c86c08252a65668b6c1d59439de1f52203817bb63040435f43a21b9464cb1c02bdfe12a55a3b3de6f35bb3c78580abb4d8f8b7d3b9f27f0805a5f87971 SHA512 36f2db8aad218054f8f2996944c943fa79ce61a1a244eb74a4c1f255ee517bdf09c2cbb2bc334d94983bf6b5cda4822897f2b69c2e8836eac28999d42b985536
 EBUILD icedtea-bin-3.9.0-r1.ebuild 4384 BLAKE2B 332158ae2f0276eba921a2ea3d7ad3db1b137adddab2979d5e0f19d2c70bce6ccca27f0598663dc7f96f9b5f536f8d6cfec1bfe4250f1cd8f60451eb9a3be2f1 SHA512 02c98cb023c4cf21735796ddfd3a46528ea3bfd250bd58208a5ac0e11a916e29608ae2fbf42fc6c4c4f2e923b88d561ca9e5be636a742a0c365bcaa98ea73bc8
 MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
index 56e4f9b412b2..a214c68cb503 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ppc64 ~x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 2891cefb70e2..58210bca367e 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,10 +1,10 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
-DIST OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz 193328951 BLAKE2B f7586ed6b5e5562f6b1b4ed155abadbe31cb85459c982b0011e75d85046261c0a78dcaab343fb5c5c7a382c3fd1ac52caefc8194262e35c3601b9aae5a9b94e3 SHA512 b2e5bd25fd62425e25a9a60cd2ca4b080748a352c04c29f206ab121245226c61fa5a8573d342d8bf88efd83a9a7890fd85cf90d700dae28f632878a60d79ea75
-DIST OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz 176285783 BLAKE2B a64f86a4f69302efe0eb2645d39c44ce89bcf58c765c12c109735fb2ede5959b0659d4b9f85cf8e79102fc6f00443b99a78fc5745086b1b5e16bd41958db1ed7 SHA512 84eb35634a985647d4fc90c6c4a1855c1c059e5fde8cf3ef7665fa754a7549cb3905a1c35710c6c936426efd6e0bc1ac773fbef11550dbadbff622fd2c201d74
-DIST OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz 195689094 BLAKE2B 4d65b7993fddd113964103a1066faa6e7e83ab7807f6403c1f5bc5a72ca82dc51287d4911e264ba5754b7c1184aa1f1d1c94d19ae242ab02bf238f6c359c0de3 SHA512 f7a427bc33b2e8a2f68c7955b23d14f2eacf7b526f2990b29e55bdb1ae96d3e14f3d7c169c76ba4b18fd8195cef81d7199a37a81ce73d6b21a72f07388e70793
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz 193388219 BLAKE2B 21ff9bcd5288a17ff7f660fb9b1bbb6c38589fea72850729227a985dce1966c6d0b0d6c64ad6885c17612d215e58a50cec5f70205877bb26c70924b15f92886b SHA512 200ebd5882e2ebd315a2d0fdd800d70b52d468022ae565756ccd56e1fdd2464b459753cfad6c5f46a61cdda8a003cdfe031c2a6a12e047bbe7ee2133dd048546
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.1_13.tar.gz 179520284 BLAKE2B 32acf913aa1b176ca98af0c6111e7f14bba22b84547e24dac279205bb0c81fc3845239e9e34c897c18452ebbb4c71b8185fc4d7d3a2856f3cc767ed4c268d61c SHA512 3bf9fa8eb4cdad03dbbb648b6ab1d8ed5ed34584abe2bec254626952aeba2fc5d492075ba0308ab8e28824959df5f11bb46ec1638c2588b352dd58a5097c030a
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz 195710782 BLAKE2B a374afea8de4333488294dcb200e235f7cc42309a56e693a9b5434dc74d0189b57c26adc93ef22454a4ed05f44b90afa8fdfc016feb022c1eaeb706044581f24 SHA512 b5e55cd32daa3b30fb84b8f4fed0ef70e4f8e3e153974c0c9fa0fcdf22cade99613da93f2289798b625adde24d9a1c4c4808a139e9f2feb2543b05f273f3bdd8
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
 EBUILD openjdk-bin-11.0.1_p13.ebuild 2784 BLAKE2B 95876cd57127d335f3d994730512546d1e3ee5a46aeeaa0bf50ec10d9914bc176dae841b1865ddde5b5b0e3fb71b6f830465fbe13d1ef5f21cd084293f7b5d23 SHA512 ce814dc3dbf3b3a6e2272c496d4b29dcb614e7eaceaf7245050fdc1c797678b187b49b876bdcc313e83050d7c21bbf965f9e735e495064ea0b5bb9bb3039b188
-EBUILD openjdk-bin-11_p28.ebuild 2775 BLAKE2B 20fabb82d8101b07553d846723eba61a7fbb2190778219380d0d765d8bb37a90bc7d283c362c9ead2a8bb976658ed106aa2403dca13c021a9d8cfb8edb0bbc8e SHA512 bdcd5bd21dd5f2bad6de0d49ea2a27994abf1cb005bfd0f84c385a6636ad9f76ba01b130a48540da2ba0cc2cb3496b0dde4d9fdc186798a0f9bf218a919d00b6
+EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
 MISC metadata.xml 921 BLAKE2B 9441e4d8e4ab3fd0c0523e7d96a60b6e1fd77e863fe6a2a9ab709d50864d72467304543c6771acea567440f9b02ab7b9c63053fe73c2780e655a12976964a4e3 SHA512 5ffc9ebc2ed1ecd969c0ce65032b174ecdc74614bc7f751d069d4cd2e2a17019bf24f6c1c3f27a0ba4f7ca2e78fb6ff420b51f4997fc8ec206e88af6ee8a0106
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
new file mode 100644
index 000000000000..ad6e3e5d68c6
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK 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 headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+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 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild b/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
deleted file mode 100644
index bb324e59cec0..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_linux_hotspot_${MY_PV//[.+]/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-RESTRICT="preserve-libs"
-QA_PREBUILT="*"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK 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 headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-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 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 99b498ed9a65..2ee6d0d48cf5 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,6 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d
+DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
 EBUILD openjdk-11.0.1_p13.ebuild 6401 BLAKE2B 86381bd59fe75ed46ea61be83ab4472d159ebc3fc8e4e8c0002d3ea466ec00698f596c42e00ae7be917f99d3fb3ae29f1cfdc210bcfd6c8356190b43c94e54b9 SHA512 14e99b33160524651ae00cf05d99fc15ae256cdd58c9819b5989cdda26ac69b867bb65446b800d400def2651f191b3d06682f5ab9cbed8f50cb68bab6e1019a0
+EBUILD openjdk-11.0.2_p7.ebuild 5815 BLAKE2B 654c041720ff2ca3fac23832b8f848cad3819d09c15b0d6da1d46afb9d1b75c6005e1931b77971a4e806a1fb4dfd919605a886090800063a37eb2ea5aafcecc9 SHA512 65d119936667ae3bf2ae9106b99180fc0fc6be30e905bd2f5bcf96c430374412fdf831dc7a698543abec23c3acc8ae1ea3790d7efb8b010d776c49d033742b28
 MISC metadata.xml 955 BLAKE2B 5fcc3e2073db70e6c79ad69c8d3cdc516393d4f0bb18e89a5801ce45afc55a90584d6f65389cbb75b1b81e1bccbfddfa2edc54aef2dbfa8c65ec54087e3a11c2 SHA512 07e908b635f563d116e8dcb8ad9f550f679168c6d548732dca0090424f6caef5c849fcf64036e8732884e190cbbe125097eb3f5ef8ec65b54ad86ed1f1893331
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
new file mode 100644
index 000000000000..1a48fa81cb9c
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
@@ -0,0 +1,211 @@
+# 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 +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+
+CDEPEND="
+	media-libs/freetype:2=
+	sys-libs/zlib
+	systemtap? ( dev-util/systemtap )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+"
+
+# cups and alsa required to build, but not to run, make is possible to remove
+RDEPEND="
+	${CDEPEND}
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	!headless-awt? (
+		x11-base/xorg-proto
+	)
+	|| (
+		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] )"
+
+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
+}
+
+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
+		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
+}
+
+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.
+	# currently it still bundles lcms libpng giflib and libjpeg.
+
+	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-native-debug-symbols=$(usex debug internal none)
+		--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)
+	)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset JAVA JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	emake -j1 \
+		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
+		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
+
+	# 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
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	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/*
+	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/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 6b3851be3877..c415eeda0126 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -2,20 +2,6 @@ AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572
 AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
 AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
 DIST jdk-11.0.2_linux-x64_bin.tar.gz 179640645 BLAKE2B eec4537f9c1ca88d65a65b1b827afbe49b2a020f1ba9056fe4a2efa31bcf1e0f134eede8bb0f51669f1978c79cef9a1b7eba6c93eaa2bb79e1847713ccc1cd57 SHA512 f6cd77cdad20107d8920bcf403ec01a7fa6d6eb9c020cc59077bb07633ce824562bec8b261ff1a3ea0e3946f6e4f5db8f704b9700410967c10c583967629270d
-DIST jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz 9508019 BLAKE2B 6eabd83f98f1497c2c73cfb5972985ca879efba002f474dca9a0f4d30e3986ccae7886aac074f2f6ffc4100cc8c96514ccae0bc60af845028e8e89b301fbfcbb SHA512 8b5e79d55e2c88127b53f9c52fb0e7033b1023daddcb59b43c991baf46db7276a5fabf8b39516b097967aeed354e4d7399c459a5784448cd4f6f4872b1d758a0
-DIST jdk-8u192-linux-arm32-vfp-hflt.tar.gz 76544503 BLAKE2B fdafcddd9e277a9421e9218e2b5de83792f9533cfc3b3e99afe8ee94776ae573fc97ed73702dbf7e96461741e7939b111ac8dcdfba9bdf28d2b6951acad8479f SHA512 ccf6c6fbae9453c86b53255e13a3eaf3cc1ab999480244c8a38236c7d29ca46e9f1a0ce9e9fd02295a0f98eac97f3ac5231909fab655c0eda0f24a2d42c7c4ed
-DIST jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz 9506333 BLAKE2B 1928bab95e3877fd9f5c28a7ac988c37613f5ae74abca9646c8fca1d9ebb2c4d984783699411263537bd957b0268647e1dd1d62036a15f6dc7d918e4582ccebd SHA512 cee7a8de81fddafb26ca4b64f6c01052c51524e28e281863b17536200068de0e68ae66494e9e0d86cc6bad1dd01aafed281a9690e3e1c0a05d890a3e32850e5f
-DIST jdk-8u192-linux-arm64-vfp-hflt.tar.gz 73317460 BLAKE2B 5be8ac7829ecf7a95c7ee60436abf5ca318003d11a4c3ad9ba75306983c934bd3edbce2e54fbfd472a8a6ac6d7b24be57ef87f14c7af2ad4d5acb2c74ce167c9 SHA512 8471afed26e5ded356bbd39b95d8f1ebd3a5147ae7cc4a94c90efa9bf8baff23dc8f4b10f2973307a1f48d3722604603c3e4d708bdf21c4f5aacfb0cac088b7d
-DIST jdk-8u192-linux-i586-demos.tar.gz 58483041 BLAKE2B e333914701dcf4ae57506f12846b19de91b323a63cb11f1bf840d4f3dc1b620ff141b0b7c5e2a21e4d2e2e3141c1e9a9ea6ccb01d0a5bc97d51053e9ac4e5f9e SHA512 d9b2e4b2f1052c56dad3dc0c715ab51e3cd68eeb8e6911a4f15683fec98873bf510b36541c8725263bfca7fcba65e4cb6c8bb47e4bc7e67d660b06b7e0cf0fdf
-DIST jdk-8u192-linux-i586.tar.gz 194717101 BLAKE2B 73f59da39bb5b9c2bcedec5e112b4f7ad16df144a8ef0d030f157903eb3a51bbd7a7f262da5fb478c4441658c2a0a30ff96e497d72c24a143e2118e4b3ae6b96 SHA512 a4bd3bfa9dbd9d64d270c75b23c985ccc5bc2a706dedcf5007b6cd027249acf4e1a0379e470baf9cb2b83f8b3b26a3720320171b4ea286c38d9c1318195257d1
-DIST jdk-8u192-linux-x64-demos.tar.gz 58589568 BLAKE2B 3a025954ed0b9a174f3bd642fe3a650562e200a549e6dfde4b34e01df0137a24a8d89b30b3bc9a2f7f189b4a41236b3678d54a7012a7c3555e168ed258a2bb3e SHA512 48e1b112c91e7b81579625b29050a48f3237b18b15a278750ed4436a3eb9869392af091599e39f1d492eb3b92cdf932a8c772040539f9e10f0d263b1afafd1c4
-DIST jdk-8u192-linux-x64.tar.gz 191757099 BLAKE2B 42135add35e5acf2ebe539a5667828f41e88de1dbb79d39228353d5cb5597899b6a15cfc5637317706f209888120af5d044cf3a074bbea960f425226e8e4002c SHA512 96ce0662ab474b33d28fa14edada040bd6b0a17b9374741bb132f7e9cc21b6f5f03cf8926bdef5e44669a9ffa593f887ab82d42b7b701eeca74a173f70dfdedb
-DIST jdk-8u192-macosx-x64.dmg 257868944 BLAKE2B 86e915111aabf53fddc46cdea4d7a1b6a9425e1238d156888e5d2f2784a685873c7a388cf066099d8bf5d164ff7d14380c3b9c329a48accb4d300542d95a67a5 SHA512 db059e7c8ec627dabbad46a388c0a36ec5591ae9513e9f82db9a0bd154c6001e97a526234c5f435ead867702986995dc8b866d925b63dfe2ff6d4d6394f10db9
-DIST jdk-8u192-macosx-x86_64-demos.zip 58763903 BLAKE2B b38c05db314582c5015ee7253473aa8bf81bb098e27e952153b139186390047b9357a5134ed1574cd0923d9fea4fafd265248ed65179c4288b4d57c0ae86044a SHA512 c55ac8338b494cc20cf521163b500856d8583f6873100b30d1d7eb388789c28907f76f8504bfb1ccd657094280a1c26b26d5c0122bd95de6b30f3e72e300428c
-DIST jdk-8u192-solaris-sparcv9-demos.tar.gz 8867227 BLAKE2B 76d8a98475eaa3ae2c0209d11640dbbd32aa677f8db40fcc87a9a4c86dd249fbf6bbc3ae9b84ae268468b8082dedd23374b1cae41438f45f7bf42038b2c2a5b9 SHA512 d5ccf03d693ab8ed10aac35b2bbd6823524e915a32e953dd162352cfa1bad7b5fe0db5cd1dcb44d79ab454bc2566d1ca6ba145ab4b28dba1a6c6a001198f3f91
-DIST jdk-8u192-solaris-sparcv9.tar.gz 98913870 BLAKE2B a27a3dc4a6e68972919417f769aeab5716410ed4f793f46886a081799fd4f8b0c2de6f30d7a0a65e08fe9dafe35c83e33f2c26d5e71e9161b6ef40ff3e05d8b4 SHA512 e241c00b29b3e18a3d0ddcc3f88f35c092488cc1b93b0daa348088d85f0a117a43903c5cb3c9edc93653e6f420c4c2f2f8a2647682ed0a2a509add5dd844012e
-DIST jdk-8u192-solaris-x64-demos.tar.gz 8827060 BLAKE2B 9306b0cd984139a5ab1c32c8a436e1e294dbaf0118e1b88eed5079eada806d9049b0acc41279de385173bad94f351891e4bf6baeef4a0478ffb552773fab4dad SHA512 d6f2dc2a8c61b65b3a16b206b7ed7767153bd0713701b1b0d545cc1305739239dff6f1c33d0b7f1412f59262666bcb005b48154ae6d9ef4dbbc900e3ae253c88
-DIST jdk-8u192-solaris-x64.tar.gz 96644048 BLAKE2B 24cdbdc006c45ed28fb7eb855ec295f568bad1c866d57961085047901dcf72e341d05b407fccba43f66896fcf28b09bed8e02e6ee5069071a430b4424bdf1af4 SHA512 7db73b08d3ef52a7e486a99140265091916433c3d0768e2b0631de5ad649ca76a9792e40122de49677caac67951f036824021f91f50f36026d7cf7971b93e4a0
 DIST jdk-8u202-linux-arm32-vfp-hflt-demos.tar.gz 9490823 BLAKE2B 8b7b52e371e0f47e0b0434a6809feaf45500ec46c49a2ea4ae0202de773df88dc3b400f260e629f65b8ddaebd362ba43a8fe83da430d4cdc5d21fe79a6da42ea SHA512 7a3e3d9b89825eee22b171d60d53ee5097823538d0b0ccfe6f3cdde4f9d42861fe85e571fe38bc40dc2d74aa1dd1d8a131dec40ce8f4254c91b51693bbf85d5c
 DIST jdk-8u202-linux-arm32-vfp-hflt.tar.gz 76402495 BLAKE2B 3957e542a0184a5193601553006a314cf970720bbb3ccffec95111d1dfbbbef92c25df93fc60a08eb27338cfbc400681afbd0532eeea54075e7f41e87237b6af SHA512 c406ced79d8ae86e25754e731c3c180f8855d46581e752febfa9c609b28ef2b590ee13f4700b80f51097649abace46aa562fc2fbb74a7face5aafda33732b08f
 DIST jdk-8u202-linux-arm64-vfp-hflt-demos.tar.gz 9494073 BLAKE2B da9d9dade31ebee6fde009ac178c8678e2163da9739950eef61152043cd65f4bd38e919e8da257e4452cbf8783373be387021ccdfda0d60537e58f5be4218efa SHA512 5364da862ffa745137f2305cbb1e9473cc0c5f495ac2d454328afdd4bfa9343f0e1bfbcb8119ac68466d239e7c42683af6a1a3a33ab7a784f6bed0610d9e0677
@@ -30,7 +16,6 @@ DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4ee
 DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2543e966efb2498b62f8d1179d9b47d6af8a411a59dc9b1733423ea73d330cba3cc59f10911e6c81dd6b9f5b497de6ec2f73a864 SHA512 e02fe78552e3c21d40c9bf380228bafd5ff46034d6b9040d0c08ec725003aa5be7da8c61a72a8175bf49074ba89e0e172019db8aa823b5b349414950afc56d33
 DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
 DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
-EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8499 BLAKE2B b0d6aec6ef4111cfb45e26dd2c53d7f673a1253dc2ad61cfb6d11d5aca5fef7533d7ab2e704b2269f75398978da4551774bbec98fc93c4d86abe7c17a0cbd606 SHA512 311006a218f6b65627943a9eaa2db29f1feaf4d90747a7481e6c492f7ab19e651bf07595772ad97e696732d02ab6bdb9326c8d67ccc4a7ebeda0fc54baa41fb1
-EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8500 BLAKE2B 279c3fbe5a0e22854e20fce7634ee2a818e784a88d4c4b12506236a7ebfb7040fdb890ea3c894da54f22454c35bd7f98b6862cce4d945d5e1f26144ec3a7d572 SHA512 fa4bf303f56eba121cf4d1b3684b21c6fb93f02f823ed58842b31e73b79df2d7aacbb7066ebfa046af4efdf7af5397205a044190e857da40b392fa9699db8dc1
+EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8499 BLAKE2B aff03ec92a390ce36ceb77ed96794d35318b768f14703226bc0d94ce4536609cc33eadae66fb7f34fa12b12c2a159ca28acc60af283d596b008469c70346b68e SHA512 1785b6c76c4bca2ba2ab98dae9dd85648ca754bc5740ad24fa53c5aa8f61c042e97623776ac8ab8b26721f212fe07794ef4e1fa4d970dd59bbbb8c9e4a7dd73a
 EBUILD oracle-jdk-bin-11.0.2.ebuild 6921 BLAKE2B ea5ed5d866f51767aad5781cd9b34dd5ed2490afe815e1139b80dc6b6940f27c799269aea4eecd69e5586750611de92a8114fd52982bdd839b1d1ad60cbb69ad SHA512 5132b1fd4a3b0de6c4caa1f3c2e1446c0db28c7177d3599a733214e3ff49da756208d1782ccec4e36013a6887f8a7a7409510273d3ceb17cbe52da3ce0b31a72
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
deleted file mode 100644
index 767754a40fa4..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
-ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
-	case "${keyword#\~}" in
-		*-linux) continue ;;
-		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
-		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
-	esac
-
-	SRC_URI+="
-		${keyword#\~}? (
-			${ARCH_FILES[${keyword#\~}]}
-			examples? ( ${demo} )
-		)"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
-	examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
-
-pkg_nofetch() {
-	local a
-	einfo "Please download these files and move them to your distfiles directory:"
-	einfo
-	for a in ${A} ; do
-		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
-	done
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-	einfo
-	einfo "If the above mentioned URL does not point to the correct version anymore,"
-	einfo "please download the file from Oracle's Java download archive:"
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
-	einfo
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		mkdir -p "${T}"/dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount || die
-		local jdkgen=$(get_version_component_range 2)
-		local uver=$(get_version_component_range 4)
-		( cd "${T}" &&
-		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
-		  jdk${PV//.}.pkg/Payload ) || die
-		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
-		hdiutil detach "${T}"/dmgmount || die
-		mv Contents/Home "${S}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark m ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial ; then
-		rm -vfr lib/missioncontrol jre/lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* bin/javapackager || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	# Prune all fontconfig files so that libfontconfig will be used.
-	rm -v jre/lib/fontconfig.* || die
-
-	# Packaged as dev-util/visualvm but some users prefer this version.
-	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
-	# Install desktop file for the Java Control Panel. Using
-	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
-	if [[ -d jre/lib/desktop/icons ]] ; then
-		local icon
-		pushd jre/lib/desktop/icons >/dev/null || die
-		for icon in */*/apps/sun-jcontrol.png ; do
-			insinto /usr/share/icons/"${icon%/*}"
-			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
-		done
-		popd >/dev/null || die
-		make_desktop_entry \
-			"${dest}"/bin/jcontrol \
-			"Java Control Panel for Oracle JDK ${SLOT}" \
-			sun-jcontrol-${PN}-${SLOT} \
-			"Settings;Java;"
-	fi
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use examples && [[ ${A} = *-demos.* ]] ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
-		"${ddest}"/jre/lib/security/ || die
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	# Only install Gentoo-specific fontconfig if flag is disabled.
-	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	if ! use fontconfig ; then
-		insinto "${dest}"/jre/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
-	fi
-
-	# Needs to be done before CDS, bug #215225.
-	java-vm_set-pax-markings "${ddest}"
-
-	# See bug #207282.
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		local lib
-		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
-			ebegin "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
-				"${ddest}"/jre/lib/${lib} || die
-			eend $?
-		done
-	fi
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx ; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index f11f44490052..c1ce65502d32 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 8da67ef3da69..9a755af7a16b 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,9 +1,6 @@
 AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
-DIST jre-8u192-linux-i586.tar.gz 87804679 BLAKE2B bb1dea51f0d45dcd3aabc82668790ee274c83f2e3c596d836d7b57c971ff6535881849cce5757132fed1b537a4a9677fbbb0b8b003d423d26ee72cb71047428f SHA512 5c749f358aa5b55513765eeb52dd2e0d3cb2b3223cc93739aa36445af8c6a3171a01cab673e106312e816c0a3b584a8a1be4aed1e2662e86b6d318d86a135485
-DIST jre-8u192-linux-x64.tar.gz 84597342 BLAKE2B 655db641df8349109e2944838f16f37ea208772580f0753e664a0642649745c123b2a781497ca3b9028f55c0bd2816cb5746d7d1d04cc83bb536ca0b467a4fc0 SHA512 d786f9e032bc286f3d4f361c382b6606c7462240b191d04606ca5ed9e59e3d7703cbaf1d57693c6763d00374c76c99cdb2f58c0bc372ef5c14c6304d556b4c8a
 DIST jre-8u202-linux-i586.tar.gz 90106000 BLAKE2B e756771caf8567c58870a267aafc9d48e98f06da1373a33bfdf40cc564c8df1645df38ad2f6951bc34d703bb0f4646b52ebf008dfc470231b4e93078c7730862 SHA512 573e32dc715d280084e71999e71a2875a488cbbba2b42c5107c55669c8842dd4ca6c6f42034b5e0b705c22a7a1d9799b456211034a6f351bc9d8e8fd803e0ad3
 DIST jre-8u202-linux-x64.tar.gz 86883826 BLAKE2B 8e69f4e8d6ce7d556ce7c8f30f5c71a50997103f729935269581f0af054fd1dc769b7099ad3a35d4baf41c8a6bdd76b049ae4908714701b196c4ce57ff61b39b SHA512 2460cde88162b00f5ca5600084f5f6b8720b8158869f5f5832fe886a5a6e839eb48398e9e3df47c45be257d9f6915e682d294d560b09e097ff610f09a76b1760
-EBUILD oracle-jre-bin-1.8.0.192.ebuild 6051 BLAKE2B beaac4bd855933446e09beb4536df6fc7dc90c04b47d754a278c13f681e6ef52e10cc05c29d4504c9c8e8e790f99018024ada60e7da445049549a2ae75d8c166 SHA512 93a9ca002faeb3225b195ebe95799b66ddf436e67309fdfe4290388748534513a84f6d99fedacea90aa5f3fe6cc2978ab7e7f8b80031c16545bd7bbe03a9131d
-EBUILD oracle-jre-bin-1.8.0.202.ebuild 6052 BLAKE2B d81f20107dcfd942a5f415549c7f127cbd171cfc3b9cfebfe271e2f99fa16412c900110a8d51cee7dfebbb01fcbe943d18a745300b4e8f2d10e62a8639d03417 SHA512 37ef970f996f61d273b416df6421c23677491fe5ddc0cb6236a480a889d409b3d9087e30ac98876e0c699b3eb5ee8e0e346612d865b26fe9c7fc9526048b9f1c
+EBUILD oracle-jre-bin-1.8.0.202.ebuild 6051 BLAKE2B 51ec565172dd4f65a1d437091384493f02d4112788ea1ca8dc0e2ffe0afda855490013dd4ac9369e940d8640652459fe516b5e5f51aa58ff47dee7f7243cd97a SHA512 0e958a86b530d7f0fb86681a27cd4a77855cd31d8af8ae47f6a68765904d652efbf4a17c693c2f124bbf28de1619350e4482b689bf8cb55e9a0f984be04d1b12
 MISC metadata.xml 743 BLAKE2B 8669a83860c5bde6fa4dc380173d97756cac52e46cfd60effebe73088e35b8e31876e0c2d267201cb2c739afaed94515ec90ec2b2b2e346664b02bd173540bda SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
deleted file mode 100644
index be2fb2010c25..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 x86"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
-	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
-done
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip"
-
-S="${WORKDIR}/jre$(replace_version_separator 3 _  ${S_PV})"
-
-pkg_nofetch() {
-	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
-	einfo "your distfiles directory:"
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-	einfo
-	einfo "If the above mentioned URL does not point to the correct version anymore,"
-	einfo "please download the file from Oracle's Java download archive:"
-	einfo
-	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
-	einfo
-}
-
-src_prepare() {
-	default
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial ; then
-		rm -vfr lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	# Prune all fontconfig files so that libfontconfig will be used.
-	rm -v lib/fontconfig.* || die
-
-	# Install desktop file for the Java Control Panel. Using
-	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
-	if [[ -d lib/desktop/icons ]] ; then
-		local icon
-		pushd lib/desktop/icons >/dev/null || die
-		for icon in */*/apps/sun-jcontrol.png ; do
-			insinto /usr/share/icons/"${icon%/*}"
-			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
-		done
-		popd >/dev/null || die
-		make_desktop_entry \
-			"${dest}"/bin/jcontrol \
-			"Java Control Panel for Oracle JRE ${SLOT}" \
-			sun-jcontrol-${PN}-${SLOT} \
-			"Settings;Java;"
-	fi
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
-		"${ddest}"/lib/security/ || die
-
-	# Only install Gentoo-specific fontconfig if flag is disabled.
-	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	if ! use fontconfig ; then
-		insinto "${dest}"/lib/
-		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
-	fi
-
-	# Needs to be done before CDS, bug #215225.
-	java-vm_set-pax-markings "${ddest}"
-
-	# See bug #207282.
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx ; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
index 4a38c8f94746..bf404b46ca6b 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 51f887c0d767..c10ca42e47af 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index 5ef5460a11b4..79cc7537f7d5 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,7 +1,5 @@
-DIST clojure-1.7.0.tar.gz 614331 BLAKE2B 4584eb81dddb7660084a067b9332d7e5375f3fe62d9a0af8fefece446c0be654f9916298672b3bab33a166e2e4edd73c3fcd61c49f956bfe83e0de0a122f0e83 SHA512 243d3120fa1a0f559c1f6b4724d0f7ba72e6f6dd009d0849377087e890aa04dba7c119862001d0c543eb0e35ef5c13cc8967ad494ffa9522daa9f8b1dfc77ef1
 DIST clojure-1.8.0.tar.gz 627688 BLAKE2B 7dc3029e38e574cd32c74cce1f3ae03890869023d5fb2e8138f2fdc4461b3f9e119c4b6042e2b7caee9561b664b49cbaf79378ef1fdd0fd78c4d712c3b9d95de SHA512 fa5714397e679f77260db054bdc0891a311e7bd14bfceb2dd0494480fb9cf21fc74dd295e75070105ff0cdd50842390a748d8782397c549f51d85d18d54a1231
 DIST clojure-1.9.0.tar.gz 641645 BLAKE2B 767241c7f252a2977511adf257b1805f81a96594cff2b1b9837c782cfaabd49ae8e6eef30398e7e277952124e843967ac635985da97e2e7c5cc98ec177f3d79c SHA512 8877c654f6aa8ad990593e69b611388659973e5d1d46cf8f6cfae59c4033424a3c7eebd477539784cbd7974f7ff30580f76d8a4117414491f38e18ac3b4efb27
-EBUILD clojure-1.7.0.ebuild 790 BLAKE2B 76a4f4068d2a6c86df406322b936e28a21d51691149020b15d278ad2c547e06f3c2873f9a657da7ef2496d9030b9693c433ebaefdc591845b9a5217bb9f106f0 SHA512 80830ee82ec9e231e6a51b5ad4206829eda962ee13a472c2f53cd1a3af77e4e3e1289077336f4496ad4d1ffc250878a30153177abc70c8dfd245717ef33de1e1
 EBUILD clojure-1.8.0.ebuild 779 BLAKE2B d415833f59ac76342dda84f41eab55785639c30f18ac16bf023f535563d6d6ea3b103909624fe907d718d73de94f2b199568faa85140c6239873572ba716c1e6 SHA512 2f7c5c20f310e935de6e00961f14a1cf4ab15b8645cd92fc596595aa343abe24f5979eabe3e2572f5aa0a3834c953d834f76662846686f671200904bce3e9154
 EBUILD clojure-1.9.0-r1.ebuild 1063 BLAKE2B cad11c72f38e52e491f93609e37d57246044612a0a80c21a8cb41d2010e6191dc07a5a197b55f24397188355cf7d0a33215494e16f81681fae326529bfa90f5d SHA512 fddec1f4d3f3ec275dea4bd0187e26bdc0ae447c723a1b0e7b72625b513dd414b5fdde6ba65032da7f1b83886ce10bb58f78232d7cc836024e0b76fb505b888f
 MISC metadata.xml 252 BLAKE2B 738fe12dbc3869c6805e9f90ec607615f0ef13904c794e181e80fca986675cfe884cdbae333fe4837f8bec0f25235ad5d1c223ccd4f01e3355b4f261abe3767c SHA512 471e24b868f43f66916b081b0f2b7995830020f886a33f177a10556a60f824decfe63fc5128e5184b9edc2e157d3f022cb1913303b3cffe4aa9233025843b9dd
diff --git a/dev-lang/clojure/clojure-1.7.0.ebuild b/dev-lang/clojure/clojure-1.7.0.ebuild
deleted file mode 100644
index b5de3a3ba23c..000000000000
--- a/dev-lang/clojure/clojure-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
-HOMEPAGE="https://clojure.org/"
-SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0 Apache-2.0 BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE=""
-RESTRICT="test" # patches welcome to fix the test
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S=${WORKDIR}/clojure-clojure-147f19e
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar ${P/_/-}.jar
-	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
-	dodoc changes.md CONTRIBUTING.md readme.txt
-}
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index e5873e2d6888..259650145e82 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -13,6 +13,7 @@ AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fff
 AUX crystal-0.27.0-gentoo-tests-network-sandbox.patch 2028 BLAKE2B ed1fa244adc61688cb23e7cc41d64f74d80b8342912b518ac874c1ac07995d8ba2c0d12dcf61740fc2ebfa0c9f3eb9417b40ee91ce115fdac1a64e172dd10cd5 SHA512 82ae83f186f46cbdce5a75b7296af4b01b328f33ab79de067ba1bf3aaf69f569f6d29a3116cc9aea8ad0551ecc8efaba27ca250c9fc0bec92009e61449e1e995
 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
@@ -28,9 +29,11 @@ DIST crystal-0.26.1.tar.gz 1994987 BLAKE2B 2292fbdf119e181313000e035802581ae2060
 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
 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
 MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02
diff --git a/dev-lang/crystal/crystal-0.27.1.ebuild b/dev-lang/crystal/crystal-0.27.1.ebuild
new file mode 100644
index 000000000000..d1888dfde89e
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.27.1.ebuild
@@ -0,0 +1,121 @@
+# 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/crystal/files/crystal-0.27.1-verbose.patch b/dev-lang/crystal/files/crystal-0.27.1-verbose.patch
new file mode 100644
index 000000000000..33c3c5d61c41
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.27.1-verbose.patch
@@ -0,0 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-override FLAGS += -D preview_overflow -D compiler_rt $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
++override FLAGS += -D preview_overflow -D compiler_rt $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(verbose),--verbose )
+ SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 4e4d1586fe1b..b17becc1dc6f 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -2,8 +2,10 @@ DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8
 DIST elixir-1.6.6.tar.gz 2078742 BLAKE2B 4a793ac55db97c1d604d5f0012758d039f4a26eff5866a2ad2b90010f8477a8f62cc8f01a391f93133c927c5da5494b6d10b76f087a4af1206da977b0ec14a17 SHA512 62010100274b99423bb6a660e34ef53a702250a09371ef4b49ec03a3afe8761611b3734aea31763afa361560eb74c6d23e022d4d9bc4453c1bdef36bb37f9b4d
 DIST elixir-1.7.4.tar.gz 2139938 BLAKE2B 8515fbbb89db64efbda8834f2368ee4391a4e0ed042812a059f0d640b0c9028bec330ba192aaec7988d83635bbc25d2a6891236571c3817a76f6477594899b94 SHA512 594e76601e0d6f7eeddfcaa9b76a2e5c66f702a497599fffc5e9255790c18ac5e00b986fc45fd3b90335522f51272bcd4bcf2b9f8951b94eebfb1d56ac7cebc2
 DIST elixir-1.8.0.tar.gz 2179052 BLAKE2B 5bbeb9133360509974c874365ceec1f9ee225b19124817f480a4789936d310ee52624eefb58598dc63b6c30c4f8d0ff512b1472656ed8f6c3fc5c2df207b8d0d SHA512 6a917c4499f543a2e2cd33bebb3a2b5a5cbf848ece53eb5bc9625297185d058307024da305d7ae4211086ef172cd6bf1de9fe8cbc7768f34b0fcc5cbf661b433
+DIST elixir-1.8.1.tar.gz 2177865 BLAKE2B 2f078849eb7ebd8a5b1ac3e894e6340146a0e72c462a251be529d404128478a4e4c913653e85797a3ced035de38ae4de93b84f65df9b6174206e41e00da9e3dd SHA512 114970707505cbf89f8fa55d5c54989dded7feb39cb3674e88f64e19f1a0680086ae49c856fb76fb7eaf0142fa0a0b81b1d5b9570825e05f083a9c580b0ca017
 EBUILD elixir-1.4.5.ebuild 610 BLAKE2B da40f0452c6571e8c72f1dc85e845ffced68579db1903479d4df21d20447d3d800ebd69ad75da3675213feee30d0438fa868a377d6cba94b365bac14adbd6132 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17
 EBUILD elixir-1.6.6.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 EBUILD elixir-1.7.4.ebuild 684 BLAKE2B 5ff4aa8db3b8e43be0c8de1bf6592772bf44e786de3917b7efe86e2eb2a81c7cfc777ebf3a31a7e85117040a86e796e0dc74c5c54386f7822dff38a5f9e8c100 SHA512 1ccf3527ede24d498a22f9cbdee31577ca77922083cff13f63c346ff774e40d7aa9bd0cb6a621e3845c5213614fce6e2b3bcce4db51f17db4a75f34ebb3aed46
 EBUILD elixir-1.8.0.ebuild 684 BLAKE2B d92004a061ccc91a1caeee726f2d81d00ca99d8fd38c381ba1c4c43ea79eb993c7d329837d00f65751b24ab92a63c6890d52aaeacd27ba93481859a60bd62fd4 SHA512 3c70c2a04ea018650ca724799ed46943ed3e7dc3e76c71302abb47e28f0eda3fe386bbaf6e3ce4f4f0ca41cc5ff6dcdd4ba6805ce92d13c201d014d4bbb8c1c3
+EBUILD elixir-1.8.1.ebuild 684 BLAKE2B d92004a061ccc91a1caeee726f2d81d00ca99d8fd38c381ba1c4c43ea79eb993c7d329837d00f65751b24ab92a63c6890d52aaeacd27ba93481859a60bd62fd4 SHA512 3c70c2a04ea018650ca724799ed46943ed3e7dc3e76c71302abb47e28f0eda3fe386bbaf6e3ce4f4f0ca41cc5ff6dcdd4ba6805ce92d13c201d014d4bbb8c1c3
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.8.1.ebuild b/dev-lang/elixir/elixir-1.8.1.ebuild
new file mode 100644
index 000000000000..197157b5e5b3
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 49736142a563..b257134fcab0 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -5,15 +5,10 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
 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-19.3.6.12.tar.gz 34004718 BLAKE2B 49f726a4c3f3bb4fcde1d3ff7cee93ef68a0ed0f5cbb00af8fb3585fb640302bf407351b61b0507c6aaefb4311f77dc0de450d2c43c6f8310f6af01ffd424a79 SHA512 9e117cbbc9cf53d908ae87f58f80f5ad4d3e69d5f1c94e3460a1d9c287dc7290d05fccb104ffc7779dd36b6b9377290ac4c5983a8ad3ea3ca518f66e0ab0db3f
 DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
-DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c
 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
-DIST erlang-21.1.tar.gz 53857079 BLAKE2B ae292f5e98d747a6afb5d82205dd33d55cb6e275e3ebc98a4dbc8378cfcb1ea64f83d5f2d2256fd7208c7fe553b47ff25edf2858287f5316cae50788f2175337 SHA512 9e118e902c33b8dd71266efb4cc4aeb0db0d8be8adb64ac85595a6507dc847b84e5444a9b5c5cbf46b560c885db9f4cd934c74de4aa2e1574785295ea0865348
-DIST erlang_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
 DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
-DIST erlang_doc_man_19.3.tar.gz 1410781 BLAKE2B 78293aa498c2651be27d83f13e14007f25a1816b4dae499f463249f774256eddde3a4e31c435a30edd04fb6f41cee965c968b338de77330c3320f3df6087be92 SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1
 DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
@@ -26,11 +21,8 @@ DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1
 DIST otp_src_19.3.tar.gz 68510871 BLAKE2B fc37c493f5fa3533aaa29f545ff751f5851b58d8952f6f21ef50fec433d661a1e3300139b30a41d9c1f16b3eeaf5d98450bf0a2408e7910712d9d98f3af19237 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6
 DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977efd182efcef6c466a0ac6232e18d9481823624cdd49a866feb38e96db6150f40927f25f2daaa64fe4aafd02089b4 SHA512 4169e2e653055c62dd66e214dcab577b49cadb8328dcc43adb8a2d44850b12c02db8323992c21852409697c5a48493068316417be9d97519b039a8f1cde143da
 EBUILD erlang-19.1.ebuild 4479 BLAKE2B 671c00139feb254a2d053abd6006504aac816ad56b68291653f663d482138c4b8672b0893ef4e7d37f1610a581aa07695a722fcefa4c233523ab459b9adb292d SHA512 61ed8db5368a33c031588f896ea7f62cd770567dd61e8dbbb1793e4020cc540877e2823291a90227a9bc55811f7057448e49becdba792c600bd5d6168dd3af18
-EBUILD erlang-19.3.6.12.ebuild 6713 BLAKE2B 99d8e6c2e71fc01c815cafb7cdb2b6aa730f3ff07d174d82ee1ab44bfad140395fa6c5e0eb121d32ccd6c98f6bd37a5b384dd3cc02215fc96f229d3bf220f8f0 SHA512 e718298bb175bf3c7fc2828a603d504b474294258b46c6941a20a367e77b460e3f396d425b805c69a310aa428ce3477e8af38c40ea1abbc026c4e5488f8c1a44
 EBUILD erlang-19.3.ebuild 4532 BLAKE2B 8b90954a7cada84ee1eddb41566fd50bf5eb50d154bfc2e13ebcfa1ea33aa2d8334da80554ce5862ba3b3ba6b77ddbd933e6322829bf96985caaeaf556704c09 SHA512 f204b98e05485feff3e66be512d93336a147dfc3e5af1795d5afe3c63a722fcf5f7578c25f097074535b31e4ea5b339848cb2d633f46ae00af0be4b1d1ee30f7
 EBUILD erlang-20.3.8.10.ebuild 6713 BLAKE2B 99d8e6c2e71fc01c815cafb7cdb2b6aa730f3ff07d174d82ee1ab44bfad140395fa6c5e0eb121d32ccd6c98f6bd37a5b384dd3cc02215fc96f229d3bf220f8f0 SHA512 e718298bb175bf3c7fc2828a603d504b474294258b46c6941a20a367e77b460e3f396d425b805c69a310aa428ce3477e8af38c40ea1abbc026c4e5488f8c1a44
-EBUILD erlang-20.3.8.ebuild 6716 BLAKE2B 0c979eadeffa3a1f9b478b2f8025e277eff34e9bfbf629444815f354fddb181749877fd12852c41bbf9322b32e2cb05337510af62c4de900c2b1ccfd2c0840ed SHA512 5d605798812399b51205fd017772d34ea797b07a585cbabc97daa6fad7aa63ea17c527431a1da282b6ec3ff353d5a627c726ad33dfff4e2fb683a25ba06466fc
 EBUILD erlang-20.3.ebuild 4826 BLAKE2B 80ccf3e15c5cb5fc585c4b014b8093ce2306222d6b32c9653aab92e3bdcba2d66e9cfc18b6132ec0a1907495acb13cfa1e5e0f8baa3d12b0a5a8975ea0989e16 SHA512 41682162335ded8341591393fff4bd35aac71e49418a36da6e3c4b41066a39cf0c711ab5a73a61811ee82fb365db15fbb4cbd466dc985a58262303694c2f4cb5
 EBUILD erlang-21.1.1.ebuild 4448 BLAKE2B 7ef3e149f4564939a86ad407326ffdb4df53abe4b50ab916e598ec18f4090a800347b544d7845835b674ffc06c6f7bf3200cb71c71cab405a6a3e2743a6ebc1e SHA512 ffe1f1daeb279907c96c5711fbe81df26a8c21311c94a1d686b39122fe3c217e2c7e646471c3a3c3e7c0a689213f1732cf1c484be24e46ecdb496acbbd979c6e
-EBUILD erlang-21.1.ebuild 4451 BLAKE2B 51029e626d6cc24b9eacd6e3360890a3b01c2ca855e210b278a12c32f1e43be408709f9d2ebd177130fe52425e7645cdaa933070ac2db8392dd99ff5dcf8f243 SHA512 e4e3605c8943b5370e4745c87a49d946ff50414279d834e1567c2125d0c695ca18760c36d7f9e21d033804bc461ddfc857d315f014473de68529fa20e173566b
 MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
diff --git a/dev-lang/erlang/erlang-19.3.6.12.ebuild b/dev-lang/erlang/erlang-19.3.6.12.ebuild
deleted file mode 100644
index 0e30f8b86d26..000000000000
--- a/dev-lang/erlang/erlang-19.3.6.12.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 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="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		virtual/glu )
-"
-
-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"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	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}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## 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
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		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}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	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/erlang-20.3.8.ebuild b/dev-lang/erlang/erlang-20.3.8.ebuild
deleted file mode 100644
index ac47c4ad59c7..000000000000
--- a/dev-lang/erlang/erlang-20.3.8.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 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="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		virtual/glu )
-"
-
-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"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	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}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## 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
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		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}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	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/erlang-21.1.ebuild b/dev-lang/erlang/erlang-21.1.ebuild
deleted file mode 100644
index 4b6b149c1240..000000000000
--- a/dev-lang/erlang/erlang-21.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-)
-
-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)
-		$(use_with ssl ssl-rpath "no")
-		$(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="${ED}" 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/lua/Manifest b/dev-lang/lua/Manifest
index eefd2362bbc7..0a1a357ff028 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -22,17 +22,23 @@ AUX lua-5.2-make-r1.patch 2442 BLAKE2B 7f281a96b602b992099869648cc72293125788906
 AUX lua-5.3-make-r1.patch 2854 BLAKE2B d60d1656a5f411b218b4f1f861f150759e6331ffadf28fde50cf219cbe01b5f1e6be4a3872b3c27a9ed561e80f91983e024124ca5c5871c6c63252cf0ac1c11d SHA512 80c2930bbd204551545cdd6793ec8dcd7d753fffc29710786b3662dde13b1af3a9825c95118e23bc98149f316f12f008223b675df929a244ef29c8a2a773560a
 AUX lua.pc 658 BLAKE2B 580504c8162c9cbde35b4a817c688b955cad1a35b1c21ed527488eda6e7cf78dfa81fa8b100737cf9ad620d34d94eceec01ba09e4fab0b121c5e4c673677cd3f SHA512 cb476ea6dd004a9aa0094cfc219d1888c5f578b44968a960acf1f2f32783a8e4d770bb033fb1ab4851f225188bbdd434b5d239718cae2c2c35f5b5f124a722ca
 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
+DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8
 DIST lua-5.2.3.tar.gz 251195 BLAKE2B f3d11e180fe070cb5be98f0694081d26067e21eddeb09cd74b1bae6ecf01c53dc46746b871e38555525da155bf1b83f0e60bae5387c2b96b1d19b15f94b716dc SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449
+DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
 DIST lua-5.3.3.tar.gz 294290 BLAKE2B 8052d3fa5f34636df314886a62d63e46fc76ada765679da9352e751f484a458404ac55e5b32ad63ced9d2b16d629d62a52240b1b1a509bcdf5d5df85e405646d SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
-EBUILD lua-5.1.5-r100.ebuild 3759 BLAKE2B 191eb7aef48ba9b8e08254e1e7717e47a48ddbc21810274b3063c8d0d98790dd0da1bfe52128e1da5472285dc89c3f9770cb5b02a0121316c16121df5f1161dd SHA512 7191cf605f57063dabeb201f9fb747d0df1c4b7b9ede34bec21d8e0f0eeb8edebc4be82f7157a8b23b18f352f5b07bb03a83cd645856e6a019fcd5c2bd0c990a
-EBUILD lua-5.1.5-r101.ebuild 4020 BLAKE2B 9c151be5dd2bcbd340280f647e55d3db580b3e56367b3a18924e35223f9ccb9d4f9f2e05bd41ec8dd43e984bb28afd12bfe02a569776216d9dc78e518c32ba06 SHA512 16ef9fa4f9036aa7ab9683d3cf25cd3015fafbea13248b51d65ea47ceddd2c5ed378d5b5df36fd87398c5220389ae08c08103aa4ae789a03412ec7f4b6501a02
-EBUILD lua-5.1.5-r102.ebuild 4020 BLAKE2B b357a5e5f7831d6c98d716f651c4bfa2ebb8e2377a9e1c5be64f4eb0da6e818e2146feacd0e38328cf5ee9b66827b25795a70cb273a8a32ccb576abada6f0bdb SHA512 ace218026ab6fef8b758d6c9a2a6ab5126fbedf5a1bf6a8d3402c2e5c4423f56613bfd71226d7423e8e457d68eda03fb653226812399bbad45ccd1cc146489d3
-EBUILD lua-5.1.5-r4.ebuild 3650 BLAKE2B 766d8a5ef66db5e765091241ca5de32cb475052e8a6612fcf4f5c57d1b45262103aa296f2d208ae129abc37b7082c2ff701bc0a063b1b1784c0151c05efcad13 SHA512 fcb3f035652253697429fc4893ad7e8fe5ee53dbeb27897272f3ff145b91180f6896fbb1e2b670e27f338e6f86ed041bdb1c39971d07935e18814a7438f23e0e
-EBUILD lua-5.2.3-r1.ebuild 3782 BLAKE2B e600a525fa3762916ce36307969d15e97155df36aff7d4ef9f9e540811d7fbdbfe82b40252bc7681e11350613c933e7d1c2c37796a2f21157e8996aa44b43826 SHA512 1f682778d613ed1bb9f56122d156e616a8e03e6de647d52362263f37f459e7ce785e9d7491bf2139cdedf60a6466699e6562ae394a6a9e11a1ba4fbcfa157659
-EBUILD lua-5.2.3-r2.ebuild 4043 BLAKE2B a257fca93afc3dfda9e41e2222c40eb6cfb9f7cd221ab6b499c72273f90bdb5ae5e1a11e0b75c2b097c110565817124093b23da6ae5702552e6be43ac924da80 SHA512 2e7604989198e659d96fc807e820a118639a870f78bcacc18c8e87446252d8cb9d3fae4edc04f57448efbc92edaac104f296fd61321ded4c8fd7b1a983c63047
-EBUILD lua-5.2.3-r3.ebuild 4043 BLAKE2B 06127a7c35a4dc1ec47b0fb447fd1dd265625ef92da2427b8f09f82dec9aab0726c36b88f254b7a6aff6a2916c723c49f800db64b6b74859c01346dcbd2a1a4c SHA512 4bf9770781c348e3a71203a341c39a37b2a32804b2ce1304ed41fb39ff25a916d0729183bce49f994d8ca44c9c79dfb9c72501ad3d0ba2dc9ee21dad48c814e5
-EBUILD lua-5.2.3.ebuild 3268 BLAKE2B dc5a23765550709bb876b200c7ca6e33aa51ca79c5599344a6a111429b0e5ad9d785184bac372fa4e4db440cfdefe100d5abdfff59084e5143323b5d79afebd5 SHA512 1fac24f9f6526a9c75fa35796dbbd87cd0906d7913184301045ba184d259612316f1a7fe21d92c1f562fef1fdf7c59c9c20da8a6f62bbfa1fc93bcffcd99fb2c
-EBUILD lua-5.3.3-r1.ebuild 4055 BLAKE2B cb840b44fada44b133f0db32a2dab08cebe08a501da6d0ca7979a24b52cd6aaae5e02d7e9dfa6f87e216bbecc3c72aa893457a8c0c7146e62147c2eca1e88b1b SHA512 6a5f0a20d7c684853e5be8a7460771b5329c70af57d4ebf199b7812b4d7bd21d625f20536c4f7d234d3cc2467ff29e724e619afdaa2bef9c29d575d527d993bc
-EBUILD lua-5.3.3-r2.ebuild 4055 BLAKE2B 61ba1948449a7e44f57df783975106fce12ab5e9bb9fa761b6f49a8fef8fd95447856b7a1a84e2a0367259018bd41a96e4f3ad5a4d09198a0a177934cda031c2 SHA512 e210a7577bc6090d53cbb0c3863841bc4d649f6d592cdd2a2ce4944b1db1f54c30f5cb71a5603468dac1fe94ab7f0bceed3c668797c469adb6ecc3fe984124e6
-EBUILD lua-5.3.3.ebuild 3794 BLAKE2B 6b3222352e83d569651051474a184d4825db92aa4e6c0722c727e660b9c2d748a8354956b7f3baf9bb09b64968110c8ad061e194b766a4cece15692210dac5d0 SHA512 f7c487b9f6be32b49bc8bd71ac2ef601579a20d9936749829d0ca39a5bba8b465b406d6045f15c33dc1d18590ec58791dd92d1d9d9729095f03f187bf96bef92
-MISC metadata.xml 451 BLAKE2B 97895c97f22d1d17e8e888a311f8b01b345fb296189016efdd4da71384f2adcae47bfe30b4da92499fbeaa5f1257ddb9e3116aa31167e62366127b578a753b08 SHA512 ee674307c2a1daeeba3e9da078e440648ed379422801989007c15c4c8233e905b14f8e4fae66ae2804a5b39b0676e4cca9ff21fb8985874bccfef15b9dd918a9
+DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
+DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4
+EBUILD lua-5.1.5-r100.ebuild 3756 BLAKE2B d1803e806f7f1774eab24f30623b0b61a1432c2ede3d73110ddbc32cd3c44d2bd0146bbb3fecc724c2742e5f2feb752aeab779437766337109a6ccbed0fa87d6 SHA512 bb4d29092517a9f2f3b4e539cf901411bc3793fbad9fbf1d4aea46a88d755d260a7aa7c8d9ed99174f1a8af06e5795c5a5888e6ae70f0b9be28573c80c14aa83
+EBUILD lua-5.1.5-r101.ebuild 4017 BLAKE2B adb5163f2288dcea6aaf403e594d556ede8b1361e05b39c0fd18cd1c351eb942fef327d4f959e06d8314f5d87f069af3a4a9ac07bc250ba5eefd856a2ef8dd74 SHA512 45d9526c3981aa6a4042485ce6b34c2f48cdb4be3fe899473b86261eab1657f7dd62b363650128acc42e06f504c011ddf26b51c788449f12f46fd12243c5f66b
+EBUILD lua-5.1.5-r102.ebuild 4017 BLAKE2B 75c7f8aee292313fd3babeeb2661303caf726d0194b9895c4de62d0bf9ad848d11e7015480697eccee0413942b28ed554504b5c4112173115624e24c9f8f5184 SHA512 62c0bb5edb0bd192a74e69c874fe7b898ce9166f4a035bb162113542822dd8ec4b9a7d73f5a72dbae866a86e032c7e060e9da4ed89348b258901257d2ead971d
+EBUILD lua-5.1.5-r4.ebuild 3650 BLAKE2B 7675182fd8d03bef28acd88b4c55a664984145394201dab0b3c78093088f32ea559a8d2d26b563de4220910963c340acf1a6b97f4499b35ab8f2cfb9d5349795 SHA512 1a801b9ccce37b77fffb1ab3d1aa5f4689ac88d1954c67e0fbea028b119577786b3c7e8a8ea78e665b90077e451f95c6ea4354873621a60f4d5526ab9c0b8875
+EBUILD lua-5.2.3-r1.ebuild 3779 BLAKE2B 907080c531114da76597ee4c313acb5696729caf91c4e466aaf3ab4202fed84926e6dcf8efc6d3e9ee025455685b222c9e9c648af5c60764edc0543393667e3a SHA512 a0ca1dec38caae418bb4db08d64fc62e38d4cae4dee073464756ffa6c461e47b70fe011ea2a21820530437ff3b5026ca888f7b7636275fe5a4938cd42f411dc8
+EBUILD lua-5.2.3-r2.ebuild 4040 BLAKE2B 1bdfd504a8ac986aff793ff8bfcef9bfa3a36615bb2386da7749dbde6bec549edf062d117244f2a0df735a11fab9a3a296304304f26c359a71761e6a8f41fc08 SHA512 b830f696aa645b45a60ab98fd3240278cf294d936a68b59b5ab5cc3cd3cbeb585124ea95ea952079193a4ff72efcf0824a79d32877c191fe85048343f5437543
+EBUILD lua-5.2.3-r3.ebuild 4040 BLAKE2B d1aaba269259a5f3a7a0b38d607045873c9137b2b2b32cbf428d32a6c8db1e8cf723742478c62a41fa34c446f04ecba0c603c03ea0a51d0b4c57d2373fc29f3c SHA512 583c327f446ec0071db9771f7cc8581a52f51ed6ea83965375317d521e3454ecf2d3234a9705ec09fa9edc52e52a823f695748ecbc517181dd9b279a553a4338
+EBUILD lua-5.2.3.ebuild 3265 BLAKE2B 2ab93bfa8b8ad62d5b70a3a22bb2456fb8c93481cc78ac56d57f5e719df30d9f831093d5b41e905641a2dbf7c4d8fb5a1223966363c5aad3282a28f48e57e2f8 SHA512 7c664bfe0db22582828b07d854b587f0d5412878f6ac820e8a62e3595e59b4fb5b4728bb9ac73ab248518eaa8b7a1f8b25e4898817df099eaa461aa1f90365d8
+EBUILD lua-5.2.4.ebuild 5240 BLAKE2B 666dbc7ecee4bde99e2cd2b595d7b39a96469bd2bb2c2d0ecb48a91ccc1956a52bd1d8761d59097dc6838de71dd6dd4ac06354a54c738cc894ac983549dccfee SHA512 63c223c1753365fc12a682bb9382091913c6b83bc096905191bd410bb0805e9edb60b99a4054a75cfee2849615a4779ef2da24d7d7c2a63b431f2faa4556d2b8
+EBUILD lua-5.3.3-r1.ebuild 4052 BLAKE2B eee502f9e5f5898a7bf0425aaee25ac9b6e0be8a468afa4c2aedc6f12aa6425a25a0a807fac4b2d0ee2ebc5edd6160b2b9486a7bbfb3c20fda70c9bada4a55ae SHA512 c0289038b3bd7f0e21fe7a9bb337d69a5ed3ccd2fa2f50697bf9531fbcc9e8151a80a58a778990a9e17923ac2353121da617916cc8a7610d43dfab7fe169a246
+EBUILD lua-5.3.3-r2.ebuild 4052 BLAKE2B 333ac32a3fd3edf0b633f135df3562b7429bcc2feb601170e364ba4ee8abfbe58a1b18c999d9ff9b8513dc3881cce07867566812e53586536eaa2eb3ea3e9704 SHA512 cc8d6b2d22a5a790b26e7320d31ccb14c65b495ba4200049ec1fb50d9e460cc63132536efb19abe8c67992bc3e493a56b52e20042601dc5d76fa5d10ed9380c3
+EBUILD lua-5.3.3.ebuild 3791 BLAKE2B 46737c15ae2477e8c69d004540158ad25b2b58d0543e53e3a491b2d078d1f6b55d204e8d7dbdb780e24704549da4faa0c326a1f907ce6233a0aac73be4af9194 SHA512 3e73adcaa4eb067350086fb494739232a13160ea77332fe7aac13f3b0560ca2131e42c78c74d9415bae22671e6e860d1319efa8b7d043c88739fb0247b866983
+EBUILD lua-5.3.5.ebuild 5252 BLAKE2B 1d454cf7427c7084b2caffcfe14fb7705f0460157c9cb6a944cc507a2ba0d63513639faad8ef3828afd1eab6f98478dc5ef933bc1ce0b76868dcd207fe76a72c SHA512 21ccf28cf0b778f0a362b38c86197890802782b0e9223db70b7234b5bfa74c3babe0a987b16c32f50dd40009295407da114dfda86b9d01f2db0987de6d69e949
+MISC metadata.xml 531 BLAKE2B 5b177e49c99c8f5c8d2208c51efab1262bd7d9c7755d8e06166620445fc2420bca92b5c8dc07030ce91b26bf211b571469ebe4b4b07d091c1cb8ef556832946a SHA512 568bf43d530fabfd3b38eb443fb735c75d6a06293bad4c5b39fc9680654dcd4c93fd270db8250ec20dcba727365b3b18838dfb03c41c615dde179b12b000fb51
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
index f532abb7f4f1..2ea293401de6 100644
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r100.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
diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild
index 94a5f0a3080a..b26dc779b90d 100644
--- a/dev-lang/lua/lua-5.1.5-r101.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r101.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
diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild b/dev-lang/lua/lua-5.1.5-r102.ebuild
index cfd1cdfe50e5..4849b6596ff8 100644
--- a/dev-lang/lua/lua-5.1.5-r102.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r102.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
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
index 4917c1a92275..74650eb17eda 100644
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r4.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
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
index 479f20de07dc..e4c08ff092a9 100644
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.3-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
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild
index 0021ce6efd56..24002f6d5195 100644
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.2.3-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
diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild
index 4096b356b1c9..6e8d314636b3 100644
--- a/dev-lang/lua/lua-5.2.3-r3.ebuild
+++ b/dev-lang/lua/lua-5.2.3-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
diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild
index 30bfdb2bbb17..11bdc573aa1a 100644
--- a/dev-lang/lua/lua-5.2.3.ebuild
+++ b/dev-lang/lua/lua-5.2.3.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
diff --git a/dev-lang/lua/lua-5.2.4.ebuild b/dev-lang/lua/lua-5.2.4.ebuild
new file mode 100644
index 000000000000..a5e2cee1d0f9
--- /dev/null
+++ b/dev-lang/lua/lua-5.2.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+TEST_PV="5.2.2" # no 5.2.3-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+	http://www.lua.org/ftp/${PKG_A}
+	test? ( https://www.lua.org/tests/${TEST_A} )"
+
+LICENSE="MIT"
+SLOT="5.2"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static test test-complete"
+
+RDEPEND="readline? ( sys-libs/readline:0= )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	[ -d "${FILESDIR}/${PV}" ] && \
+		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}"/ || die
+	eautoreconf
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	# We want packages to find our things...
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	sed -i \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		"${WORKDIR}/lua.pc"
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	use test-complete || TEST_OPTS="-e_U=true"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild
index 8addb54fd3e7..0a325d680957 100644
--- a/dev-lang/lua/lua-5.3.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.3.3-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
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild
index b813a414cb9d..61daaebe0229 100644
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild
+++ b/dev-lang/lua/lua-5.3.3-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
diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild
index 89fd40c75eb3..234b85a128c2 100644
--- a/dev-lang/lua/lua-5.3.3.ebuild
+++ b/dev-lang/lua/lua-5.3.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
diff --git a/dev-lang/lua/lua-5.3.5.ebuild b/dev-lang/lua/lua-5.3.5.ebuild
new file mode 100644
index 000000000000..99b6b2063774
--- /dev/null
+++ b/dev-lang/lua/lua-5.3.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="http://www.lua.org/"
+TEST_PV="5.3.4" # no 5.3.5-specific release yet
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz"
+PKG_A="${P}.tar.gz"
+SRC_URI="
+	http://www.lua.org/ftp/${PKG_A}
+	test? ( https://www.lua.org/tests/${TEST_A} )"
+
+LICENSE="MIT"
+SLOT="5.3"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated emacs readline static test test-complete"
+
+RDEPEND="readline? ( sys-libs/readline:0= )
+	app-eselect/eselect-lua
+	!dev-lang/lua:0"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+PDEPEND="emacs? ( app-emacs/lua-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/lua${SLOT}/luaconf.h
+)
+
+src_prepare() {
+	local PATCH_PV=$(get_version_component_range 1-2)
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+
+	# use glibtool on Darwin (versus Apple libtool)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+			Makefile src/Makefile || die
+	fi
+
+	[ -d "${FILESDIR}/${PV}" ] && \
+		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
+
+	# correct lua versioning
+	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
+
+	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
+
+	if ! use readline ; then
+		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
+	fi
+
+	# Using dynamic linked lua is not recommended for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that this only affects the interpreter binary (named lua), not the lua
+	# compiler (built statically) nor the lua libraries (both shared and static
+	# are installed)
+	if use static ; then
+		sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die
+	fi
+
+	# upstream does not use libtool, but we do (see bug #336167)
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	eautoreconf
+
+	# A slotted Lua uses different directories for headers & names for
+	# libraries, and pkgconfig should reflect that.
+	sed -r -i \
+		-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \
+		-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \
+		"${S}"/etc/lua.pc
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	sed -i \
+		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
+		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
+		src/luaconf.h \
+	|| die "failed patching luaconf.h"
+
+	econf
+}
+
+multilib_src_compile() {
+	tc-export CC
+
+	# what to link to liblua
+	liblibs="-lm"
+	liblibs="${liblibs} $(dlopen_lib)"
+
+	# what to link to the executables
+	mylibs=
+	use readline && mylibs="-lreadline"
+
+	cd src
+
+	local myCFLAGS=""
+	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
+
+	case "${CHOST}" in
+		*-mingw*) : ;;
+		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
+	esac
+
+	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}" \
+			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
+			LUA_LIBS="${mylibs}" \
+			LIB_LIBS="${liblibs}" \
+			V=$(get_version_component_range 1-2) \
+			gentoo_all
+}
+
+multilib_src_install() {
+	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			V=${SLOT} gentoo_install
+
+	# We want packages to find our things...
+	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	sed -i \
+		-e "s:^prefix= :prefix= ${EPREFIX}:" \
+		-e "s:^V=.*:V= ${PATCH_PV}:" \
+		-e "s:^R=.*:R= ${PV}:" \
+		-e "s:/,lib,:/$(get_libdir):g" \
+		"${WORKDIR}/lua.pc"
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
+}
+
+multilib_src_install_all() {
+	dodoc README
+	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
+
+	newman doc/lua.1 lua${SLOT}.1
+	newman doc/luac.1 luac${SLOT}.1
+}
+
+# Makefile contains a dummy target that doesn't do tests
+# but causes issues with slotted lua (bug #510360)
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
+	# https://www.lua.org/tests/
+	# There are two sets:
+	# basic
+	# complete.
+	#
+	# The basic subset is selected by passing -e'_U=true'
+	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
+	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
+	use test-complete || TEST_OPTS="-e_U=true"
+	TEST_MARKER="${T}/test.failed"
+	rm -f "${TEST_MARKER}"
+
+	# If we are failing, set the marker file, and only check it after done all ABIs
+	abi_src_test() {
+		debug-print-function ${FUNCNAME} "$@"
+		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
+		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
+		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
+		return 0
+	}
+
+	multilib_foreach_abi abi_src_test
+
+	if [ -e "${TEST_MARKER}" ]; then
+		cat "${TEST_MARKER}"
+		die "Tests failed"
+	fi
+}
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
index 0e7b568c3899..06a68a0e0492 100644
--- a/dev-lang/lua/metadata.xml
+++ b/dev-lang/lua/metadata.xml
@@ -9,5 +9,8 @@
 	<email>williamh@gentoo.org</email>
 	<name>William Hubbs</name>
 </maintainer>
-<use><flag name="deprecated">make deprecated data structures/routines available</flag></use>
+<use>
+	<flag name="deprecated">make deprecated data structures/routines available</flag>
+	<flag name="test-complete">Run the complete (non-portable) testsuite</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index c3e3bdd2e379..ca68ea5d3ab2 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,8 +1,10 @@
 DIST MoarVM-2018.06.tar.gz 5002170 BLAKE2B 7c30dc54724c13538621fbf710d6bc1bd7d8b211824d4b5262685c95602c4910b7f7f6d59e52b0595d23dc9a68954fd1213055d72a20b418bf205ac770d05b67 SHA512 5d256cd7a49472e106326281059f8e9f8eb7591d116bfcdd33daeada42764774362ab8802edf889c5d875d438518ee9f243f5e44f451c9cf3495f7c7641be700
 DIST MoarVM-2018.08.tar.gz 5047553 BLAKE2B bcb3350e4a063958eee508885784f3f8eda20f7952759c084d4c0237c70afc4944836607c138e3df2e3a71fa3820190718ab1dd48851ae4a9f267562b9dbf87d SHA512 048fe4f333b017f21dbac34eb385f0569f566ec5ebba9f0e9ee217d325b61fc3542e39e0f1db6fc2cbfa48b09b1acb16c79f02fbe34ed8a5a1946927528c0570
 DIST MoarVM-2018.09.tar.gz 5070458 BLAKE2B 6c391907eb7bcda7eb6629d9f1aea16414fa9ee62d97ec3c72cea6c9b8f6323ef2869e560d8574d30b339889aff92ad73cfd174f9b23f4a98ef359873e053a94 SHA512 14d5ca1f6a8c77ee89fd05d66057b640b1e222391fded17631a4e11801de25e1fb3eb6b8b4dd977990e64952f7067482bf405a9ef5ebb6fdacdfa7c11bee21b1
+DIST MoarVM-2018.12.tar.gz 5238765 BLAKE2B ac0a7ba8107bcf79cfa58011c0968b5c960d9b2f2e59754b25a2f29e66f86e1d2524e16bce84323f2426f264476a4f3d307761c340ca6f09d3983eacde336704 SHA512 b55efc942a581e1d14a571b44a58a76e18f01ca1fabb4c68476003bb42fd4f3663fd532e75814cad6f7b1e1cf5562fe6b1aa68b956c1d8e6769e9dc1bce2b0a7
 EBUILD moarvm-2018.06.ebuild 1333 BLAKE2B ec472c7a10310ffb82fbb697553aaaafc83aee62a8d3e439ce3ce68f21ab91313e753caed1546588c9a1320ab0efccff9bcdc8da646b84b112e8c31bc4c75755 SHA512 c7c78307c949b6122bc6437051ba4033f24b79f6a8c5d8f2b248e4b296d7efee9bf0fc6370b116fcd2ff7b9bb548beeb46ba472a4dd5c054341542318bb9900d
 EBUILD moarvm-2018.08.ebuild 1333 BLAKE2B ec472c7a10310ffb82fbb697553aaaafc83aee62a8d3e439ce3ce68f21ab91313e753caed1546588c9a1320ab0efccff9bcdc8da646b84b112e8c31bc4c75755 SHA512 c7c78307c949b6122bc6437051ba4033f24b79f6a8c5d8f2b248e4b296d7efee9bf0fc6370b116fcd2ff7b9bb548beeb46ba472a4dd5c054341542318bb9900d
 EBUILD moarvm-2018.09.ebuild 1330 BLAKE2B ada4198e9dd0f44f7e45a2eeb8da46aaaab31e0bfb05f21ca4c934921acde306fba8332fb94beff0c65879abf9f0bbbaea67be2f9d5a967fa90cb9104ab31f78 SHA512 220c957f8a73db7e18d9e252a1bfe6df53548e07abfc76b3a6b67ccfcb796a991123863230f68266530ba7af1a1647356474b9a8be65c0b1eee3b0f0cf4bbfc7
+EBUILD moarvm-2018.12.ebuild 1330 BLAKE2B ac9b962bcfe75d3b6f926b10256323e108aa6a8398442d19b10821ae1973185f5482e592bb13c24a8f58512df88dc84f22f5c3e84bce3cd90fd711f0b2bda0b2 SHA512 33ef0444e5d62ef1d849bbf1008b03251efa46465d0045b16f64a8f4360186f73f04384436ceefdc5bc02075e91945bd41d5bb0500adce38b4c8d9a21142a36e
 EBUILD moarvm-9999.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2018.12.ebuild b/dev-lang/moarvm/moarvm-2018.12.ebuild
new file mode 100644
index 000000000000..de8b1e480a4b
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2018.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		dev-libs/libuv
+		dev-lang/lua:=
+		virtual/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	use doc && DOCS+=( docs/* )
+	local myconfigargs=(
+		"--prefix=/usr"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir=$(get_libdir)"
+		"--compiler=$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+	use optimize && filter-flags '-O*'
+
+	perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 938ba8f00933..fbb6ccf081a0 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -3,5 +3,5 @@ AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a
 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d
 EBUILD mujs-1.0.4.ebuild 1021 BLAKE2B f037a744c255dd71fbb9ce3312d45a42c6648e88324a8fa16e6f1b27672607f9c0e0b22974afdd4ecdb3ddb7d692b9ccbd7ba781ba2a4074dcb1b2188e362a41 SHA512 1e5fbe3b2c145623ab863eec5d4570597334b43c7c9dc95ab87a530ce28d33be365ea0a6fa15433cb34c2c45085720864d40fb9a73e60217bc20cd58c8b26bbb
-EBUILD mujs-1.0.5.ebuild 1172 BLAKE2B 06df2c2a0b586933a2969e79f25d21e2e89e3939a0315817ab8f3545661ede673cdb3e0d8213fe55920c49d4cef631c8171138264531bd02ffcb8aaa6dd72919 SHA512 8da2248d9358a560c5f5963aca1b3c80eb031069063dcbb7909523b1366f0cc0f618583620c3b45d9d9883550c11750bb5c9f45778d9b7f618da2d99f9cf028f
+EBUILD mujs-1.0.5.ebuild 1171 BLAKE2B 4f27a1ba78439a92196efab75969c9fb3ee77a8b08843df42cf62b2cc979222916a95d99bdf3f3a7c58e16d23f3e85276824ef99d4b0c2b126e318c8b42d66c9 SHA512 e5527b94206066d9df36d87090e7cd9efd86db9984a84e61d731bec6b57f7c5a34a9a478e0fafb5dfc45536c40bb1fa6cc0828ee95f6bbc95afc6dee1f08b862
 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 65364e6a9a56..8a76c3275ffd 100644
--- a/dev-lang/mujs/mujs-1.0.5.ebuild
+++ b/dev-lang/mujs/mujs-1.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 109860176dd3..67a8d8c33eaa 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,8 +1,10 @@
 DIST nqp-2018.06.tar.gz 3792244 BLAKE2B 95cfa80c83951e91b71e14162c4c5cd78a8f546ba601002836d2b3fe79325aa26b963d0bb58df70935546f6960f3797a3a7762187defcb6b7c5124a7205bb257 SHA512 312f203c51f3d58bbc474cd7263a118f3438efe230a56a30f38a688b4a57aac88a94a0e6630736066255c122bb001d748a76272f7f634be8ddda91cc3340574b
 DIST nqp-2018.08.tar.gz 3769932 BLAKE2B 892eec3dcbfcf57bddbbbb296aea2d126176a5b5db79493beccb7625360c42e26fc9025c8f594430c8cdac346b5af93d7a5167fbbd6e17776070bc3b4b754b63 SHA512 b3f1729060c88407eee07fb32841febb51b68e375ff797aa9ebc6019a4c1229ea7e713262fbe7dfbd9e0317594eb8526179b9d63cf034ac3aca3d82c4ff7d565
 DIST nqp-2018.09.tar.gz 3797808 BLAKE2B e5c7c79d7577338e89190ee11673e65093f2e08cd5950727ed8f33a35769db8d6f5e5c7450a93ceb73bf011cdd0a492ce70de6026948a20dd972dcb79a07fb9e SHA512 7412ef9c25f9540ae399c8d83b090eec1c7cea63f0cda970e21e3d760ed915895f8d69c092847feda002702e401e6eee8a6521c41e879c82619340d096948126
+DIST nqp-2018.12.tar.gz 3928586 BLAKE2B a11480ae4f09810d349b3adeafb7a6317db41ca28937d99c936f3d8be39be0039fe88db03c9b3b248193a377260a3e21500eb3e11ad282e5ed02635724f05678 SHA512 6c075410490e4c3cab20fffdb986ef179a26c2f11e50e91b50e38e43f8d7909eb8e645ee9280f506da115866f73ef9013cd229e12b100ff43e8610ead69628da
 EBUILD nqp-2018.06.ebuild 3607 BLAKE2B 187da0f139d742686c2e36efb8d219c865e116c976ef2eb3c399277fb2bd76b9e16116ecdbcd60854858197e584fc1f98463349395c66d629c23d1115572d62f SHA512 214d69640ce932f49c4b0c22871d96fda5eaf2ba2ef47247e142cf5958ad193058d3fd59761f2d51a3ac5f76d60e53df20cf7ae2f615d59d587d9727b77f7315
 EBUILD nqp-2018.08.ebuild 3607 BLAKE2B 187da0f139d742686c2e36efb8d219c865e116c976ef2eb3c399277fb2bd76b9e16116ecdbcd60854858197e584fc1f98463349395c66d629c23d1115572d62f SHA512 214d69640ce932f49c4b0c22871d96fda5eaf2ba2ef47247e142cf5958ad193058d3fd59761f2d51a3ac5f76d60e53df20cf7ae2f615d59d587d9727b77f7315
 EBUILD nqp-2018.09.ebuild 3604 BLAKE2B 494b431edfaed5a6d29419774b69a7eee6a2d97ca8cf54c0f6a0f3405690febfca1cde45514eddc9edd50caefcac436bd0381f1eff3e59df28f2f58ad9b98b7e SHA512 2cf0149ee6f11931c8882aac35e42b1ba7d93ed8c246b0599d196f60ab025c0eacea04a82556d78da2ddcea580ec3b7f8cbed7663a1fb755de70ac3a5d0a61d1
+EBUILD nqp-2018.12.ebuild 3604 BLAKE2B 55db92192366034c073e50071e14d9d0fad082224ae5eba5812600c57aabb005e39d7b9d6cc3398e94d30b8767486748fffc68ec626bc3e77e119ea4f3a5701f SHA512 f024785ac72407e4d2a8e88614e99705d20c0eb8b51903be85f60113b751fac9657eb75bda3e1866c95418f3ad394e51322c28d8c7923fc6ae75c0c2009f91cf
 EBUILD nqp-9999.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2018.12.ebuild b/dev-lang/nqp/nqp-2018.12.ebuild
new file mode 100644
index 000000000000..f014c8b7f45f
--- /dev/null
+++ b/dev-lang/nqp/nqp-2018.12.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8421c96fdeca..71357fc1040e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -26,12 +26,12 @@ DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9
 DIST php-7.2.14.tar.xz 12156460 BLAKE2B 88727241ca3fd68238ce50dcb4c12868f8e6df54213b04dba7650c5f98c3f18a3d02e0a191c0ebd13d85c83cc686fef60135f69ca7cc3e425bd5d7f80035fdd7 SHA512 13f2c97b730e3e872bd24bcc004c6cff5e2cc633c37a4eb60b8b5d1d4454bc5985f7d52943448d61cf4a227c64be770edc5eadd2c9612b297d71c0840b4b1259
 DIST php-7.3.1.tar.xz 11944376 BLAKE2B 55b3192774c08b1e4c6621e16176a1e352ff6ba5540794a5d769b6416929723638f1409f2f8224c7fe3db99c9b020fa51db7b78d50eaa00e790308562a0a5334 SHA512 0663d90537fe3901cad00ba1056782050b8a61e8edb49f01851add4992df21d23aee3e9468e32b76b7f53ffd513f1ba10c9513c549e247d796416ed176355348
 EBUILD php-5.6.38.ebuild 22798 BLAKE2B 8bef3ae060eeb63fcc492a7c8c8a8b642b84f46ef7ed29e69badeecf26c0f853e974c8f224739875fee1b345987775c05f451908d4731550eab156993a55d23a SHA512 0a97787e0b80643e620815c32b29a56063ddb92c31516ad34f89be9769cc3cf9ba07eb0271d433f330d6493df2b1a63af29bf8b7ede81bdd3fbc2751be5ce561
-EBUILD php-5.6.40.ebuild 23259 BLAKE2B e2ff5fb3b163c94a83c4f3586802c0776682e08a3496463f500baa088106e27fb1cac746c9563f627a3199d1c291fc087eebb1f52be5b19af462ff8241f89a28 SHA512 38be85e7ddda8451a2ad4325ccf43c761a9bae04d8c6ec0147ca470cdf5a0127f8a5b1ca25cc591b9dee53c3c576af2542f396481757926b846e6eb734d55322
+EBUILD php-5.6.40.ebuild 23258 BLAKE2B 0596c70d98858c26ecd271eedec3bca8907b486ad85d7a81bfea5c3b01a1f4a7104672fa75fa5f83a7dbdc5cd76b123571d3defb6f15805ff06b7e54f7361597 SHA512 86f097fd4e13a5b94e0a49ce4d1889ea6df879c32cb7f495a074f1071af9dcc97804fef7dd234ffb206cc64779d9e88932fdc162c735a8fb30499b4e8b7d5729
 EBUILD php-7.0.32.ebuild 22008 BLAKE2B 26829e446d9608f52212a32e0092d83d65966a270a8e4d35f8ac4559f0679a4ff955848eb9c9ae3f7d25300d347a226adc1b71d1b322d09fe512188360f2182f SHA512 a9fdfe7a831fa4ad71ddd4bae29582053ee86a824dc93f02581a3add372561f34d457f2c9198c72c619b10666b679d3f929f6aaf309c2d446a60e9447e8d3cc2
 EBUILD php-7.0.33.ebuild 22169 BLAKE2B c42c62525fdb4e5e0de2cd232c2e6c04fa0c561f0095db4f3d05822cbbde8bc8938369870cea1dd3e7c9a0ea87899e2323a185195fe177441eb94a66ea2095c0 SHA512 c909409059798a4cbb2284a71affc0df5c47db6bebafc291323eeb865b118712a4b344b4f556be95d3035333481ed147804e908b1d8e5c68b38bb178ef0651b8
 EBUILD php-7.1.22.ebuild 21715 BLAKE2B 13f34b9730b2f0f22cfcbf26af6575259d08d61f158b0c9bd9b6e7756326037e32e92992ec510bc1649eca0beb2044f820888c7e9b1fa48174974e754947f181 SHA512 187fd61cf4df1cda5c53e14aea0ac327c5e9fab193843165de2afe7e13fdb5b8be1ebab70fcb776dcb8ebe1966feedcc075e589c4ddf1f9f6d3d58f45519a9d4
-EBUILD php-7.1.26.ebuild 22035 BLAKE2B c7383fb8c0a90f277eebbbb577794f54d4efddf1748567b4c80d609abd3d9629df540f6de23cac9b7c39607ac87a4a2d00bdcd92db53486477f24ab3286ed901 SHA512 4691820c00011f28ffbe403208f2fd91116a3cd19378f05fc391c86d62e5339de1097ab42f45847abc27895b4af8d129016363734675eb8387a1e47b2778b5bb
+EBUILD php-7.1.26.ebuild 22034 BLAKE2B 27c98d141adda41a8e15e9df9ad37a02a5454c029b1b870b95be553df8b1f655a3760d94397a69b39d89ab1f87dd491d885675015a15186912101f5f217af4db SHA512 7210d43aa8fefd29dcca6f589dbafff425b33bff575c771f07b0e93123bd1ad639b5b1df3ea3a3a8851061915e411f0d406a50694b99d70444d80f18898cdbdf
 EBUILD php-7.2.10.ebuild 22246 BLAKE2B e06f62b7f5563d48d9e381b6ab44cc72e9e63831e209ee638321e93b90a1f42abb9a41b757629b45cfa610f7e985f40fbd002c5121acf86d862f8d648ee16f44 SHA512 c662c27b70663131899ffe595476bff326a337d584855e27f62480bf8824e3a3f49caee7c80b4f3aa19ccc40d1f95f3a9c4518621cbd43abd751981ba334e190
-EBUILD php-7.2.14.ebuild 22559 BLAKE2B 3d3938289fe8fdf09ed70c454ef5c71c83be5fc20466cd1ecf9f4a65176acf13489f01d7e04dda8b0469d1ef94aca9ef11119c397318e134854a3c5f9c521d4a SHA512 f359afad539d6d5afbaf25b300f0fcb9788c4996b2794aad719e8161133ca29a24c38d4b76159eb6fee79ab798e5996f82141cec94e1277306dc4c0d0f2c848d
+EBUILD php-7.2.14.ebuild 22558 BLAKE2B 3f41c4d8a075057c22336359c696f8c3f478b21f132834dca5bf43e1773e9fb2be41b37775a43b863092147f4423f56aedade3326292ed58d269d80accf7e639 SHA512 16ec568eb6754a0e23303c2325f623bc0e7d73767879542f1fe0f71e936991a1e25476916d1fa7f25bb403ee72ac9c156c9c95a4beb5639d05186dd931b40242
 EBUILD php-7.3.1.ebuild 22531 BLAKE2B 5e7829bfce6c1d99cf39cf1058f2c3f896de26a71880a1365ed4fca9c40977208165d201bb5abffda0e8c39d722d4565a62200cf438f043cafd82192e9f21e57 SHA512 929c387adb105d805a16536f7fa87f2d8c134c39485eeec6433ca5a154d302a64d904b8c5b25796f1f4f1e5deab304e0363e692e6784d2a4ea8ed36a163e18c1
 MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4
diff --git a/dev-lang/php/php-5.6.40.ebuild b/dev-lang/php/php-5.6.40.ebuild
index 7973d3403447..2a5e9be903fb 100644
--- a/dev-lang/php/php-5.6.40.ebuild
+++ b/dev-lang/php/php-5.6.40.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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.1.26.ebuild b/dev-lang/php/php-7.1.26.ebuild
index 127bc18ed1c8..a3cdb5149ecb 100644
--- a/dev-lang/php/php-7.1.26.ebuild
+++ b/dev-lang/php/php-7.1.26.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.14.ebuild b/dev-lang/php/php-7.2.14.ebuild
index 24b382526670..06f175016ac6 100644
--- a/dev-lang/php/php-7.2.14.ebuild
+++ b/dev-lang/php/php-7.2.14.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/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 86f880f2a529..c948bbaccd41 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -2,8 +2,10 @@ AUX rakudo-2016.04-jna-lib.patch 970 BLAKE2B 28947a57089f3e53333d6dad83b9ff62411
 DIST rakudo-2018.06.tar.gz 3520888 BLAKE2B 68d568650aef1dcc4bf84843232db0d8f918684c69d80028acd12846fb913dd9600bed2b42ec55019d752370672de3f2fe81c498ffc892ab03954630a2158ea0 SHA512 574b074b4a2412b4e020906645787b9e57160a9e87c58b73771b1a3732a39a5b961d778d25a8099a8da5e7b3df57b84599df64cd65089a63fe236f3cae06355d
 DIST rakudo-2018.08.tar.gz 3541161 BLAKE2B af283a2d05b067d1bb8f6f8413dc3f88f2c44b6fcc32a9238b27288de613bd9b56b5e200a72402e3ac5f3189a6fb5a3bc39fa66812663bc5d04f5b047166dc6d SHA512 0d4145cf372843514d4ea23f2f9768b6740b10bf19fca2a1878db3babb9e842599b4134c7cb75be08f9fd15c4f93dc4c73fc9f8bdfe370ec8efb059ed7737459
 DIST rakudo-2018.09.tar.gz 3547819 BLAKE2B 50f7fb96eba9f03bff2bc455c3f1d19e29338971a9b6f638d1068ef06dca1fd8e1bd25cd3ecae085fad91950314c0a68af8080ae542d052d280f777d7efebe20 SHA512 da00486d64a10c1892949cb243da96e1379570dbc17e4ee2f6b5fc6524e628cec7a1c243f47e0eb211259467c1e95e62ea309474bdcaaf598f945a95a7d1a19c
+DIST rakudo-2018.12.tar.gz 4109828 BLAKE2B ce991995940aaf83688732a37f9689eae372f33c51a80fe5ce4cc845c6984e198b8f197005b4c8d2c75abeedced994b22c6bb01a6ea110b86f0dcabfbc10be17 SHA512 a18f08ce313178cd73b87f6137b0c460ab93fbe26b457f8aa77313d3fa8d4c2f6059402920d8832018dcf8596a63d1c4df70260ce48533f5212c9133af519256
 EBUILD rakudo-2018.06.ebuild 1617 BLAKE2B 4a683526c14a363fe903a36704f3287e70b96bd407d5c664fe437d64d3b2b1cb2ed0353ee154e1987d77d6e0ed68e719ba84a1439d4472f601f581a9b525f364 SHA512 0b4e582891816eff74ce5446d07a132abef0bcb177d7b0b54cd778f4386041b524a4282f7b99360323b29122a04bfc663e5939dd7cc2f44f12a33eb7157684fa
 EBUILD rakudo-2018.08.ebuild 1617 BLAKE2B 4a683526c14a363fe903a36704f3287e70b96bd407d5c664fe437d64d3b2b1cb2ed0353ee154e1987d77d6e0ed68e719ba84a1439d4472f601f581a9b525f364 SHA512 0b4e582891816eff74ce5446d07a132abef0bcb177d7b0b54cd778f4386041b524a4282f7b99360323b29122a04bfc663e5939dd7cc2f44f12a33eb7157684fa
 EBUILD rakudo-2018.09.ebuild 1614 BLAKE2B 87a4d2b1b5c2d44f4fab194e6920ae3f1f0b5e51a7e4f221a6ce85110f6949c98342f323baa6370b48980182591e4e9db10440250f571b7c56b5d58a12e2b39e SHA512 6a3bb5c480e4a55183cf0b1e4241f9961628c1edf2ca2772279fd925f1b314aeb8f3e9f38f462d197b41d7015ccacab1c646f177eda0f1e0e3ff5395783f8a7e
+EBUILD rakudo-2018.12.ebuild 1614 BLAKE2B f03d04491328279590e168673ee26d5cc95d06c25a41c26fa0243999ddbccc27fa10c34a402d59a725e44d6c77c78307a71b7aa3e48ca8857185b8d88232a74f SHA512 9a20218c9f7a71d63e4cf9d22ffa0526a9d295cd5bb33879138abc500f49ec8132cd42afb32d9af8d575dc0941bd7275294b8715f2907d2fe739ffc318b7304d
 EBUILD rakudo-9999.ebuild 1715 BLAKE2B 7cbe373b0e54218018db5845484502f6f922ff397da6d949709f980210f1edb541132f7dc21704ace7c992f6637247da0726ada4f74a7380bf1113f49204e26c SHA512 1dbb9387b42f05f0d39bca302b350cf4c7f9f14409231f200f6d0cdaf4d85e87f365132a8acc8b4dba7578797bf26ecc116e64b9b1d65ace62791e3eba514178
 MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a
diff --git a/dev-lang/rakudo/rakudo-2018.12.ebuild b/dev-lang/rakudo/rakudo-2018.12.ebuild
new file mode 100644
index 000000000000..6342a84cd882
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2018.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 07232451f05d..d0919c6b0b07 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,6 +1,6 @@
 AUX 1.29.2-clippy-sysroot.patch 2571 BLAKE2B 1f65355cf47fb1ee2bd15f7424b6bf98106028fa46a8f89ab639acdc3a131684898dcda42abd6d5d7bc09c857990dcea86467b3c96e8e6d47b90726d9176a221 SHA512 2577c7540be9a197343bc06b5de52ba42832cbb2799997bb9778e6e392a421cfe6bce9ce48793d60af7a8f3e0ade0c79e0adbfc1125fbcd89b01e97ab96b8d30
 AUX 1.30.1-clippy-sysroot.patch 2870 BLAKE2B 84f6c52fc8f757b509655852810d52c7aef50c7a5678e746d525e41888c50995d23f030373e4c37d829ed794d1890f380bc944eae601b97957d2b35d733b5d6b SHA512 8b2601e7699d3a1b004ac5559add37eb939332aacf136b9b6397f314dbcbe9015f1ff5ac906e80a4a913b0cdf4f5410d779721b136ecbe1a4af8380668bb7765
-AUX 1.32.0-fix-configure-of-bundled-llvm.patch 1481 BLAKE2B b340b8d1986b0f4dd6c983927c6af4ccc3a730054041e9b61db19c0adfd726714a99f7000eda21a33ea209daa3371abb0022c6f085e0faeee42156c86f8ffbdd SHA512 72fd31fb6e893d1ceb994ab47693243a330a80bd071e6dfe7fb01a20419b68c6b2818cd9c41b68615d7dd4d6a48bac131d7c6de02c3e99c57526cef616947d73
+AUX 1.32.0-system-llvm-7-SIGSEGV.patch 1521 BLAKE2B d5595ffdba23e41ea299605968f7e7407e8bf5d764b1c0c4f1934185012dff1b857c1c41c0f80b08bc21921a6cad24bc046ed9282c238593db7b13bdb27c443c SHA512 9ac1da18e6f67cf4918b529a72b8deda6bdfe4e6a5439a858f31da3e07d48983221bffa7bdaacb32f6285af95690f88fa5783f7c333cbb65fc2b807e5b3ea8f8
 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
@@ -62,5 +62,5 @@ EBUILD rust-1.29.1-r1.ebuild 8003 BLAKE2B f6f026fd27037603c83b0b68f5cc202d118322
 EBUILD rust-1.29.2-r1.ebuild 7535 BLAKE2B 91d1465b4a5265d019b7cfeeb6b7154e5bce0b83f3d4b36449457875df55823b2319803a68ea59724c6703962471b489af76b773063dbccce84768ae52d61ef9 SHA512 69827d7fd22cfc8fbcdf2885af62c1c9468a8d6afa982fba34435b40430151467fda0715258cb4e3b8db9a861a921dacf5fcd7bd34c3474846516e067fc71931
 EBUILD rust-1.30.1-r1.ebuild 8124 BLAKE2B 100ca5a5738c134f1da904761ba96be0f3077bd3478f17de31782d53d1f3917f6c39926ba57758f34d074aca8853fda10691d329865860ab7b3106913a2de6cd SHA512 543eeeb1d91ff60a66b9bfa736b14f6438a89d9008515bb9269f806dda9f41b1a658c1d7d831c2280a3a258736990a27778957580becb2c64e9fe82b2589abc2
 EBUILD rust-1.31.1.ebuild 8125 BLAKE2B c9bac19284931f296c89b1fa050485c2a31b78eb8052197c55e82f4e97821c6b2413ef7733b710b8a71e761a0582305f3b355ce02c0214bf53d907984714240a SHA512 13eae6dfdac268902331ffd50697e28f3a7dae0852429c55ef0fbcd87c2ce8277b84aa31fbf37f3cc42ed6278fdaede0e0cf45decfe05b0cdc489c1746428ea7
-EBUILD rust-1.32.0.ebuild 8101 BLAKE2B 54cf1022442d0559d86f04391b5876fca9a3b394c69fdb23c605fcdb4219938797e81f5a5093acdf8ef9179bea3bee9db0af7bbd62f80731bed76e4384625fc5 SHA512 a9a7c0aecddd6bdbcd3d554c8414484c8fbca5b5564ec9a4c3350cd55106e5680052adc05c9e8400957792f4af8da6d01f18eab9ca7d48b164849891e3bb4916
+EBUILD rust-1.32.0.ebuild 8093 BLAKE2B 3e16048c3e572a5d2435ac0d6444b7b3e2966998d241f75c43440d47da252b91254187869a15937e6254d18d52da10c88ac0460a7576aeb31448ce22d0035866 SHA512 da63b7ce64ef09116ee5dad60c8f90b715fb3c26d4faf53f7287415f7244bc5b2e0919035fe960d19b5b1443501ba52f594a78776eeed432510055e91d3c8775
 MISC metadata.xml 634 BLAKE2B 394e75b1b5b5d9fad1d87dca27d7807bfce9eb723bc339dbb7c0630dc5abd3669e9469a9e75da74925d16d63c78971b0e7c84710db9b2cd15e87d81f49968903 SHA512 9e02acc0ad17e2f502c6082b5df9aeb6b9655783892a85d67855b3f6a79ec36dca610170bb002116c354626d44282c4e35e30cdf6b5e49745cfc6a990f55731c
diff --git a/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch b/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch
deleted file mode 100644
index eaeab87774eb..000000000000
--- a/dev-lang/rust/files/1.32.0-fix-configure-of-bundled-llvm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Revert "[CMake] Unconditionally add .h and .td files to target sources"
-
-This reverts commit https://github.com/llvm-mirror/llvm/commit/6fb010f388bb2cb2f00fe039123092308ac4865d.
-
-Bug: https://bugs.gentoo.org/675752#c7
---- a/src/llvm/cmake/modules/LLVMProcessSources.cmake
-+++ b/src/llvm/cmake/modules/LLVMProcessSources.cmake
-@@ -52,15 +52,16 @@ function(llvm_process_sources OUT_VAR)
-   cmake_parse_arguments(ARG "" "" "ADDITIONAL_HEADERS;ADDITIONAL_HEADER_DIRS" ${ARGN})
-   set(sources ${ARG_UNPARSED_ARGUMENTS})
-   llvm_check_source_file_list( ${sources} )
--  
--  # This adds .td and .h files to the Visual Studio solution:
--  add_td_sources(sources)
--  find_all_header_files(hdrs "${ARG_ADDITIONAL_HEADER_DIRS}")
--  if (hdrs)
--    set_source_files_properties(${hdrs} PROPERTIES HEADER_FILE_ONLY ON)
-+  if( LLVM_ENABLE_IDE )
-+    # This adds .td and .h files to the Visual Studio solution:
-+    add_td_sources(sources)
-+    find_all_header_files(hdrs "${ARG_ADDITIONAL_HEADER_DIRS}")
-+    if (hdrs)
-+      set_source_files_properties(${hdrs} PROPERTIES HEADER_FILE_ONLY ON)
-+    endif()
-+    set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON)
-+    list(APPEND sources ${ARG_ADDITIONAL_HEADERS} ${hdrs})
-   endif()
--  set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON)
--  list(APPEND sources ${ARG_ADDITIONAL_HEADERS} ${hdrs})
- 
-   set( ${OUT_VAR} ${sources} PARENT_SCOPE )
- endfunction(llvm_process_sources)
diff --git a/dev-lang/rust/files/1.32.0-system-llvm-7-SIGSEGV.patch b/dev-lang/rust/files/1.32.0-system-llvm-7-SIGSEGV.patch
new file mode 100644
index 000000000000..afc2cabde4b5
--- /dev/null
+++ b/dev-lang/rust/files/1.32.0-system-llvm-7-SIGSEGV.patch
@@ -0,0 +1,33 @@
+From 1c95f5a34c14f08d65cdd198827e3a2fcb63cf39 Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tom@tromey.com>
+Date: Tue, 22 Jan 2019 11:13:53 -0700
+Subject: [PATCH] Fix issue 57762
+
+Issue 57762 points out a compiler crash when the compiler was built
+using a stock LLVM 7.  LLVM 7 was released without a necessary fix for
+a bug in the DWARF discriminant code.
+
+This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.
+
+Closes #57762
+---
+ src/librustc_codegen_llvm/debuginfo/metadata.rs | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs
+index 6deedd0b5ea3..a354eef6887a 100644
+--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs
++++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs
+@@ -1164,7 +1164,11 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool {
+     // On MSVC we have to use the fallback mode, because LLVM doesn't
+     // lower variant parts to PDB.
+     return cx.sess().target.target.options.is_like_msvc
+-        || llvm_util::get_major_version() < 7;
++        || llvm_util::get_major_version() < 7
++        // LLVM version 7 did not release with an important bug fix;
++        // but the required patch is in the equivalent Rust LLVM.
++        // See https://github.com/rust-lang/rust/issues/57762.
++        || (llvm_util::get_major_version() == 7 && unsafe { !llvm::LLVMRustIsRustLLVM() });
+ }
+ 
+ // Describes the members of an enum value: An enum is described as a union of
diff --git a/dev-lang/rust/rust-1.32.0.ebuild b/dev-lang/rust/rust-1.32.0.ebuild
index d7262e896e2a..ea00024950f2 100644
--- a/dev-lang/rust/rust-1.32.0.ebuild
+++ b/dev-lang/rust/rust-1.32.0.ebuild
@@ -63,7 +63,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 PATCHES=(
 	"${FILESDIR}"/1.30.1-clippy-sysroot.patch
-	"${FILESDIR}"/1.32.0-fix-configure-of-bundled-llvm.patch
+	"${FILESDIR}"/1.32.0-system-llvm-7-SIGSEGV.patch
 )
 
 toml_usex() {
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 33da8e2b99d2..ec6a5304a486 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -2,8 +2,8 @@ DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809
 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
-EBUILD vala-0.32.1.ebuild 779 BLAKE2B a8eaaeb0010f6d8e69b1c6554e45243a26f28d73be18e33b8e6ec3594863e888b3aa147618fc2cb6bb6b2d83c507f2b5b78b5d3146e819e608a294164e9affb9 SHA512 abf548841218503fea503b57cf6424cf2178858aae82b6d85f79f04a826609149f5cc9c17ba1cd27276fab2764cf14b83401c6a41114ec603775876ef73e1cc0
-EBUILD vala-0.34.16.ebuild 776 BLAKE2B fb60f183c5c199a8a1d6b98642c8ab56b8593023bf8e470b8ff5d9175ba125af3cc842749be47a5d08620ff7ed025d54afc304dad5bea6ea2dce993532742842 SHA512 5b2f30b111580d3c7a8903e3334c27c1ef84c33e755567778f04c7a86ec18d8e1ea767fcd2e523c4f65bce8e2660698690935809109ea6fb5e9b0667dcab3ab9
-EBUILD vala-0.36.15.ebuild 859 BLAKE2B 5c8d865b6bcca1ea81fe946a15a6477c1249116e995d0f3cbbdd12115c10b9ccdd5577e44b37c0bff6c0e245ada068128d334451f616fecc8158e82afbcd3101 SHA512 8374dc4b879dc3eaa2153be5ae662cf687cda3190316d3b769368186cabf05f5f58dec155cb330daeff7dbfa65cdeb763e919c1ae58049a4285904b487ac90c0
+EBUILD vala-0.32.1.ebuild 775 BLAKE2B 3c4618a9f9782e21964dec7a7e000cf091e1a4a16861d6515087d11c4ae95a86c5445c8db3dda6be2fed99a8f6ca631b275fafd50db4845135df68bcb351f01b SHA512 1f92dfcaf5aff8fe99694ccaf7f52609169f7ef45c18988a2a9d9ef00bd93ebf5f10b7d6e1a3064c1461b70f0f3629cc610bd39293830704d9a2b3d4f0a0ce60
+EBUILD vala-0.34.16.ebuild 775 BLAKE2B 2b84a4a85841d2df0379b735c85c82a1f3f06e382e53b9fa3f6b19e4d704eccea18103adc4ed2fd0c0024be23179e9b97495ed00e1016bba871d6a4761bb8b6b SHA512 5b77b9cfc896ebbaf17d1d0be8e6b87ce33e4624bba65126b6fc771402339909fd8b2a3632a8769f426135ffc4b38e44a62868f85056365aa952d93c56d03c94
+EBUILD vala-0.36.15.ebuild 858 BLAKE2B b057fe90ac84327be175ec67539d16e3f0774acbd4b00833763fecd744b181d73481454edc519e277136f7eabf03d9ce3b8074fd55ace808e7cecdf31c23eb59 SHA512 f14500cdf5c6c37102a4be3a7f1fbc6381ad20406a7bd049876bedfa9e813f2c618905a09fcb1e7421049243ebce5e3bece55c87fb4eddddb0c5c07b19299dc7
 EBUILD vala-0.36.17.ebuild 868 BLAKE2B f493cf3fd23bf54572722d02abe0759b51a141d4137c58b40a0ab8d92f78e4c4bb5a3353305a8502d661ba219dcc7cc668c7e95c2bc15048c3100b3c95f75871 SHA512 0a86d5003edc0ba773919f6d7b93ecfa6deb42e8a5a489922132df3627f357711c630ad268335bf55f4b5b5525e64e13b8eba0a45901e0e2672b35ff403d9ff8
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.32.1.ebuild b/dev-lang/vala/vala-0.32.1.ebuild
index 88fb7d696c04..81a91168cd08 100644
--- a/dev-lang/vala/vala-0.32.1.ebuild
+++ b/dev-lang/vala/vala-0.32.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.32"
-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.34.16.ebuild b/dev-lang/vala/vala-0.34.16.ebuild
index b5b32d7e52ee..757c1fc6a7a7 100644
--- a/dev-lang/vala/vala-0.34.16.ebuild
+++ b/dev-lang/vala/vala-0.34.16.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.34"
-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.36.15.ebuild b/dev-lang/vala/vala-0.36.15.ebuild
index 9351ae8793cd..71b8c0cb72af 100644
--- a/dev-lang/vala/vala-0.36.15.ebuild
+++ b/dev-lang/vala/vala-0.36.15.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://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-libs/9libs/9libs-1.0-r4.ebuild b/dev-libs/9libs/9libs-1.0-r4.ebuild
index 84c7b9323a14..8e9ba36eccd2 100644
--- a/dev-libs/9libs/9libs-1.0-r4.ebuild
+++ b/dev-libs/9libs/9libs-1.0-r4.ebuild
@@ -11,13 +11,11 @@ SRC_URI="https://www.netlib.org/research/9libs/${P}.tar.bz2"
 LICENSE="PLAN9"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs X"
+IUSE="static-libs"
 
 DEPEND="
-	X? (
-		>=x11-libs/libX11-1.0.0[static-libs?]
-		>=x11-libs/libXt-1.0.0[static-libs?]
-	)
+	>=x11-libs/libX11-1.0.0[static-libs?]
+	>=x11-libs/libXt-1.0.0[static-libs?]
 "
 RDEPEND="
 	${DEPEND}
@@ -39,9 +37,9 @@ src_configure() {
 
 	econf \
 		$(use_enable static-libs static) \
-		$(use_with X x) \
 		--enable-shared \
-		--includedir=/usr/include/9libs
+		--includedir=/usr/include/9libs \
+		--with-x
 }
 
 src_install() {
diff --git a/dev-libs/9libs/Manifest b/dev-libs/9libs/Manifest
index 82edadcc0155..f827f4ccb883 100644
--- a/dev-libs/9libs/Manifest
+++ b/dev-libs/9libs/Manifest
@@ -1,5 +1,5 @@
 AUX 9libs-va_list.patch 2819 BLAKE2B 641d1a22c9feecb635d470c072ee28fb4e3fd0fb54d2db3c667bf6907d38f4928cc951057df1b1dc2bc0dd4c98d2d5ff16d1b94243df9db1d96d2f52608db804 SHA512 3c441f0bca520baebe06b63e099ee4ba138257c40d3870894c910173379f0d1e52f1627e984ceac61dca76ec68ac68e75cffa919895cebd4b38d09e12f271783
 DIST 9libs-1.0.tar.bz2 163744 BLAKE2B 3cc984ff83ff48969148f8fb3b78e6b85b32280634e99f552c869e650d4893a18ea2164c10ea7662a704c7d55a49bf7434caa219c3a716637895d1f3df4d2ad8 SHA512 35fdd874dbf9aca07e681d7c3f707d22a45cc8cadb2c273a1fbc5f8303886a6b512eb16fc1b81d64d7f665b16a3b19a8d678a540cd4ad453de853b90905d98d2
 EBUILD 9libs-1.0-r3.ebuild 905 BLAKE2B a359141d09d964fcf6d45f406c52bb05f2256021c0c1c7fba813ea02964464ab389a6cb13583172f45017c5099eb97db972f82b8b9f2e7aad43c6066576e8633 SHA512 809aed79b0ac99150d2c4535a18b5275daa9306f23b6d8ae4469b6d2271f85e488632edafbf32839cd576f9e1d44093c3023b26f6c652e265572d239b185809c
-EBUILD 9libs-1.0-r4.ebuild 1108 BLAKE2B 61a7f75075170d77f57e9ba4775f4f48d95b6b4775f6c6daaff3ab27affe707162ff7cf0854816305882e2889032b868117996970a220fdbfbd2e31a20847168 SHA512 166d9fce0cc41c31157407031d4d23736a552334c3d1eb647f50fae86a0e86e4a448be41501a08a9e36f3d185738f75a8137ce1edf7dd70ab817d537d92c3536
+EBUILD 9libs-1.0-r4.ebuild 1088 BLAKE2B 97dde042b6525a171521c97e35a9215dc2ca8f4efdf2e7248253bfc0dd439fc1c032d2c8d6cd1e80f17c639e09616ce649a714754c8f0928798ac5136f54125b SHA512 fe2ddd6f2aad6512a89fca607457a7ae53d34b75b3573257dee630ada6690860a36398057758f039946bf42b84427b17402ed90c99c40d068630edf73291e821
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2a07602ee7a1..0c8b1067451b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 0a20e2acdc88..c016abe9f7ca 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -5,5 +5,5 @@ AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad15
 AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af65863eaf5112f89be8f834dd60629bfe8ff05852016ba710f4ccd16c2db5341a7120cd570669ea21d9560cf361873b SHA512 f84a078f8263eb8613a3114875926d4a12c0e2e5bb6dde823849686ae2e7ae1e27fc0b7d8dc9467322b815a09b63f91658b65250cd64809d14a8f85661205349
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
 EBUILD beecrypt-4.2.1-r5.ebuild 2258 BLAKE2B fd98acad8db1f298fa58171e1ac39258497e20f0538eb0e316eda0f2d953a344ffb9eb5acd83970be32f9530b2f04dd65b5cafd09a1f9d5862705fa14734dae7 SHA512 fefca8cac89bac9f8e422cf42dd2911cf5f9ccd880ac50670bc26849124a29d24bb4277aa6d56bfcf7411ce5445095d91592e083e8a72276b4ff7e2a36583b0c
-EBUILD beecrypt-4.2.1-r6.ebuild 2468 BLAKE2B 63cb3711ef43f45554f3a74f87511e6bdd590bb780c168c1f1cdfb0268712287b9a055bceed2192b14e976c9ce8f5f29305339c29eef51da9fe0125edd42a473 SHA512 35675e39d39cd18bb11932e7c985ae5d8a40f29999f8ee4293e47560bb4d7d68a13962fe30eb4395cae30768f002bf97665ebf691dfde7deff9c157da4a0c1ff
+EBUILD beecrypt-4.2.1-r6.ebuild 2467 BLAKE2B 6b25bf69238015a4e2f936f4b782d1da28bbb9fc993bd46c5617be8ee6900c60f0f06e01089dd44a6356be7ee1b4ee960a98d2a4e8ec30f0feafcc1e8c0214a4 SHA512 ca7ae4eed1e6fe36f04fd7ad51d9b5821f009698a42cf7fc9f487f7920d955b09eaa0c5035c450662e12bbbf749940c0b311fd66e3e4d22129a5a2489412576a
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
index 7ec1630ce8c2..54428c68dcfd 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r6.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/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 REQUIRED_USE="cxx? ( threads )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 0aa71857a29d..0404a56a29dd 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,10 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
-DIST cdk-5.0-20131107.tgz 495455 BLAKE2B 949891d3a8d895b6bb59e3d54384cb602268c7d9825e9399dbc800cb481a77a1afe1a76f90353d61617af6b19dc913c11661354e45e38ccd37476561639070f0 SHA512 93e0c78bfd12fb9c554b9b6996b9c93542201afb67ddd63ecea7330171ca079da73d81b3f3b2f27a28ecd3527ed6c7333203a9438ecd196a66d3bad78233f439
-DIST cdk-5.0-20141106.tgz 509310 BLAKE2B 456b02a914622a8947c955b589706377a96ccaaa82c522514e74d4dc6ba6e9250fd5faa0114404b7ad4a370decfb39d8d19e4a50ba3c716706e2a0adbf61ede4 SHA512 8a92363c8036acb61fe8dcfcf3690653f2573407123b8c684c0bf165d5b99b6a4c7e8bcded8773304ebc13108e90ae3488f0e74ed026f3bc69f6a5b007e651e4
-DIST cdk-5.0-20150928.tgz 515214 BLAKE2B d06eb2b43b6c035b05f93d599d2a7fa960670ea34d7e3b66d294678c7caff30461becac5f1ee093b11a792b8e21ebf39b015551ab0f72012f4ad10c5d8343da9 SHA512 5774e28d91edd477854e30eb456b7725987e82ec27f5cf055c1d1e46581e11d2958bafbac408124f274bf7454be68476d18643a265df7c74b8f43eb1895bf19d
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20131107.ebuild 1204 BLAKE2B 5d1eacdc31ee85d9234a6d24a43866c5e6e7728e546f2e4ceb78db5effa0750352d75dc687ce450de59abc72dad2a7d37af2f2048ca2ece88cc133f7a8f06ae3 SHA512 d803eca2a215253e1e2ae6aa152fcdf6254597e8d1e53a0b0c0aabf978db17f46061442a77b424f61d38a331f59c0ac64b3b355a05e9cb3544881ff5041667e3
-EBUILD cdk-5.0.20141106.ebuild 1204 BLAKE2B 06be4f735e4b385318e6034f448e75e46bb6140dd8de139aed2c8b081e48333fa8b09ce19393446a909608670ca2a8cd262207407b910895ba3781c2fe320bb2 SHA512 0afbc74e48e0633b4c6aabbc44db5a3988319cbb83572de58d0df78350ee43fdd3fcfa21879175891da2d6a3ff6bfb522aa4db27256fdea6a9df652bd896e0fc
-EBUILD cdk-5.0.20150928.ebuild 1194 BLAKE2B 7761f59649ac9c81ae73be1d3b9af455d6d5012ec6808c117395098cd83fe51d5ddad16702a8581eaf10a25bee2f14940ef73aa1105bf3150db5864e89cf12fe SHA512 8f44f1589a0e001a27e72d35592ea16479b54cfe800398ab77aed3e4338998fee08214dadd88e7d6f3e5528f57c12066cd42f4245b10fe01fb7acfe6231d3b33
 EBUILD cdk-5.0.20160131.ebuild 1186 BLAKE2B 727e03f849c3b59cec1318b1edb5e282fdfcefbeab8873fa7710a8f081a96c5bc982864f9ac720d7f42f3fedfd86172216106f174536539039d496a5b9717fe1 SHA512 1d53bef3c77a13ae07f67aa79e3633ad9795e16b00ed090a71fb9b7f99cd4dc038e1ec84350d34efa7f7370e07e21004216df5a6c21307464cfddd58b8e21fab
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cdk/cdk-5.0.20131107.ebuild b/dev-libs/cdk/cdk-5.0.20131107.ebuild
deleted file mode 100644
index 5c675054db0f..000000000000
--- a/dev-libs/cdk/cdk-5.0.20131107.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/5" # subslot = soname version
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch
-}
-
-src_configure() {
-	econf \
-		--with-libtool \
-		--with-shared \
-		--with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
-	# parallel make installs duplicate libs
-	emake -j1 \
-		DESTDIR="${ED}" \
-		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
-
-	if use examples ; then
-		for x in include c++ demos examples cli cli/utils cli/samples; do
-			docinto $x
-			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
-		done
-	fi
-
-	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
-}
diff --git a/dev-libs/cdk/cdk-5.0.20141106.ebuild b/dev-libs/cdk/cdk-5.0.20141106.ebuild
deleted file mode 100644
index b1cc6ecfcfda..000000000000
--- a/dev-libs/cdk/cdk-5.0.20141106.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch
-}
-
-src_configure() {
-	econf \
-		--with-libtool \
-		--with-shared \
-		--with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
-	# parallel make installs duplicate libs
-	emake -j1 \
-		DESTDIR="${ED}" \
-		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
-
-	if use examples ; then
-		for x in include c++ demos examples cli cli/utils cli/samples; do
-			docinto $x
-			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
-		done
-	fi
-
-	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
-}
diff --git a/dev-libs/cdk/cdk-5.0.20150928.ebuild b/dev-libs/cdk/cdk-5.0.20150928.ebuild
deleted file mode 100644
index 4b8a3c2fb2ab..000000000000
--- a/dev-libs/cdk/cdk-5.0.20150928.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
-
-src_configure() {
-	econf \
-		--with-libtool \
-		--with-shared \
-		--with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
-	# parallel make installs duplicate libs
-	emake -j1 \
-		DESTDIR="${ED}" \
-		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
-
-	if use examples ; then
-		for x in include c++ demos examples cli cli/utils cli/samples; do
-			docinto $x
-			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
-		done
-	fi
-
-	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
-}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index e41c1ead10ee..6087cd80c2d4 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,10 +1,10 @@
 AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
+AUX elfutils-0.173-partial-core.patch 1271 BLAKE2B e8c499676c41bcda97db927a4df2e55a89d931306f3336d289c4235009d473920022455caa8dd4f69848201f23e68d99ac877c65b684f7386fb0660a4f274e25 SHA512 0b6d257e2ae702e3f9d0404a4dea2883b56d521794e5c812f18fe0b2b4deb0af2b15e84b5857901d96f014797e515831768206a1dda2dca3912bb15d2d844bdb
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
-DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce SHA512 b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
 DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
-EBUILD elfutils-0.172.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
+EBUILD elfutils-0.173-r1.ebuild 1859 BLAKE2B 56ee16d685c6cf7cdd9e0caa995c6d3df78b7681028d3ac52f792daf54d16283833663342666c313dba744764e668b91b1bb35ecd11df70da876700572c57a99 SHA512 33886b083eb9b5a7126e2fa02ab38851aaa97e742a9139fae11b3a0fa6dc02d4d8f431df1e6022baf3dfa768915828f47df79b37f10bebb6927de16430767a95
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
-EBUILD elfutils-0.175.ebuild 1844 BLAKE2B c5b5e64fc50418a8f3efb3fb3fd460956823ce1a13d07fbd04b16d5553c5319f2972ab31893329b99ab632dab6391911031c2c3ab60484c66edca91d167049c8 SHA512 e61d24695145a99999d779a063f99d56a093ad9baf474739ea27b21a23638a304b19087c55db0d00fce949ee13e2f80b817f394d6131d8ce5c968d358c76ce89
+EBUILD elfutils-0.175-r1.ebuild 1893 BLAKE2B 21fe5dd072de314eaa91657842e0cdb8cea06af21fcab465e4960f45af79ebbfa0a11d806e4a59a4646c31246084878c63d867d71471a76ec81eea41f094d031 SHA512 6fd470ae37061cc13c3446decd1f7fa138358d8956dd8d315702d466bcaec6b5384f8d9739b8b1b39cae6abf2837eb204c535d19042bda8b589499d280af5d71
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.172.ebuild b/dev-libs/elfutils/elfutils-0.172.ebuild
deleted file mode 100644
index 06de183c0017..000000000000
--- a/dev-libs/elfutils/elfutils-0.172.ebuild
+++ /dev/null
@@ -1,66 +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
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/elfutils-0.173-r1.ebuild b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
new file mode 100644
index 000000000000..0b41180c4eba
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.173-partial-core.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/elfutils-0.175-r1.ebuild b/dev-libs/elfutils/elfutils-0.175-r1.ebuild
new file mode 100644
index 000000000000..ad1c1988b467
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.175-r1.ebuild
@@ -0,0 +1,70 @@
+# 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="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.173-partial-core.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/elfutils-0.175.ebuild b/dev-libs/elfutils/elfutils-0.175.ebuild
deleted file mode 100644
index 39a57eb90c12..000000000000
--- a/dev-libs/elfutils/elfutils-0.175.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
-HOMEPAGE="http://elfutils.org/"
-SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
-	sys-devel/m4"
-
-PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
-
-src_prepare() {
-	default
-
-	if ! use static-libs; then
-		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
-	fi
-	# https://sourceware.org/PR23914
-	sed -i 's:-Werror::' */Makefile.in || die
-}
-
-src_configure() {
-	use test && append-flags -g #407135
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads thread-safety) \
-		--program-prefix="eu-" \
-		--with-zlib \
-		$(use_with bzip2 bzlib) \
-		$(use_with lzma)
-}
-
-multilib_src_test() {
-	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
-		LC_ALL="C" \
-		emake check VERBOSE=1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc NOTES
-	# These build quick, and are needed for most tests, so don't
-	# disable their building when the USE flag is disabled.
-	if ! use utils; then
-		rm -rf "${ED}"/usr/bin || die
-	fi
-}
diff --git a/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch b/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch
new file mode 100644
index 000000000000..41ef14d66838
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.173-partial-core.patch
@@ -0,0 +1,34 @@
+https://sourceware.org/PR24103
+https://bugs.gentoo.org/676794
+
+From da5c5336a1eaf519de246f7d9f0f5585e1d4ac59 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sun, 20 Jan 2019 23:05:56 +0100
+Subject: [PATCH] libdwfl: Sanity check partial core file dyn data read.
+
+When reading the dyn data from the core file check if we got everything,
+or just part of the data.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=24103
+
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+---
+ libdwfl/dwfl_segment_report_module.c | 6 ++++++
+
+--- a/libdwfl/dwfl_segment_report_module.c
++++ b/libdwfl/dwfl_segment_report_module.c
+@@ -783,6 +783,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
+   if (dyn_filesz != 0 && dyn_filesz % dyn_entsize == 0
+       && ! read_portion (&dyn_data, &dyn_data_size, dyn_vaddr, dyn_filesz))
+     {
++      /* dyn_data_size will be zero if we got everything from the initial
++         buffer, otherwise it will be the size of the new buffer that
++         could be read.  */
++      if (dyn_data_size != 0)
++	dyn_filesz = dyn_data_size;
++
+       void *dyns = malloc (dyn_filesz);
+       Elf32_Dyn (*d32)[dyn_filesz / sizeof (Elf32_Dyn)] = dyns;
+       Elf64_Dyn (*d64)[dyn_filesz / sizeof (Elf64_Dyn)] = dyns;
+-- 
+2.20.1
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index c4502be23eb3..9f559b6e5946 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -8,5 +8,5 @@ DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691ef
 EBUILD expat-2.2.1.ebuild 2198 BLAKE2B de5700f2f068344861ec29ae0eefd66340f5f9494cdeecbb4ab58cf37ff0f8bc85032dcc8e2cc0d079dff39bf757401f9cab532fd327bc6fc8c4ca0a48f0eb39 SHA512 5a1a6fa5cdce7a89122803bb03af3f2958a2f34bb23d9b2daca749ccef3b864bab8b52fb3300d90d497cc24e3b70af4f767ea1fbdd9d8a871efe494e965936f4
 EBUILD expat-2.2.4.ebuild 2398 BLAKE2B 74b30d474290b5483f3d5f10784ca37ddfa0888cf1e455a8137eb118389af12dd8327a56d42b1a36c7dd71e88ccbbc3c21e301464452973879392cbbeceac2e2 SHA512 3f5b4d64c156ca1cc4003bc4c9e6dc0d73ac7dec967691129039054f019b4997910719347ffdb780ee7adf9509e89b936dbdfa514d34badce4e3e7965c17f1f3
 EBUILD expat-2.2.5.ebuild 2455 BLAKE2B 17c00af701f3ec4ceab16e48247abbc23febe01271cc1ec8cae8d1a45d38d194d12959d98b8339907dde57456e84aee385ae11c5712c8787745b63fda21101f1 SHA512 37ea03cdbd79fa0e1b01e953b1f07cff067968ff3885745fa2269a23daccb1f495f3afd5b6950fd244614b094232b9c38842812dc7ae6415e186e7bffb6e335e
-EBUILD expat-2.2.6.ebuild 2465 BLAKE2B 6778d1c55b0f2655b48c6a1e7a8b2b90530f11f51cd11c0bdcf766f3ad51eedc70e4fdb4346eee57b9db2e216b24e6a7690dea5dfde4c454b0a931a8495bab76 SHA512 a895e03fb48984a31ebb2b10f1b1a6dafe3fa9982e47876e29ad6addd011004992fa4701cd74ff4fa7b97416a1b2b961845be3154c48d9c045c0f5600c4c428e
+EBUILD expat-2.2.6.ebuild 2459 BLAKE2B 0816e83c7937d081a7346588e5f1205f0532307d795b60ce83f6ca7dd2078edccbf0c9344ce06c59ad7248136ca377872dac5efa39ce68a7734fe15d478925a6 SHA512 1a9515a52177317fdd4df37d38373f0b2e3914bc26233ee70f355034c55be09310e58bf52a199bc189497fda9ea73eb6ca959c6e9dd12f2c047e3b8b8b498c45
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
index 9176c8ac6d89..04eac1c90df7 100644
--- a/dev-libs/expat/expat-2.2.6.ebuild
+++ b/dev-libs/expat/expat-2.2.6.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://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index ec1cb8ab92e8..318270ea4f34 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.2.0.tar.gz 434627 BLAKE2B df3d3994adf0f7f2ee734dbd4e20fa4fd5ec8856b8127b172412dfd091f2640e3c2df3d5a65063a8f24c6a1ea83ecbf13f826e5e533c9b9d9d67488ea8e2bc1a SHA512 4425c3aa57f7c87dfa2a5cc6e3c9b7f8e293086c2092b57b5d227b13dba3ec23cb8460abbfaf153b2f3a27c6a613e31e7a805948cbc5d567707880f353453f42
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
 EBUILD fstrm-0.2.0-r1.ebuild 660 BLAKE2B ff68979e48965fdf68accfd789018844571ab94bbbb4149217b5d8dc0559132761de84986861a859b033afe3c1a752068240bfcc3dbe0e5e10b0ef2756a871fe SHA512 240ef2fe6a8c900bdf5f9cd8d6e157b62ee2f37e186d1349f5f5773d2ec1c964993ace19b05466914fd39f250c9c0c26936e82342a406dfcd2f27d39630d6dde
-EBUILD fstrm-0.3.0.ebuild 812 BLAKE2B b85d9676131ca055ebbefef5037fe5c38ee0b90eadc0aa254effdcb38a38a2d2e33f7c935063dcebfba747dab5910bef8b17d089b2bf6e89187593cfad8b3541 SHA512 7e4774c45ec6b52da161a8fef32e0456b5322aae95f1925df10159638594d4f8cb598e93a010ee2a05ce8f2bc5eb00863c6cb1bedc549cd2b9b5e001b1d71696
+EBUILD fstrm-0.3.0.ebuild 816 BLAKE2B 73312356287d22de30f5e63a2ef9b1f643be374e66c390369ce37af0fe8bd4c532d2e5720ed75714c80110b18b229534b91291cb54788a8d5b97a697030c09c1 SHA512 3cb65688d4abb9f6327fac1a32eed35dca891af461792d8ed656226acc4e147de7f64b8fbe84b70e1a7c52b0fcc0002bd643364f65ffbc59aad23b6fde3ff39b
 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 99407fecc239..5702ce419c51 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.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
@@ -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 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
index 266c2820723e..343fe143159d 100644
--- a/dev-libs/grok/Manifest
+++ b/dev-libs/grok/Manifest
@@ -5,7 +5,5 @@ AUX grok-0.9.2-build-with-gperf-3.1.patch 867 BLAKE2B 41242e21655df898d38c250801
 AUX grok-0.9.2-libdir.patch 1223 BLAKE2B 7a303aa738c98f9ff11bdb76e28d7b0ef13beb291f87bd6fa814c5883a3934c9d354e78cbde596cce1384e950e2a917bd4f2849bbb55bbf6815ec43370def24b SHA512 7c08ff83475783274d7a14e574327b89d7e44d6c0f743d7704951553377f0d6b74bcec757cfee81144d8547d550bf33ea7c9a368c013109e51ff708498ea7dea
 AUX grok-0.9.2-libtirpc.patch 665 BLAKE2B 21c00cba5fd0bb68104c8a5cdd886d8d634463afc41fce2bcc5384ff80bd32bb5ef75b53ca25f2463e35f276fe1efc1677f3075d73d3fe5a4b77df1f593e9a3e SHA512 565d08bd4f2d58f5db4f095cc5276077fb9c3de159ecc54c65825d2d8db1af56e6c5c567d5259cbf4b866c6e99d996f5c94b36c7bbd40162088ee74321c32a33
 DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e
-EBUILD grok-0.9.2-r1.ebuild 797 BLAKE2B fdcac4abcd8b3ed5fa3b88822c27f2c8b163dc20109367adef8112a4e4ab3d5b7d0fc6ebc10aa1746b0d54b5c74986e282c7d20be4fadd6634bc83228dd0c6a5 SHA512 4ec5c6a91ae7eefccf96fb686665bc19a64d3758bbcd63bd1b37bef7825458c9cd7a23c0bbb9b17e96bcb6137aa096b8ca09230de902b49b7f515c38ade25d2b
 EBUILD grok-0.9.2-r2.ebuild 981 BLAKE2B f6a34209d30159694a93bbec7a85574d03b54192a46da658d988e90471b0aef8266c3d2859d62e50fc8b36cada5951ac02626a02c330258bc504af7fc18a1193 SHA512 c8d1822ff477e7569a12e2e5a0370ac9b48f46a5991ab0b80b6766cacb7403d8221575ea178ac464049eae8f1861ef178cb3e891432800a01db4ffaa765244a5
-EBUILD grok-0.9.2.ebuild 660 BLAKE2B d44f0f9c6e52b1acfa47319c5679c39343b0143456bbd1aa124625f2ca04b19269531bca78a054abd410e0124964b9f50eeabfe0656515c0c159fd3027603021 SHA512 cd035ee0106ddbfa87bdd216dabeb1ae4e43e22720e266b1c8311ae9a152fec1b9944542e51b901c249930d59dbe8d8724a303e44410fae993afcb6918445ce3
 MISC metadata.xml 254 BLAKE2B 8b393297b0cf2112182d89c18f2fc26d2b57e4d191f96bdcad17d2809fc52c51e0b76c1e8f9b7998f36f296be7015eb8a0a730d18892ee83343b28738cba6ea9 SHA512 4cc0684e2b8c6a3d54834d288930076f6b90205f375b4c91bc8253cdda537d44022e34710d3e9fe657f57d5ac69b57320fe5ae8b7abd4d4162259b4fa9aa6fcf
diff --git a/dev-libs/grok/grok-0.9.2-r1.ebuild b/dev-libs/grok/grok-0.9.2-r1.ebuild
deleted file mode 100644
index 967671141eed..000000000000
--- a/dev-libs/grok/grok-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="DRY and RAD for regular expressions"
-HOMEPAGE="https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok"
-SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-IUSE=""
-
-CDEPEND="dev-db/tokyocabinet
-		>=dev-libs/libevent-1.3:=
-		>=dev-libs/libpcre-7.6"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-		>=dev-util/gperf-3.1"
-
-PATCHES=(
-	"${FILESDIR}"/grok-0.9.2-Makefile.patch
-	"${FILESDIR}"/0.9.2-build-with-pcre-lt-8.34.patch
-	"${FILESDIR}"/grok-0.9.2-build-with-gperf-3.1.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
deleted file mode 100644
index 1981d7238fac..000000000000
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="DRY and RAD for regular expressions"
-HOMEPAGE="https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok"
-SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm hppa x86"
-
-IUSE=""
-
-CDEPEND="dev-db/tokyocabinet
-		>=dev-libs/libevent-1.3:=
-		>=dev-libs/libpcre-7.6"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-		<dev-util/gperf-3.1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-*.patch
-	tc-export CC
-}
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index ac78284ae938..385df175293c 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -2,5 +2,5 @@ AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302d
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 686 BLAKE2B a13e639cb623e0fe6fe071c26e9b313d33e5a9498069367346bc2d084cc74fdd15f3ccb8e5db59fa457e930cd62efc9012741814fa8e8da92a83d24c9c93c58e SHA512 20219ccd28ceaa2eb6a07414e705bdb941db496e1178375fb658cfb4b92b02add4783efe7eb06347d515711126ca2619577102e4821612711b733158de1d7c1c
+EBUILD ivykis-0.42.3-r1.ebuild 692 BLAKE2B 244f28ea5fc9853b959b1cb241b66df069fce6362bf07769f905d5e56cfc7f570f9c7abef08455a5c6be2b04086c70cd670db0639721c623fca2450f6d42b16a SHA512 832e0237edc9573284d8aee1af4764ebb79b122169a418022fe0ef63f229ec15e8f025360bcfdbc75ac5e33c75c0a03d8046bfae95853b3d2f0827ca9736f699
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index 7682426f6e84..3739f58125df 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -11,7 +11,7 @@ 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 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index ef3b160caced..830b7c2d1c42 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -2,6 +2,6 @@ DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13c
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 834 BLAKE2B 59f432fa4048e33bc72e3fa6db0aa477f5398dd6b1ea4a238118cdb2986e3856d2a902e0477f8e837a625731c702e0e9bcaa495ef56490a573c2e3def1fced51 SHA512 f50def454282d7f8a0929b91326902fa5195b165147180e1d87db8fa03e83aa528958e205fa57a4e42dd3e86357d1621bcbfecee23a0ea284688ce8c562f789c
+EBUILD jansson-2.11.ebuild 833 BLAKE2B 55e9ac2202c84d1624da291ffb3f90f80730c5ff974637bdf302ed07d9400e84f38639fc5f11644f99595a00e5528b6841723ce6e4918cb3c1c40e6b700d394e SHA512 6ae1d964a666341d98515e7aae783cfbf7fba36908c84d247a4681e02f59115f9c2add52d892868dab11e7705ad2450fa1dfae760053baa5fe35847c6f1e22ea
 EBUILD jansson-2.12.ebuild 843 BLAKE2B 845079169e230b7e38d2746e59d64e5d50c1ec4f31a65358a57e3ba070ca8bbe4311508a357818df6a2b6b95f5d5a7e6d38c4706209f77af71f4977ffc554924 SHA512 a63d2a052aef16c61b356faf80e1255c986a77415994be0c6e53e170eb77cad7d48d67889cd319f0abd068485a3b7f32eb7b1fa3aa555095da321719b46f06a2
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 89681597d570..8bc21a459550 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 08756bfab09a..bdf3dfd5eedc 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,9 +1,5 @@
-DIST json-c-0.12.1.tar.gz 535086 BLAKE2B 57e1da29b3326ccad07a60aafbe653a33b1bbbc26d184c916deb4d120b81781ad52d9945ee3cf5f44b112d41b274872ca76b94a05c12ccc003faecbed5fa586f SHA512 038676a0ce815e5174161fbd4339524feadc294d517f732fb408ad6aa7c4906423451c13386107569d9f24746a1a101564ca511e92e8276c5bf5b8c022ca42ed
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
-DIST json-c-0.13.tar.gz 634720 BLAKE2B f83876921f94fca1eb0a3473315d4dc75bb52e36499b265dd60e9dfa46d5417a958725aa3a6da3aa50f2a64f2cd5308af2685ca18bb3f5becd464fc570313735 SHA512 7375e1678e40f79298226d070db4ac3dab8a94c9d2438db1bbbcf668284ab30236fc77d841207c25f71cc2cebc596e1b8116d480434d829c8d96007a32ddf636
-EBUILD json-c-0.12.1.ebuild 1003 BLAKE2B 0ed22e1e1f8562ba0350ddaa3976a5ac66bd6edd97cacebbc6ee51ca401f7a78e3a566ee8865fa75b20352c1ba3053e64d4c2fa9f8a38441a0420b8d47628c1c SHA512 8b3fb8790b71761fa8dfc0634ab10887696255f7fe9856b7f9f043dc378a9c73794b95add30b698fd17d4c3f79e75f64d659454488cc39d5223bdc34668ec71f
-EBUILD json-c-0.12.ebuild 934 BLAKE2B 7ce3932192a70416f32220d08a86da5e889d50a4aed197c12926748bd3cc825a8f93cacaeaf242d99ea800169e4d75a6769ad0197562b32f54d104d81d4a8c88 SHA512 dcd19ea54f182d8d73dace713d3c364d394e83615c4912fdc9ad23980fa39801cfe04848f033578287ae533e9a87af8d13c35d00717f7c874ee2be4753d5904b
-EBUILD json-c-0.13.1-r1.ebuild 990 BLAKE2B 807f79eec2fb5af9a74e586f8a827efc4f1cd575fc55bf094a014bffca00548a03453166bfbfcb6893f74d92e59696a92f2544296a16bb66f71e1d5673fd15b1 SHA512 ea96375772c9b99e2e4c05a8466baf7f19123a5017ac9d8925722b9a1f2237a6eeebe591a163969b18fe7b794e16dea7e48063873f30cd232efc1861a0b6ac25
-EBUILD json-c-0.13.ebuild 1000 BLAKE2B 8c2b018dc6783ebac76ecbb777a628ef59d8796752038f28e1e57437c28fd72145a930af858e16c52e70b0a173b0cf4bb9f476364c39df6da26d5bd360e43300 SHA512 d3719bb33500ea92f7376c4b2f6ba994a4c8a18281c525eaf8a7b81da6eb8e8b4a77caf47fa02bb6df6a771619a36b77fd236e976cd2f83c701ce15a44aa0181
+EBUILD json-c-0.12.ebuild 930 BLAKE2B dbe72e808826e7cdb24f298d9f258d5cee1dcb03716a8fb5a086fd13b53858961550f4310e4fddc626ed52825d9f7cf7d24751cffe54dadb52bacf0f232913e2 SHA512 1d1c65c6e297a9035b143969006f4c4d67cef6ec1d8c80edcd0a344c259da33ad24464c7a7485a30f182a7d41a14533f27936b50c37efd1b9802e8a5a143d72d
+EBUILD json-c-0.13.1-r1.ebuild 988 BLAKE2B 258dd6b38246f04b4801c10c3bcc5e1e6ca1c7e10ee61563960293221d5ed09ec90c640a46ce30987b50c53ccb2a5ddde8f2467344059a8b6bf72c015fc27ecc SHA512 5558cc29f8bf0ed335868f5bc88b8c974b0ac2f55f44f771a08599f9a62cb87931049962a33c297a89f148a464a5cd4f9ed64f39c048d33c537206b994afc48e
 MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c
diff --git a/dev-libs/json-c/json-c-0.12.1.ebuild b/dev-libs/json-c/json-c-0.12.1.ebuild
deleted file mode 100644
index 5c85966ffb6e..000000000000
--- a/dev-libs/json-c/json-c-0.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs"
-
-src_prepare() {
-	default
-	sed -i -e "s:-Werror::" Makefile.am.inc || die
-	eautoreconf
-
-	# tests break otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	export USE_VALGRIND=0 VERBOSE=1
-	default
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	# add symlink for projects not using pkgconfig
-	dosym ../json-c /usr/include/json-c/json
-
-	prune_libtool_files
-}
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index c973e9c31b5e..9074dc523491 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.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 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index bb30f3f25f2c..0a75e713b23b 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/json-c/json-c-0.13.ebuild b/dev-libs/json-c/json-c-0.13.ebuild
deleted file mode 100644
index 4f5ce9ee2735..000000000000
--- a/dev-libs/json-c/json-c-0.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal ltprune
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs"
-
-src_prepare() {
-	default
-	sed -i -e "s:-Werror::" configure.ac || die
-	eautoreconf
-
-	# tests break otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	export USE_VALGRIND=0 VERBOSE=1
-	default
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	# add symlink for projects not using pkgconfig
-	dosym ../json-c /usr/include/json-c/json
-
-	prune_libtool_files
-}
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 36461badb27b..fd647ab0b710 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -6,7 +6,5 @@ AUX klibc.m4 3619 BLAKE2B b0895e5d775b2edc497514ce5adffa3824730cebd1b0c9f166a6ca
 DIST klibc-2.0.4.tar.xz 469348 BLAKE2B 5975e3d25f72b70c4cbaa56ea5363417407e8dace1e02e2da0b835bbb2cad56648b0084e5404528206ef3facf4ffd3611e8bd729eadd80b00e30d1a70b3057cf SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d
 DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3de2e33da583e0ea7597f666461977f461303566f9e363e9c96994c7b0eb6213c6a17b2fab72df7460db3cfbc0c2e1cf8 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
-EBUILD klibc-2.0.4-r2.ebuild 9409 BLAKE2B ac24b2f2d5e02dc5f380821980bf54df969a622e8d69ccbc4e56e21ed7ad17591771a7c20ead1a3f8558697e6859d2808c47e04867e0f16a524991f363f1883c SHA512 5afdef79995ef8ce6e4cc1e5bb87fc1d9f5af4ccc33b646a3c27c86b9d2b281e258f521a713c67a4f8da7772a6e7172544eade8e8c82d66b893f405ed9d60371
 EBUILD klibc-2.0.4-r3.ebuild 9500 BLAKE2B 14170140e1cf7c59d1665cae4e2f11aa23e4664fd46b4527dd0c3c09ef2ce434595fae9881b3f4fcc6d072c69e1b2c5f1704c7016c2e3e2ba0012894f343d6a6 SHA512 eea7a3ee293015f7f2bc063f1dd204db3b19a410e6ea11b20e7b545daaf187326c9ca9c9ca9b9a47d20da14109f3d3e2436715bc73710c13901b962e57142730
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/klibc/klibc-2.0.4-r2.ebuild b/dev-libs/klibc/klibc-2.0.4-r2.ebuild
deleted file mode 100644
index f9435d7ad819..000000000000
--- a/dev-libs/klibc/klibc-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
-# This still needs major work.
-# But it is significently better than the previous version.
-# In that it will now build on biarch systems, such as ppc64-32ul.
-
-# NOTES:
-# ======
-# We need to bring in the kernel sources seperately
-# Because they have to be configured in a way that differs from the copy in
-# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
-# unfortunately.
-# This will be able to go away once the klibc author updates his code
-# to build again the headers provided by the kernel's 'headers_install' target.
-
-EAPI=6
-K_TARBALL_SUFFIX="xz"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A minimal libc subset for use with initramfs"
-HOMEPAGE="https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/"
-KV_MAJOR="4" KV_MINOR="x" KV_SUB="4"
-PKV_EXTRA=""
-if [[ ${PKV_EXTRA} ]]; then
-	if [[ ${KV_MAJOR} == 2 ]]; then
-		PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	else
-		PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
-	fi
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
-fi
-if [[ ${KV_MAJOR} == 2 ]]; then
-	OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
-else
-	OKV="${KV_MAJOR}.${KV_SUB}"
-fi
-KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
-DEBIAN_PV=2.0.4
-DEBIAN_PR=9
-DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz"
-SRC_URI="
-	mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
-	mirror://debian/pool/main/k/klibc/${DEBIAN_A}
-	${PATCH_URI}
-	${KERNEL_URI}"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~alpha amd64 ~arm ia64 -mips ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="debug test custom-cflags"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	sys-devel/bc"
-
-KS="${WORKDIR}/linux-${OKV}"
-
-# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
-QA_EXECSTACK="*"
-# Do not strip
-RESTRICT="strip"
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86) echo i386 ;; # for build on x86 userspace & 64bit kernel
-		amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-# For a given Gentoo ARCH,
-# specify the kernel defconfig most relevant
-kernel_defconfig() {
-	a="${1:${ARCH}}"
-	# most, but not all arches have a sanely named defconfig
-	case ${a} in
-		ppc64) echo ppc64_defconfig ;;
-		ppc) echo pmac32_defconfig ;;
-		sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
-		*) echo defconfig ;;
-	esac
-}
-
-src_unpack() {
-	unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A}
-}
-
-PATCHES=(
-	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
-	"${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
-	# Fix usage of -s, bug #201006
-	"${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
-	# The inline definition from sys/stat.h does not seem to get used
-	# So just copy it to make this compile for now
-	"${FILESDIR}"/klibc-2.0.2-mkfifo.patch
-	# Newer kernels have some headers in the uapi dir
-	"${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch
-)
-
-src_prepare() {
-	[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
-
-	# Symlink /usr/src/linux to ${S}/linux
-	ln -snf "${KS}" linux
-	#ln -snf "/usr" linux
-
-	# Borrow the debian fixes too
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		PATCHES+=( "${WORKDIR}/debian/patches/${p}" )
-	done
-
-	default
-}
-
-# klibc has it's own ideas of arches
-# They reflect userspace strictly.
-# This functions maps from a Gentoo ARCH, to an arch that klibc expects
-# Look at klibc-${S}/usr/klibc/arch for a list of these arches
-klibc_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		amd64) echo x86_64;;
-		mips) die 'TODO: Use the $ABI' ;;
-		x86) echo i386;;
-		*) echo ${a} ;;
-	esac
-}
-
-src_compile() {
-	local myargs="all"
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	LD="$(tc-getLD)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	HOSTLD="$(tc-getBUILD_LD)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig"
-	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
-	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
-		# The delete and insert are seperate statements
-		# so that they are reliably used.
-		sed -i \
-		-e '/CONFIG_AEABI/d' \
-		-e '1iCONFIG_AEABI=y' \
-		-e '/CONFIG_OABI_COMPAT/d' \
-		-e '1iCONFIG_OABI_COMPAT=y' \
-		-e '1iCONFIG_ARM_UNWIND=y' \
-		"${KS}"/.config \
-		"${S}"/defconfig
-	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage"
-
-	cd "${S}"
-
-	use debug && myargs="${myargs} V=1"
-	use test && myargs="${myargs} test"
-	append-ldflags -z noexecstack
-	append-flags -nostdlib
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs} || die "Compile failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	ARCH="${myARCH}" ABI="${myABI}"
-}
-
-src_install() {
-	local myargs
-	local myARCH="${ARCH}" myABI="${ABI}"
-	# TODO: For cross-compiling
-	# You should set ARCH and ABI here
-	CC="$(tc-getCC)"
-	HOSTCC="$(tc-getBUILD_CC)"
-	KLIBCARCH="$(klibc_arch ${ARCH})"
-	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
-	libdir="$(get_libdir)"
-	# This should be the defconfig corresponding to your userspace!
-	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
-	defconfig=$(kernel_defconfig ${ARCH})
-
-	use debug && myargs="${myargs} V=1"
-
-	local klibc_prefix
-	if tc-is-cross-compiler ; then
-		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
-	else
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
-	fi
-
-	unset ABI ARCH # Unset these, because they interfere
-	unset KBUILD_OUTPUT # we are using a private copy
-
-	emake \
-		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
-		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
-		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
-		HOSTCC="${HOSTCC}" CC="${CC}" \
-		HOSTLD="${HOSTLD}" LD="${LD}" \
-		INSTALLDIR="/usr/${libdir}/klibc" \
-		INSTALLROOT="${D}" \
-		KLIBCARCH=${KLIBCARCH} \
-		KLIBCASMARCH=${KLIBCASMARCH} \
-		SHLIBDIR="/${libdir}" \
-		libdir="/usr/${libdir}" \
-		mandir="/usr/share/man" \
-		T="${T}" \
-		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
-		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
-		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs} \
-		install || die "Install failed!"
-
-		#SHLIBDIR="/${libdir}" \
-
-	# klibc doesn't support prelinking, so we need to mask it
-	cat > "${T}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
-	EOF
-
-	doenvd "${T}"/70klibc
-
-	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
-	# Actually I have no idea, why the includes have those weird-ass permissions
-	# on a particular system, might be due to inherited permissions from parent
-	# directory
-	# NOTE: This totally violates sandbox <asturm@gentoo.org>
-	# find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
-	find "${D}"/usr/${libdir}/klibc/include -type f \
-		\( -name '.install' -o -name '..install.cmd' \) -delete || die
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/bin/${x}"
-		dosym gzip "${klibc_prefix}/bin/${x}"
-	done
-
-	# Restore now, so we can use the tc- functions
-	ARCH="${myARCH}" ABI="${myABI}"
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"
-		insinto /usr/share/aclocal
-		doins contrib/klibc.m4
-
-		dodoc README usr/klibc/CAVEATS
-		docinto gzip; dodoc usr/gzip/README
-	fi
-
-	# Fix up the symlink
-	# Mainly for merged arches
-	linkname="${D}/usr/${libdir}/klibc/include/asm"
-	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then
-		ln -snf asm-${KLIBCASMARCH} "${linkname}"
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler ; then
-		cd "${S}"/usr/klibc/tests
-		ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')"
-		BROKEN_TESTS="fcntl fnmatch testrand48"
-		failed=0
-		for t in $ALL_TESTS ; do
-			if has $t $BROKEN_TESTS ; then
-				echo "=== $t SKIP"
-			else
-				echo -n "=== $t "
-				./$t </dev/null >/dev/null
-				rc=$?
-				if [ $rc -eq 0 ]; then
-					echo PASS
-				else
-					echo FAIL
-					failed=1
-				fi
-			fi
-		done
-		[ $failed -ne 0 ] && die "Some tests failed."
-	fi
-}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index d4b9913261b7..06c3480937b8 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +1,5 @@
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836
-EBUILD libburn-1.5.0.ebuild 841 BLAKE2B e9f7fa0d5100bb05d1147b459db3615233103d2277faf1e12afdd549e705672041529dd912b5b4787983cc5f1b012b697f4cb1b9630416ee7cfbeb794b93bf6c SHA512 1366eb54fa76e2892b2412c38ce41238729ac597b6b661f53fd149f971967d4d80965eda5296da6f054ab14e0338e38d3cda75be1f44e910af5b7e0b0ae2e687
+EBUILD libburn-1.5.0.ebuild 840 BLAKE2B f419f1dbc0dee1198fa296f0eed450e50a897bec08b23f8bf92346b88d0c08261404dff20020664de9dff2e814662a18688cc26d188f4b643fcd5fbf5108a960 SHA512 015cad236f73bf57fa93fad175132235c700d20b15426c6929401ca11bb145e21e58159d13df11e625d9c6b69f5ff9e3ece810f5f8bac548082cb8f0558310b3
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
index 931d02863693..62c42484bf5a 100644
--- a/dev-libs/libburn/libburn-1.5.0.ebuild
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
index fb767497e622..14f702501c26 100644
--- a/dev-libs/libcli/Manifest
+++ b/dev-libs/libcli/Manifest
@@ -1,7 +1,5 @@
 AUX libcli-1.9.4-ldflags.patch 367 BLAKE2B 9b7100376810125f09fdc67d9a29498bf9569a12c361119eb13dbe80ed0c9837f328944055c1723574cab3f9046173894c26eabf6ced1c40313acfe494960ae7 SHA512 bc1848fe5ae0f913aa4063e4efacf87bce9010255efb8f1b6b7c2acce79d45af50860d6040405ba8d6e2e5239a0075059070be719a6607a937180fce1930a4cf
 AUX libcli-1.9.7-libdir.patch 814 BLAKE2B 587c571b61da391899a41c27e6805936f69f5e50d9220cade7f05bd4e565199424efcd5c5c7bac1ffe5b020281aa6d566bd7da510f59dbb12f4b9e59429809ba SHA512 2056600d5560196119bc690fc5c02151e7376608408c5b7205eadf7e69f4138758738c34203b93b2ceaa938de58d1b81e9050d259245e9e739ae3bc385a9a2a6
-DIST libcli-1.9.4.tar.gz 27960 BLAKE2B 1a58dc2ebc7174c9bb790f73ad10bb4aef2cb6bf09c89ab5314d83af758a5aeda46f44161cea50a6134bfbb391a2a060b24348c9f945b5f018f9b053eb6ac36d SHA512 51de601733029f696cbfa435639addeef33ec52c390352164db96f1c14a375eca90e890134958178aaf77e57eaf05dda8bdbbc08df637767e820bfc65360b747
 DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f
-EBUILD libcli-1.9.4-r1.ebuild 904 BLAKE2B 21ff7a20ee94c700d38a629559b02c5019aaf4a0222da3f542e87ef48e08de0593814c487dd02a0b3453a9bfcee73a34de1d68dbfa8253674930d7bdd50a31f9 SHA512 a8f74e3aa4a3d451bb8e960d225ef418fb679527784cc5cb916680648d4272c1f9abaf9e07df2a3a147a0f2743c2e2d5b2772ecf9a0866c32bb8636b72000e44
 EBUILD libcli-1.9.7.ebuild 761 BLAKE2B ae7b7943999cd44183fdfc846592aadb8a32aa08bb698f255445288ae56f68c9dc378c069145c5e506aacf2b913f7b3b98b04aa4f9287500189200f6e0a4e41e SHA512 f29e833b83a79a909d0a3714f73200420ca7a2df20ce694bea7170c724dc8f38e6acf2fbed7702c0a009c076bff2972c0f7c8666bbc697aeef3a405977681d86
 MISC metadata.xml 538 BLAKE2B a8407bbf3dcbe24ea08f1d590a0929caec1de6463afabb68c6cf96a75b72a54605ad390c79cd6ad2508cc9a7f9de9e2920ec760dc7757249dd9240235239a722 SHA512 e96312c4c077df84c2f183b1e833cb53aa6134be66d1f0dc7a6c9ca495f354c5da7e28a1f4524670bb9f11e7d3ae093463ae6177837c7791b13e5f3c3d23130c
diff --git a/dev-libs/libcli/libcli-1.9.4-r1.ebuild b/dev-libs/libcli/libcli-1.9.4-r1.ebuild
deleted file mode 100644
index 3bf0b58f91f8..000000000000
--- a/dev-libs/libcli/libcli-1.9.4-r1.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 eutils multilib toolchain-funcs
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="http://sites.dparrish.com/libcli"
-SRC_URI="https://libcli.googlecode.com/files/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	# Support /lib{32,64}
-	sed -i 's:$(PREFIX)/lib:$(libdir):g' Makefile || die
-	sed -i 's:PREFIX = /usr/local:&\nlibdir = $(PREFIX)/lib:' Makefile || die
-
-	# Make this respect LDFLAGS, bug #334913
-	epatch "${FILESDIR}/${PN}-1.9.4-ldflags.patch"
-}
-
-src_compile() {
-	emake OPTIM="" DEBUG="" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" \
-		PREFIX="/usr" \
-		OPTIM="" \
-		DEBUG="" \
-		libdir="/usr/$(get_libdir)" \
-		install
-
-	dobin clitest
-	dodoc README
-}
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
index dd3d56745f00..28d7f681ccd6 100644
--- a/dev-libs/libcxml/Manifest
+++ b/dev-libs/libcxml/Manifest
@@ -1,10 +1,5 @@
 AUX libcxml-0.15.1-respect-cxxflags.patch 360 BLAKE2B 1c5ca2699e8a91318d86840aa13c8829100b98443be1650996160704514627dcc974eb87848e0ba5f670319437e11fd22098487ed455193d202494019d578145 SHA512 4f5f908b54371f978d83857236a65e82ed5caf3af6811d20cc6bee715a90c3f74a4a16ff3be6349384a01f07bad2a6508c60b8b33c19f6273b2e873634e19fd8
 AUX libcxml-0.15.5-respect-cxxflags.patch 444 BLAKE2B d09005bc9687c6633d8a3ab0dfd0d0a06304317225c300b6936d89e178413b4b4a560b409baf6f2cf45a64d09330e9434d3073c40897557e5534a8cefb2ce28c SHA512 23b8d1078eb397e03cd9c251ee859e799840c07d73c96cef122aa5031d381fcb82d33b79779720d0d2ac26bf2a7dbc82167752bf15472d010ddfe12d129342ea
-DIST libcxml-0.15.1.tar.bz2 137082 BLAKE2B 62065ff33f1bd8723f0f4bf679da84c114fb17d4c27f5230d27ba82c1b14e8dc02e0f86c485da75a8fbfd4ae8827968aff5e99bec7c281402b5ff19346877724 SHA512 91bcc8334ef5e71126701e850211928304561ca27a03e4b8d528fbc6d94fe2635c753c3b3b8ecec185e76fc5a70f426f6dfee72b4a432898435d2bfc1764b10e
-DIST libcxml-0.15.4.tar.bz2 137251 BLAKE2B 20c03bfe00cbf4085572b4c3697243fbaff56a46f2262761e61c1ee2b5f0639484304c9711e6a5ad2abc3cbce90bfebf59272d799668005984217d2aaccdb07d SHA512 b14a29eaa502451eb293ce2faf2424c6e8147d6e28e86911c7adba5d1f725a5500772e2199d57834daee503de0458480f7cbf39c0d83db8afb4998db0b0b44ca
 DIST libcxml-0.15.5.tar.bz2 137328 BLAKE2B db8e8f1edfe6d03a1f60f9f62c1c3b33e9c092d0031aed4369b7c0075eb16432d8244a2098e75be6845905451a61e379829a80183acdcf9acf33372c354042ea SHA512 9ecb333bbd3c99c388bb08b28e6cf2cae97e5a5a6df29634f041e2718a5d995dabfd73686fe1494eac9d45198dbb1530fa8d5502a8ed3ca8010db087712cb87d
-EBUILD libcxml-0.15.1.ebuild 779 BLAKE2B c32bbf98b5fd273e23c5dfe4b537880e3344750d3582a57588badff79de5c573464c7a4216396ee7b24990f26ffa0e994229246f043679185b4cbd339655e224 SHA512 26577e0d70545d8b142288247918f472749acacd58a11acfc62204e76fbabbcfa16b0023cbb8c2e05e551769b6ef2617faae3b3840e623a32289fc68e7e9ef57
-EBUILD libcxml-0.15.4.ebuild 804 BLAKE2B 39a3a91b32ed489b6f7143e7a20fcf9cd5191952e88d7d60fc7fcf06cd174fbca95f71acd86266b8bc61b081a26e7ad63add9374b8b705700c34acb579a3aac2 SHA512 f0a95a26021ee3286b370e198510e33669df19db59555a87ac951a995af73f1e0506c334c6f2b2f77ef49a21b21b59e330cc5eedd65b09deec2386151236cdab
 EBUILD libcxml-0.15.5.ebuild 804 BLAKE2B 6b1695a937aeb219dcba2b036e0a0ca965c07d90d02651324c9b16804a2b584b581384c3ae9c3126ab57002f2eb7f69c13d70153a933789131e25137a829291e SHA512 1a93e6c7e61ca568039b95fd20fbaa151be2fedcbfcde2c0711741e9d1fc8932d3680549ea81f4a868f9779dc4f8002974e8250ab72f0772d77c68fd3b3c8923
-EBUILD libcxml-9999.ebuild 801 BLAKE2B 2f9c019504ac3cac3046691f13595f65f3af29a4480b6973b46b56b0495a4f902a1cbde3638c2a706add772d07e19394e1eec2f231b05c8aa141b6225c28fa07 SHA512 db6177930a1e05cb8709be9c919fa84c3a02698d65a95778be86bf4ae207a5f80a7d66013cf17a67ca8fcb403b57308a77be76d42c043d7d875b03e4eca31dd2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcxml/libcxml-0.15.1.ebuild b/dev-libs/libcxml/libcxml-0.15.1.ebuild
deleted file mode 100644
index a25b9f8de517..000000000000
--- a/dev-libs/libcxml/libcxml-0.15.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 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="small C++ library which makes it marginally neater to parse XML using libxml++"
-HOMEPAGE="http://carlh.net/libcxml"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/libxmlpp:2.6
-	dev-libs/boost"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.1-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY="${EROOT}usr/bin/waf"
-
-	default
-}
-
-src_test() {
-	./run-tests.sh || die
-}
diff --git a/dev-libs/libcxml/libcxml-0.15.4.ebuild b/dev-libs/libcxml/libcxml-0.15.4.ebuild
deleted file mode 100644
index 666e14d5fa33..000000000000
--- a/dev-libs/libcxml/libcxml-0.15.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="small C++ library which makes it marginally neater to parse XML using libxml++"
-HOMEPAGE="http://carlh.net/libcxml"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/libxmlpp:2.6
-	dev-libs/boost
-	dev-libs/locked_sstream"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.1-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY="${EROOT}usr/bin/waf"
-
-	default
-}
-
-src_test() {
-	./run-tests.sh || die
-}
diff --git a/dev-libs/libcxml/libcxml-9999.ebuild b/dev-libs/libcxml/libcxml-9999.ebuild
deleted file mode 100644
index acb40482573c..000000000000
--- a/dev-libs/libcxml/libcxml-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit git-r3 python-any-r1 waf-utils
-
-DESCRIPTION="small C++ library which makes it marginally neater to parse XML using libxml++"
-HOMEPAGE="http://carlh.net/libcxml"
-EGIT_REPO_URI="https://github.com/cth103/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-cpp/libxmlpp:2.6
-	dev-libs/boost
-	dev-libs/locked_sstream"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.1-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY="${EROOT}usr/bin/waf"
-
-	default
-}
-
-src_test() {
-	./run-tests.sh || die
-}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 11c2c7bde9fb..a03774d0f460 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
 EBUILD libevdev-1.5.9-r1.ebuild 1055 BLAKE2B 0649ba066abbba41c50e0bdabcd823ef2fd456db0b2eeec4665731554c613fa8d6d24d1fd7210e061ee724aa0b7945ac9a682776235c47ac43e7daca3bbba682 SHA512 98f45981aa26a9fee942e7f361770e4b01c4f5607445bd69643c7f417814933aab7ff8913482077a560bf927770e307b21e459704baedb3d88e2cceb82c2932b
-EBUILD libevdev-1.6.0.ebuild 1064 BLAKE2B 489e20451fbc908df0444f8f8e2d78d1b456411f4296026fcf6d1a65147cc3b1785891a3038a324bf4116fe7f424f0b54eabf1273bf72778d8c692490c87f0f5 SHA512 fe90e2f485fff98feb103a717e88fe8f0f714cc2fdf210bdad6c14d6ea12f8d79d7be8a7c2b3c4a1c2763765f06f9ca0042233f0fecb1a89640e773d4c7992f3
+EBUILD libevdev-1.6.0.ebuild 1060 BLAKE2B 6bb768ccb05f74b864f62d9ea4d4a66846e7daf177ccc95cdfd1447bd666ca5659a0066c28050a90dc253e70553484011b18f75afc369522da7dd972a1967703 SHA512 f6b8ae6f7a59247e626ecb1d5806dbd019c247f5c384238934edf894a01659fb655aff07115c25b328bedf8a51b6431c5f38fa843e4d1f56312af4b11f0da376
 EBUILD libevdev-9999.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
index 89e403e8f427..7f2bf0f24d21 100644
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 471d2928e2df..b87dc79881ef 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,9 @@
 AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57f2c14433b7be1cec2afadcaffa30f2f2559ba9f1e0cf915f6ccba43abc038cf3a42949f12e78e532d29a25ae74e41f303838c839036d6e3a4 SHA512 db77d1cd4876ed45a579c9dcec67e7fa0feff2d98db4635257961588734497b5818efcf4ce748742018c6775bb65f2394515fc2854c691194b93b6d9c65c6cf2
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.7.tar.gz 4782856 BLAKE2B c844eca24b5053b3391ace6ebeea047bbba4fd429786e08144151109bfbd22f5c1b2609a176816a5d7eff63f1fe91122f88d89d3613dc4c770051cf095ae5ac3 SHA512 de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011
+DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
 EBUILD libgit2-0.27.7.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
+EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.27.8.ebuild b/dev-libs/libgit2/libgit2-0.27.8.ebuild
new file mode 100644
index 000000000000..3815701da066
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.27.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,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/27"
+IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+
+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 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
+
+PATCHES=(
+	# skip OOM tests on 32-bit systems
+	# https://bugs.gentoo.org/669892
+	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
+	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+)
+
+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)
+		-DCURL=$(usex curl)
+	)
+	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
+
+	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/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 02036aca8f4f..6caf6d3ff889 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.4.8.tar.gz 1537097 BLAKE2B 569684a115ac09506aa2fe6439f4dd80424ba7a5fb539b587e618a2a618c18512099117892ed0abc7268bb258c80a1ce8c2e4535f4eef963a14a5f8285806e23 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46
 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
 EBUILD libisoburn-1.4.8-r1.ebuild 1816 BLAKE2B 61a5f767137fb65a53bbd9780153c71b024886a204649d1a9345d2caf8a7e559c09c4cb6d09e570f9ad356ec828ae4330a704b4b86d79b04ecb630675fcc6a16 SHA512 2124db392eefc46dc9e88f0784270b2955ee96df145282cfc790c7cf0c023dcd78a12c249b83de9743b1bcd97f7065ca9969ed6d2b47c5507a12d3b47c298729
-EBUILD libisoburn-1.5.0.ebuild 1834 BLAKE2B 8cfedc6ff417ae09b24ddc28196e252ca30e062cf5437f199f3f9f01685f3408ae093efee7848086a2d73a14069949d812d2bca9109195d3b26c7e8a2b82a663 SHA512 f6fbe75803dfbebea49df27a9b3faebf1c1dab8cbc7b65d9c80b8df78353ad7e875b0855223be0cf9f7c834c2dfb993ef1e0228f7ca6c053ad9590ee0a451d4a
+EBUILD libisoburn-1.5.0.ebuild 1833 BLAKE2B 0edeea360ccc655b4caa3e9eaa81092cc72908e9295c3212f091a5bbd8a28c03c7c61f7fe5317183bb281a0795cb7eb45f01797107ca516c959302f1a4023b1a SHA512 202dced3be2d7fd924709dad4a8f56d23e6f4e75d934f4986821d6853563fc898c4a1adc13efa6f1c98c39202d906af3d41a656113f97831aca50a27ffdbc5f1
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
index 104c4f19e764..b39d54bd5338 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 1c70262401c2..b0255dc5c9cd 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.4.8.tar.gz 829979 BLAKE2B 78275a8a1c2ed3824d25dcd2eb02675059d102f2f0b93ae469ea18c342bd6c72e79655eb9f3c700539f87ad46bb97b6a3e28950f84a03bf3d9f1fd982c4fc479 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc
 DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
 EBUILD libisofs-1.4.8.ebuild 943 BLAKE2B 09cf690c8c32b58001b18f2d09931c1beca88841dcb8ad9cbedb1f402b705bfe20eef27bbe5a5756fc71587c9eb24325cf9869c0c745e6e45f5f7e48699f7bea SHA512 1ac774332041b72c4decbf1c6e58aae3e1d7eac9be9f341289da5db72c66a76a03fc782bc9799f4adf8ee07d3858ad0a3429ab1cc34b320a1d6f379212c88e45
-EBUILD libisofs-1.5.0.ebuild 961 BLAKE2B 56a3ac0d7a464f929771ba99750766b90f8a4b991f683e8d9c5a3992a7c6ea57fe3865d668d07ca07a103670f7849773f011e62d71f6358f6bed7df074351ae2 SHA512 69a333b4d33bfa43bdd8c9cc939a42d62eaba252dc387945ab1eaff4e3726886f00d4491aec6f32c81023b56efc635711d59b466445d9e176cd21ad11be66010
+EBUILD libisofs-1.5.0.ebuild 960 BLAKE2B bc00a64dd0f995bc2fd9869a0ce3c444a99700059c56eb2dace9a1f9c62aa50b4fd4e3811fab077c660b35d6b388f347f5bee5199ba4d51bc5df981e1faa4c21 SHA512 f5e89fe23d7d839584b5bcb5cd2dee2819f296d4ce76f695c9febd8fd1cd4bd7db62850b5c5e6f3ad9e9c6f768e11fbdf84ca323e02a1227c13d8f176a55170c
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild
index 4c4ad396d97d..b701cbbf8093 100644
--- a/dev-libs/libisofs/libisofs-1.5.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 06001a149724..fcfa08897270 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -8,6 +8,6 @@ DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645
 EBUILD libmspack-0.6_alpha.ebuild 1181 BLAKE2B 6ce72cf323c65a4f42ab61ec19e0924e1423e61f117da0e4aee90bd9acf0d54ec68b96256dab9c4af13941bb0f5ff483b3df86a7605858f987fa609343f2e2d5 SHA512 17a9f9f04c6b4c5dae20b9f4f3011a871493a23141808102bac3a0ac4a912dd16d5a843da9862e2c92b09765f291ce8c42f5b92c926cbbafc7e8cb15364d93ed
 EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
 EBUILD libmspack-0.8_alpha.ebuild 1298 BLAKE2B b62b3be7492625949a8fa1e25c536c27fa4781c07c8eac0cf3e503981d7b66be8d3223be02eccf7b37a9dfa75bd6bff4fb8f9da408098e2596deed6d0a6e0445 SHA512 5a9ba806bd8973788c6839ea19cf7b69fc2cc7fb7b35156b59e58ea78bb8d619a3fdb95363d88ef9f640c0326cc2b35f6cc5f41e66707febaeec74f7c1e0712b
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1675 BLAKE2B 919960328701426f5bb890142f8c90ccee59887d1f72af23239ee54b41ccadaacd7235e2a9fe53e2a65a81ca76b6b3d6fbef84dfe109d88ec230823adb0308b8 SHA512 7b2f6aeea72e1d27a4722a797c3d4a46cf7ac02716e40c6a051fdb38d3547c6d9b37b9b6fb3c0f87c922b7799eff46debab20fc449260aefea12f9bb971417d5
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1674 BLAKE2B 64f04908e1dd4405f403929611b7e070b24d3585bd72fc1a615920198bd791c064a07a66489a63f07a81e462e5cbaf96618573db95dbe2e232080c40f4429f0a SHA512 48ef70cfc86fbf174d5a4ec81cf3337a8e593cd0b5146804233a4116bcc83562b212ce89dd77be1eb2abd61fa0890abfd9d24ccad4bf8dd4a922a048020000a9
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index c092c9af01c8..6045f4993d70 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 87dcc8af1c0b..85e781adbb7f 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,9 +1,9 @@
 AUX libpipeline-1.4.1-gnulib-cygwin-sys_select.patch 854 BLAKE2B 8ce5b623838684260e2f9e78c505fbd844a19dd315acf2128a2779ac4ffeb43f438efd5deafeaa27b2e01396165aba2d5aebde1daf684c8a080fd64ccde3fcea SHA512 81752dc9b87911cca7244aa1d5e49a981d16b454ded30414d49adec5fb089c7575866624b2c4ba7592eab2002b2138f5337e01d51628b9b2ff4d3bfde632acb4
 AUX libpipeline-1.4.1-gnulib-darwin-program_name.patch 687 BLAKE2B abf27acb9ee567746ea657f740bae53e7d52de95499d377c3d1bfb50b1f5c993b0d83eca29ee388d5ba2f6b63fa0a714755e3d89289585d85e47237c83e20bed SHA512 b3f3a3fc82bcaa72d4afdc8ca7e3241a0032a4367a535ed84ddbf56a3c45e39c40a911254787dac10a3b2b4f6ca6f50b4b28de9b538609c0b5c2c4f6b7da0666
-DIST libpipeline-1.4.0.tar.gz 805155 BLAKE2B c0e1c774a0e165b6eb7639246324a2945b07652c6ddfbbc60c58a6daabf7cfa5e17690b815d971b0d694b1c7887196be7a70a72c1db5573690bf8c89c8dac28a SHA512 0dce585f9d7aea91889804fd7a65a549b41730add0f6156bf8d0409762fed9c29e8843426e8136c9e0a0348734acaabb48ceede1e3e4d9071d4d787d0b8d46f3
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
-EBUILD libpipeline-1.4.0.ebuild 496 BLAKE2B b28d348f01d4a9dc8a5016ed332613edef894ad199b7a24f0a81745b0d17b8e00523e538405a9b3246b97c7f1997cde9e4fa385b4868c728f33b81cdb864cac3 SHA512 35930d7ba97cee5d03c5464929411b9497fc6f0439cfe3d093b49baf5084af44951e70ad1287bbf98d7dddc9bc9e013b971233ae54d5c211ab6e0bc535c7f86e
+DIST libpipeline-1.5.1.tar.gz 987822 BLAKE2B 672da75a22aebf28e953a9a399d641bae8fb97da20527eb1f72f248d9e0afca10da7426bcbceb50f5bf2574fa7091e7ded5080c4a731327a09cfa74fde3a6c10 SHA512 9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6
 EBUILD libpipeline-1.4.2.ebuild 659 BLAKE2B ec089cba0d20931ad41e6296e665b209b107951a29169776ec2b58a454e228f33f0a86ee120728b9cfd68d78da1dfe55820b1fee42d3d06674153112e4c46501 SHA512 ee5a01ba66fb4131a9cbf38a219e7e53b4385b01a71eb35b449049b984b7e55b9642a4f5bed3853dfa099ae70dd9f53ed79e2994de2df42085d3ac819bfffe5b
 EBUILD libpipeline-1.5.0.ebuild 783 BLAKE2B 48cc2c46e4f50a65048065ff848d3e0ed8963769f3359c700329513460d4fdfe4bd8f6d02922d939a2aba57eb290d04a7c912aa3e99901ea734f2ff8c607dc79 SHA512 25b5d61e50cd82efb75d3e3fb1c9ffadf1737edf04f754dd120d6046bf20c84ac8e41acaa8633494e24ed0ee8d6f1117a897c9c19526708c12f061150a7eff41
+EBUILD libpipeline-1.5.1.ebuild 654 BLAKE2B 907ea310efe60462c462f6574e6e082822f75d1d64b33fb61956b4706c3898d8c0b32350289783870e931c766be86111c3ab11b43973321ee0173a77528dbad0 SHA512 f4d1cd81c877bf169e444e2b68ce2c557712eeeb2471bea3ca6e4a1582b626f14692c560b7aec0e4bbcdfb5ce7ea482f311d88c4223de92a2a0db5f8173a4e9c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild b/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
deleted file mode 100644
index d166b0175118..000000000000
--- a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils
-
-DESCRIPTION="a pipeline manipulation library"
-HOMEPAGE="http://libpipeline.nongnu.org/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="virtual/pkgconfig
-	test? ( dev-libs/check )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
new file mode 100644
index 000000000000..23a93ce35640
--- /dev/null
+++ b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a pipeline manipulation library"
+HOMEPAGE="http://libpipeline.nongnu.org/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs test"
+
+DEPEND="virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 2787117d16c2..4c34b1c74e82 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,11 +1,9 @@
 AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
 DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
-EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
 EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
 EBUILD libsodium-1.0.16-r2.ebuild 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
 EBUILD libsodium-1.0.17.ebuild 1306 BLAKE2B da03b755da6c2afa42c04c629d2f5f446f6b53bc1e5ad037e14451297eced8491ecb0c3741317f1784b5167aa34b6a024cd157f35b2aff0705d38b00cf7ba515 SHA512 13922c24a0abd9b75bb7716bef8f82ad46005a72c81350a90dc510f85005a34b30ea9f23df1a01caa9b4d6bb4f2a9f79de376bd875594fce00cf34e5d30a8333
diff --git a/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
deleted file mode 100644
index 6d9c86e10fa9..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.14-r1.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 eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index a25a4daca101..94ac2838e0af 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -3,7 +3,7 @@ DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21d
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
 DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 DIST libunistring-0.9.9.tar.gz 3736674 BLAKE2B cb328e2378aeabd8f1282ed6f66f556c6301a88bdbb11d1a7ea73569700a8af9bbbfa9336faa7b390e5f5df628001d5e9bf2081f0c36d139296f16d657e70de6 SHA512 dbf067ba5c748e198f8837e603710ff63714d1bb4642a2cd2facb8f1034b617250c8695f4e1caad77c417bdcb0f1e1664eafa5a18eca77126741a4363a1c9cf4
-EBUILD libunistring-0.9.10.ebuild 999 BLAKE2B 78bc173da9581cb44474570e5bc76a87db5e77d67de90256a527182eeab57053881151fabe13303fc575f1c6f0293bb03d7dd231e7d24fb86ea518c3bc77278f SHA512 f2a0377af33ba35ebe13ff8114619ff33e5fb8236ec655e12519a541eec14843e5eed0ad90c8f66edc20f3b3888ce4e3179f5c2864dd68e838148f97c1e08b2d
+EBUILD libunistring-0.9.10.ebuild 998 BLAKE2B aabbb6cda29021aa13bd5b9e8844b89d91107b7fee4de63eb91dd5ffce8575ebbbc12d26f01a12de0243d3a1b559f7b83dcdd21b1f08cae4b68543ffe5d35a2e SHA512 69632867f581be61e3c0d9d69e7b0e97dbe24c610d8adf1d1d3459c379f54c61b698ddb5ba229b964ab8db1ecdb53a116f3dae5c3129ce111f868236573bde95
 EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
 EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 EBUILD libunistring-0.9.9.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index 4f166c0ae80c..0ee94231712b 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 3345bacd566e..819fcc62f65e 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,10 +4,9 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
-DIST nss-3.41.tar.gz 23319563 BLAKE2B 76636b704cd572f9b840c7699c29697a4a882e66afcc3895ceb7b59a7af7af2513074e1abc6a028a13126d44e0cf722ab29e52a4c69640a2247814292efa282d SHA512 b5a43fe86ded664002fd714c493d9222a64539cd6139b64720625d1742fec5100712cbe401c90c79196e9cbad9ec07d9b4f0f517ce34e4b207beaa3e01c9e114
+DIST nss-3.42.tar.gz 23416008 BLAKE2B 4aaf31fbc13b57ef438cfd8ee0c42a681af6939c707a51a25cb551c120221a5b37b1471926e75920dc2a53466d2f47599973b6f53175d7e952b49527bf3f34a6 SHA512 ad22f4b2672b4f29c7dd5544cbb642d3ec4b451137ffde4f608ff7b9826c762caa885f4802e1df291d2067a291aae9ffa1cf7298af96e1c6afa019fc7c3935bd
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
-EBUILD nss-3.40.1-r1.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828
-EBUILD nss-3.40.1.ebuild 9416 BLAKE2B 3ca8dff9adef57429a898b6c053c2887ab0ee2cb22c8e8d55cdd1d972c0c56cf4505a9fe9adcbce988a04598f6a726d1652058f0be43d5a42b2a82041178a485 SHA512 8c072e3107263ec03b41b18eb74e945868778f7a9a4bc538f34df1dc7891db7fabf6948aa7702a2a55a9566d4c3d02426449bee4c8516b49f30a4b4a42d2ac4f
-EBUILD nss-3.41-r1.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828
+EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
+EBUILD nss-3.42.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.40.1-r1.ebuild b/dev-libs/nss/nss-3.40.1-r1.ebuild
index 907e54788a66..5200c1dcab7d 100644
--- a/dev-libs/nss/nss-3.40.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.40.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 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-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/nss/nss-3.40.1.ebuild b/dev-libs/nss/nss-3.40.1.ebuild
deleted file mode 100644
index 02de23a58d2e..000000000000
--- a/dev-libs/nss/nss-3.40.1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-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-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.41-r1.ebuild b/dev-libs/nss/nss-3.42.ebuild
index 907e54788a66..907e54788a66 100644
--- a/dev-libs/nss/nss-3.41-r1.ebuild
+++ b/dev-libs/nss/nss-3.42.ebuild
diff --git a/dev-libs/sblim-sfcc/Manifest b/dev-libs/sblim-sfcc/Manifest
index c58dad0693a9..f9772ae0760b 100644
--- a/dev-libs/sblim-sfcc/Manifest
+++ b/dev-libs/sblim-sfcc/Manifest
@@ -1,5 +1,3 @@
-DIST sblim-sfcc-2.2.5.tar.bz2 376288 BLAKE2B aefe1381abf0b4db5eb19e21f0658cb0ea0503082972313a0187192510d2322035575fed6e36ced3cec61792a012c51482942a9121b0af9692c16dbbc56a1610 SHA512 c4ae3e36eec0a9faab347ba742d4a10cd72c906e89794e4e5a52411ac5bcd10b86ed8130efd02a44bba573654a10cfd1b504cedb638f7f66a47f8ee7215bc78b
 DIST sblim-sfcc-2.2.8.tar.bz2 376918 BLAKE2B 867d7643a9f11cf546e39e839ef5a8d3addc8902dd024f741561b0e22016a11e009779c8f50b7228e7ab21b8b697bd8f767b08a08f61727a07ee37c465c0d223 SHA512 b5eb7712aed1e40f19993ba5f5ee2f1f48c01246d28e9f4d89cee53000801ce4fe7c862a82163a55774c71094223b32bf8981a883ad04e820f9c749e746f52fa
-EBUILD sblim-sfcc-2.2.5.ebuild 561 BLAKE2B ea157f0d8e7b56fc2baddbcd8796d6cfebbce3df022a44a7c921b40eff219c27199a0d59e3cfc7aff3602c410b3f1910641ae8692a77d62bde842a44ee774f5c SHA512 229c965852eeca0bee141f819a6627568ab74e42ef5363d8427609a35d62ffe88a57b8bcc53dabf35ec33694cc3c5ce9edd09c7ab1805dcb4d0cb941bfce547d
 EBUILD sblim-sfcc-2.2.8.ebuild 582 BLAKE2B 2031dd0026172d86259c675a051827ff2107ad0cbc0622a8fa7e51fa42243e81eaf3c79296906cedbfd63cb5080a4f92b1bfa68cd3197aa6c9574b00b4be335a SHA512 24eea0fb6ebdadfe178ff24e87681276d9dfc82c92fd9a5e5725ecd1c96f059cc8e66b88be83e2d47de357374a39022c9469e8cc33274c8d1e3dde72cc14645e
 MISC metadata.xml 242 BLAKE2B 052465d196bda064646fae6603fd20d79d90b2033abf5b1803af7f616bb16ab259866d49ac11085be252a6604f663e227958baf09275c17d46cfa0bda9be97ea SHA512 d92b2c91d32f632c3916af1ad8fe764b9c6c6dab77658a8b05aab608e2a74e3124a2312877989543423ed7f1201257795eda9cab675fde55074412b7cbff3852
diff --git a/dev-libs/sblim-sfcc/sblim-sfcc-2.2.5.ebuild b/dev-libs/sblim-sfcc/sblim-sfcc-2.2.5.ebuild
deleted file mode 100644
index d2d523553f03..000000000000
--- a/dev-libs/sblim-sfcc/sblim-sfcc-2.2.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="Small Footprint CIM Client Library"
-HOMEPAGE="https://sourceforge.net/apps/mediawiki/sblim"
-SRC_URI="mirror://sourceforge/project/sblim/${PN}/${P}.tar.bz2"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	net-misc/curl[ssl]
-	"
-RDEPEND="${DEPEND}"
-DOCS=()
-
-src_configure() {
-	local myeconfargs=(
-		--enable-http-chunking
-		)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 7067ec7640fe..b77e92fb6c04 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -4,5 +4,5 @@ DIST uthash-1.9.9.tar.gz 225620 BLAKE2B 4c23cc11c54ac2c8af96522455126a5fdfb1f533
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
 EBUILD uthash-1.9.7.ebuild 673 BLAKE2B b0ccbafc68e7a3bd4cd20f18aec6979068f789a830e578c99a4e80c1a7a9988da8b34ebf7141e61377df693ce7c5044f4d958a4e0069a99bb29fd3ecf4191220 SHA512 c8fd82b22f09ab684a8c594e968f1ee95086bbfcfa52b2d07b902a3f7ab8e77f082f5e90e28996c983874e59a8176a39640f6b4de4f802a35eb923d9c0a39518
 EBUILD uthash-1.9.9.ebuild 707 BLAKE2B 99347104c2e53f8e4c6b969508749d3e9ad58243faf5ef49332f7e7b351876b082f4b6562fdd6e8b3271f6accc372776169cd1ed9ac8c4fe56c2be4cf62d48e2 SHA512 47a6d8963b4f1eb2b9716f42c10fcf9f71afb5c1ed92796e920365add71601a63433c33866f8c0ab142ae15e026b199e468c3e5379687dc6b0d4579827fe6eca
-EBUILD uthash-2.0.2.ebuild 637 BLAKE2B 7cabdd353066e4b5c0e076ed27ce67977cf79ea58441942f6d0fd2cbcd1444ed80e465d76138468a13d342c31a9fc7b535bc253a94bcde1571c7cf44df448209 SHA512 5e67fe483ae3ae421cee8182691f8c0dd665a0d64ab797bb8f24f27ff271ad2ecb081b09b422be4617c9737cc5827d2460f8213f33b7a6219f898d1d6c095216
+EBUILD uthash-2.0.2.ebuild 633 BLAKE2B 54d553a5f64223b8c2e078e5ae50834dc7ecd73318a4890498a6866cdfdb41d6fbbb32c7344d25c196ab58a90dba1bf6a06e0b578f2ee79c3d7f2637fcecf694 SHA512 0737910e043f74484343ea445e756d4b53edde73af00bab473820f64678d8502f2ef568aced495cf937523648640a22656999364cf688dfe0b025c905ec8f3da
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
index 3800e6d66a65..82653f64ebf8 100644
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ b/dev-libs/uthash/uthash-2.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-lang/perl )"
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 10628a413442..2f64fd40b196 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,5 +1,5 @@
 AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 773 BLAKE2B 8ff1ad29ec1d732ac9c5b7d15da06105da8183ee4d91303732500c61f31e34ecfe591953d95042aeaf2e2051c57553f62763a584f3705a9248f1fadb255fd328 SHA512 3f53f0883a1af59a9fab2091aa78cad6e280398202199430afd1549714783f47b6c22a2c976a695d186a5336a2d29e6a19237b65dfda03f13bd21faf6d8032ef
+EBUILD uulib-0.5.20-r1.ebuild 772 BLAKE2B b6197efbd020ed5fecb63745083e13c0c4ad0fee60cceabf7f262371aebd304239b807cbe20679bb6b489096a88ba604dcbf554a5b598d0de07bfd9b3fd899ce SHA512 37e790b1e5ec40b4129499870763462507d6f5f587a6a832b8ab94118f85d847524c2e2a3c9425fae6c0cfe70a529dcc0aebd824ae102f7e7c3d6a0184e3e864
 EBUILD uulib-0.5.20.ebuild 691 BLAKE2B 14d1cfc8f2ee94b4d2cf9104f6e9b12d859ccd0bec6af4dc4e3e8863a3226e68794ba27b62d7cb680669a1132c1c57a7013be97cdd4461829d5e89214b93034e SHA512 ff905fdecc1fff0af38fcf09b4e30a37d0ed014221e3d4e2dec81536617b7a1f3c66aa0a0dd773b8971892b90bb30a94955a5568488f717c69fd4ccf5ffa29e4
 MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 4f542854349e..1222e40ad51d 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-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=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 060318410d73..9a354db8df69 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
-EBUILD vala-common-0.36.15.ebuild 2518 BLAKE2B 3cf948007e3d995897b9099b2c74ecefddda03a1a94757eb61d85eb7c23ad0d9f3d718fa2796d71cbd7e3143afb08beed13f1511b65c5f5b2e24567fdd639497 SHA512 da792acf4f2d5456b878d70068b4655049e3a0ae7d70a158423e1952d19e212b373823e572051c49dab4822d699a58b0aec1a92130e4659460ee7127d3f81914
+EBUILD vala-common-0.36.15.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.36.17.ebuild 2528 BLAKE2B 22a27070320c74579be8eacdbc325a6e58be193d787521c73aee40028c4e02e3f3ce4d8d987b889e1d253fec1109fb7031358f3c6317a11616e788c2f8763d8e SHA512 ebdc12ff8170abfade55b3f5013c1813a23d545a5c0d1d828a5257c7f5cdf7687ce27e4d085a84c977ac171ae32daf383214ab353a2c44befb5d6e1f148a5c20
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.15.ebuild b/dev-libs/vala-common/vala-common-0.36.15.ebuild
index 05db3a153389..8b0eff8060dc 100644
--- a/dev-libs/vala-common/vala-common-0.36.15.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.15.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 @@ 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/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index ddd02fdd550d..202cfe8bf958 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.16.tar.xz 104156 BLAKE2B 7c6403e5498c2a9f1a97dfeef780a8df0bd05287e8866619657b29f5fc79c82fcc0892a7099b5eda80720dd136f8fa3c848c05aaf870e978e09ab2b04d883c2b SHA512 8ab33021854f3e8f6bca7a9e69427e7a3e53297cc0abd4c006de7e55fac66da3ad88489a6eb4e6c28c7ba2addd96e7f055309f3c8918643b18ef78a4fb637f84
 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643
 EBUILD wayland-protocols-1.16.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b
-EBUILD wayland-protocols-1.17.ebuild 876 BLAKE2B 25c88be858ddae1af509f1bc5247038649d3755de01584bba6a9eda9322c8ced915dc45d9cf4846e6d025836c0af1119bea9ba3227510f587faf25cbfa2001bb SHA512 0380ce949ed884edf6ce715f05ab0fcac877c4a48bec7efc751234366136a3dc65a11fc25a4fad4cec2c85e84f09d79a0fb0a5b5c8270cd6914e3b04f8de06a7
+EBUILD wayland-protocols-1.17.ebuild 872 BLAKE2B 7eace1ba64ff988655dbbf7086e30acceca9fbc14f41b16185b526764a5143372558d3523f2440830fc3ca3eb43f85b533f9006d057192bd12a3ab4ffaf5a198 SHA512 1c39fc3fd59999332705c33b43532e4a83639de6b17a258d26df88b2b14ac14c43259ebefc90e710d0996722c7b3140ff5c513610dc2c397f65af6d77e75372b
 EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
index b6d840ece807..53b286d6c4e0 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV != 9999* ]]; then
 	SRC_URI="https://wayland.freedesktop.org/releases/${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
 
 LICENSE="MIT"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index a51d4a165f8e..f8904eb44a6d 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -3,5 +3,5 @@ AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7
 DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 EBUILD zziplib-0.13.62-r2.ebuild 2183 BLAKE2B 3d46cdd0afd006f807c8015b93214eec481d120d200a9f92e03176d9ea7d95988fbd10fc6dbdf655c8e73b8f809eeabd39703a9d9cb24261a14ad6f4022fbd53 SHA512 39fc10a12b8374a5b737fa0fbc0c229721ddf3f8a30d3a987633d5890e63a76b4b358a0803517e209365a804a67dcf7af37159c28f8e7f315c6ba1d1d1a0f838
-EBUILD zziplib-0.13.69.ebuild 2326 BLAKE2B bc54cecf24cda0cd1bdd93aaca779f38d61fd114af157c6c8a55cf33d7503144283778e4644556b97ec3659aacd439bb733f52793984f4fea2dd989dfa92319d SHA512 c4e7a37cf2a6350f251f52a5e0589fd94a51b7220166ff83cc8a7a66d143e8c31420ca1d49bc9136878de298d668824bfd1532b92a0e514d173fdd9ce4ef2cc3
+EBUILD zziplib-0.13.69.ebuild 2323 BLAKE2B e165aea5cf88063d5facf80325e98a98d63a21bcb4fabf4f423a3f7b0cbeb27df3752051a7f8eea11505cda1d4575833e172ad0a36b857040807d20673e43794 SHA512 741b5f604f77998d9957a1da5cdf50a2fc118a7b13629c3899e6c6aa699e889ee9e27af7b39e29437fc41fbfe125286908d28ebdfe2fcf115924b0237c6d867d
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
index 973505427e73..9de964b08695 100644
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RDEPEND="
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 5210acc08083..dda3a7fb62ff 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
index ad8d185ae858..27175c563392 100644
--- a/dev-lua/luaevent/Manifest
+++ b/dev-lua/luaevent/Manifest
@@ -1,5 +1,5 @@
-DIST luaevent-0.4.3.tar.gz 29861 BLAKE2B aa1a2bf3ac708f012fc168616ac19deef55b805deff9e02464d089efa1fe88084103f3638a0443d6df0a699ab95730469f6d15107d4eb2dbcc112412a41a43d4 SHA512 5f02c9d40e59589a2b932b49d27230ca6650174feeda2cf412769c33af056c9df52d38fdd5fc12f0f6318b788e29a2deef54f11beb4becc48818edd27185f161
 DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea
-EBUILD luaevent-0.4.3.ebuild 1191 BLAKE2B 99a595eb5adf68dfd72ee311825c8aed2596a4e3ca482cc2c4756366382d5f9a49980307c1f39aa5c957d5c78745bc1f5155085c267ca700d81e46568d72d5ec SHA512 298532c28584d929254603633d5b4211fd9a4a95b7bd2900fab41124347a57fc84af7af1835d2e589d581f196ca8b448e8a298ab13bad41f78bf572e9a6b69dc
-EBUILD luaevent-0.4.4.ebuild 1186 BLAKE2B 3a96fed04d855495b4f5a90231b9be8f31b7090293acd52426c8e8cdd40870a9ff3ca294516bacdae8ff7b5b936ed89de9dac6612a3625c344ea111811ac6136 SHA512 260ee859714c53fdbed06cd1640a6e866a3bea5bb697256399b6016a6bb2e9a145fcc50d7d5e62844281a24f36db13157fae894b7174ac0d133ff3f0ffda6ff6
+DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913
+EBUILD luaevent-0.4.4.ebuild 1181 BLAKE2B c169b9a3224f7a8cecd6fc65f9102d17d706498f4b590a3c55166185d23605806cd72cf05bd0bbca7055dcaa850dcce3086b66868986e6f47ca4ea253367a99a SHA512 9b87000a6f56685a002e181ae53d2b80c5fb3699a856d06c99ca98e881322c5ec455b1ffed5d60ce45ff9b7e3898547909228e99c465a83127b9ef6fecd183f3
+EBUILD luaevent-0.4.6.ebuild 1196 BLAKE2B 568d001d7dd42ffb77d005def06f049c3fd0d188c21941dbabca9566cb71e3644e9e5185843e8dbca4844b29e2e8c65b2ef83454c168400bed464a3ce4ad1bc6 SHA512 cd7f66c81f2caeb08b3f80f843b56a8434227db1e1b87363fcb7f826282e7f607f06dc4406070fe0f689bb70e27ea0f8ce78871892162d6b578dfcb8d140d808
 MISC metadata.xml 398 BLAKE2B ac77d026de4e3bf021781616d336e8ee117193f5871fcb027e20dad5857d663b8ac4b463be0ab4eb2fabacee4fbc2921fc5fc96eab5909ab619e9a915573c13f SHA512 f452c9ca43d8558f9cd70c472c85cdf6a3a3e1e021783d82d062832c45844df0552b47ec4d6e1abe329f99fdb1c5cda1bb3e0b2e98900efca77e8feeeedf72e7
diff --git a/dev-lua/luaevent/luaevent-0.4.3.ebuild b/dev-lua/luaevent/luaevent-0.4.3.ebuild
deleted file mode 100644
index cd7a3d5f2bc5..000000000000
--- a/dev-lua/luaevent/luaevent-0.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="libevent bindings for Lua"
-HOMEPAGE="http://luaforge.net/projects/luaevent"
-SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1
-	>=dev-libs/libevent-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild
index 45ed9117a1c5..57fc5cf893f5 100644
--- a/dev-lua/luaevent/luaevent-0.4.4.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-lang/lua:0
diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild
new file mode 100644
index 000000000000..84700e9d48e4
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="libevent bindings for Lua"
+HOMEPAGE="http://luaforge.net/projects/luaevent"
+SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/lua:0
+	dev-libs/libevent:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \
+		|| die "sed failed"
+	sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \
+		|| die "sed failed"
+	sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \
+		|| die "sed failed"
+	sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \
+		|| die "sed failed"
+	sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \
+		|| die "sed failed"
+	sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \
+		|| die "sed failed"
+	eapply_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index aef4b94a305b..9ffa3eaab2d9 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,5 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
 EBUILD luasocket-3.0_rc1-r3.ebuild 1107 BLAKE2B d7a6263f58f3db82491a132ce44e033c9db857eaedbafe3b015be1bff86073c58b932c072d2cf3c213e6a5bd003b0267cfa7ab6ef2e73c22aa402b379a20b73a SHA512 f85177c0f36e3dec2c7c2a92d0d31034877214bf4cb848901b04868321e5fed64b6b2b123dce3815be0f726975a3a074647f2fafd9dff893212bdc2a76a8f631
-EBUILD luasocket-3.0_rc1-r4.ebuild 1180 BLAKE2B 724ac52f5a7b5dc7c36bb7135af260a8d2e50b4ddcb02da88474149f0982c7b79b7f18a754242a14e6102470cfad091e6a287d5b671b1850e5553307b1f53eee SHA512 940e09c9275f326cebb3b49b4ea39cbec17bce94c52a1c362fbadd07b0169cb703063d817c825d3f7f272aa1529e63db76fbe193a5420abeee3b95db87cf97e0
+EBUILD luasocket-3.0_rc1-r4.ebuild 1176 BLAKE2B be93c9f3f45c1f15e0458894664ff2fe3a2329527ff377e0443491b94efa0f0cc23f1fe99f299930540e7362ce93183600711315a5023e06bfe634ec5867941a SHA512 1ff370d00555c18735869b584db2324caf8788a59d85652e54de131ed88fe7f466da06ac8aebb696fbb867f220ab0bbea7a849cfd061c5038e5b5a6b61a30215
 MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
index 9789a03154f5..8a71a1358733 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1-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="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"
diff --git a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
index 19e2e77afc2a..c47610a8b9df 100644
--- a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
+++ b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-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 @@ DESCRIPTION="File stat bit mask constants"
 
 LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 s390 x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/File-Stat-Bits/Manifest b/dev-perl/File-Stat-Bits/Manifest
index 8f44444cdbf6..f0bf8202f3d4 100644
--- a/dev-perl/File-Stat-Bits/Manifest
+++ b/dev-perl/File-Stat-Bits/Manifest
@@ -1,3 +1,3 @@
 DIST File-Stat-Bits-1.01.tar.gz 9348 BLAKE2B 7f281109e194f5c6226051ba3df9b220e5bf2058ffae7e46f277673c66667aee0f728f48416ce5a0ed77abc6a4450483ca02c972cf4fa2b72be3097089a47e16 SHA512 8f9f22e4677baa9b996c0b6228bfd41cfa983b9a6581fc96473c2f3d3e0c79894f31ecb44cb2c371b45be2afcc08f71c9f40d1e15c2f6655b48ef208b33d1218
-EBUILD File-Stat-Bits-1.10.0-r1.ebuild 314 BLAKE2B ff0390f39d2794b376d74f1b6aecde03b21fa9f04c1774e2e825088741cb0ca35f57f24a6e68098fcadcefdf30c600e3ed336f5db56876c0f2d2a5992715830c SHA512 6c35ce485acad22bd45f95ac8773f2027ca0fb5278e97ec5a5d40c4e7bb10bd139e6e52055f7e1ed02fdbd7191114e316c5afe552907984a0f99e8086da92909
+EBUILD File-Stat-Bits-1.10.0-r1.ebuild 316 BLAKE2B 512ca36d8bc7e000a726e976f6dfc48c055c9606f50676f3478110fb03e23118e73cdd4814ffcf41c34f7a9d6c431ba2829f1d0d1609935980903a9a0c0219b0 SHA512 d569666d7d5be3a5d32698a3bd120295e31461366ed8c40fb216f025d4a12835d03aef4ba191968bf0b73be91707d1fe9f8c66c70d8e1321bdc87be23d5f887c
 MISC metadata.xml 471 BLAKE2B dfc8fb7815748f7a1b7dd0a66e1bc37fcdaf7f9f844a7b2e1a00abcaba6d2cc94683dd6207b8f60f9a84c74ea9a408bbaca60f51cf38d4a87df61144eafb5719 SHA512 274e9b07c23cfcb0dadd89eeb8d32c2f545b6d2ee98c8d613ba861986d91a144d80cf09bf78c881acbac0ddb88b62b1677db662e34f4d3d9c2f6c8a8c06da610
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 459aed1dd550..569bded3791c 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Term-ReadLine-Gnu/Manifest b/dev-perl/Term-ReadLine-Gnu/Manifest
index f6f972c4904d..d3a0795a8a38 100644
--- a/dev-perl/Term-ReadLine-Gnu/Manifest
+++ b/dev-perl/Term-ReadLine-Gnu/Manifest
@@ -1,3 +1,3 @@
 DIST Term-ReadLine-Gnu-1.31.tar.gz 78350 BLAKE2B a1af8f7ac16e51cdf99f40c1ac682043476baedae448c4a964db3d2ed3d794c9433a3e77dbe5b7978d7add70b061e54ccc7db088eaf5a14fe04ec5967c4af286 SHA512 7cdc970fc77588788d1c0beec2a1359cf163362b8192bef0f0f12508c6fde4cf149b9e1727c3df185d9928f74c5901f67f6b4d78f3413dc35cec6ca65ccbd0e6
-EBUILD Term-ReadLine-Gnu-1.310.0.ebuild 403 BLAKE2B 1f518f18d15d1cbf7e1aad536e765f0c1854547e27d8525644c0c380633e6ab0df9dad4cd2d5275190385aceabe084abf39bcb7659d5d0df129e734c76f84c4c SHA512 86788bf66b58176e50ee85389c5abedb6a148c82d71a0a572899bd870a6d13c7cd4c48f2586e018c5429d693371f69ab72ab58bfc869876a49a1a97248179667
+EBUILD Term-ReadLine-Gnu-1.310.0.ebuild 405 BLAKE2B bddfd32dd046626bfdee5abda8f17f414b5d7a0c0751166a4012f9df9a81cba33fc2f30b40cccd75614f2ad35cf68336a776171e8cb98e56ebfca60724ce809f SHA512 95ab19e0e2484b3d7e9bf9f18f3f4d78fea87b530297bf24c45dfd140392af617fbdd4738517be95d7d2958af086be88ebe63ad24371d034c2fe2649aaa3e27a
 MISC metadata.xml 618 BLAKE2B 1869201a091b8ca507f4c5f14172bec36d6a1afce36a8fb2c40fbfcefb22e5b30dabd389b7197876f4ac4f4149e360e7a2ff6d338ff462f7f23dac3bed617cb5 SHA512 e55aac406591e036f205537227ab63093284c062fbb7b2f82904dbdc592a4329bdbd98ff0de17bb1c3e2a18593246acd8bfc55a9480396a46e2d1335bb9445dc
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
index d74bb128bd14..79e27905f9c3 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="GNU Readline XS library wrapper"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/readline-6.2:0="
diff --git a/dev-perl/Term-Screen/Manifest b/dev-perl/Term-Screen/Manifest
index 84a6e2d3c045..fc8689c5fa5b 100644
--- a/dev-perl/Term-Screen/Manifest
+++ b/dev-perl/Term-Screen/Manifest
@@ -1,5 +1,5 @@
 DIST Term-Screen-1.05.tar.gz 9403 BLAKE2B f3442894536bdd1d8ee3234852b78f657a22a9308f9ff82aaf9fdab706f9a442885fbb33b309e89ccaa513ee2df63befa0ed6b4c6cd719ca97bb0e04b0cf156e SHA512 8996255ffafce319580fcbfe92e65aae5cd73fbb4e12a88a265a9bc66e44d87337e13066ba1445c5f5cd7e7deb5d07c8454ce008ec4a81fa06442e18d08124ca
 DIST Term-Screen-1.06.tar.gz 9522 BLAKE2B 898313be598039cb6cc95482fe49a2ad31638db642089a60b63dc69ebdc5565fb2cd9999a6287dd3e19e93ad23650ed662e68fa9a3ed025a347146cc7382be6e SHA512 c65d97267675a39ecca4f221a75d9d0e171db7463a1680ceada6a752d434af431d6c493043c28365ad7474b5d79c21574da9d2d5f482e67a8ebca6ec3fa950a0
-EBUILD Term-Screen-1.50.0.ebuild 389 BLAKE2B 10c023569d1820c6c7a23a16b0f79af1975561af60dc098ee7835c79761f4c3bb92d8ce3a390a0fd9621675044f1ab57b5e3f19fb1ae1292d98ff99653658b4c SHA512 736054f866fc78afa2c50f156c19a1758f60ec9cbcf78dd84931abf70b36641d6fec9862e0324db9f0ae5749cab8d1d90502dac416076ea45f58ed64c0368213
-EBUILD Term-Screen-1.60.0.ebuild 389 BLAKE2B 9f18221948b4f877a38e0f1b5b33828718b203e72068ca19eb04c6c2e709da2837ae70dcb495661eab77ffe045be819cb97348541f62c2df98b8cdb54b9684f6 SHA512 6adb2ebc5ba714a6580972b7f21deef1d3d7d2368be0f1e820bd0810bef2062451ce20652ec4169ce35357e47ef892a1bc6bcfd75962e2145f399d3a8c562e3a
+EBUILD Term-Screen-1.50.0.ebuild 391 BLAKE2B b8d374a85f561eba635f12e0a4854d53a68723bfde46d026beb1f55827ca24a360a59d642f5a36b02a53a1d0d58dcbf62d862f4e0b671e9b8db4a20504bb6b73 SHA512 aaab132c5134a7b9d513a30ae04caafa2ec248221f4aca015f414e8793b9311768ce6b383ccee70f78b2adce9f08fd202a34adf124dd1b8c4704d185e6e21af6
+EBUILD Term-Screen-1.60.0.ebuild 391 BLAKE2B b32934073cf873e745a15150af2f41bb670ebfa23db5c23300b91cad936e2392e59e6b8dccd7807e37f55ec58f03aa1ee7b39eebec3b124cef4b9ff8e800a042 SHA512 f78fec9869cd07ab0cb944d1f133df61e397dae11cf8fd350f2a236191eee583ebd3ac8dd182e301c0c51513fe8ac53303cec35e27baaec40d0b2d33511ddad6
 MISC metadata.xml 394 BLAKE2B 72d9118e34980745451132f3b2762d645f409781a516de6d01950af6603718b31216a8bfbf5089f804ad3a6302631df53ae70f0ed3613694c6506c2ac37c8749 SHA512 f98246c3e84b655eb5a90136d9a644facfb3b59ca705e4479dc54a822b6582dcb523c920ae1450d1288bdd4b2c9a0961fd36f9a6f02d53f6fb1c40b37b48fdf5
diff --git a/dev-perl/Term-Screen/Term-Screen-1.50.0.ebuild b/dev-perl/Term-Screen/Term-Screen-1.50.0.ebuild
index 16b2be4ae722..42bc671e9c53 100644
--- a/dev-perl/Term-Screen/Term-Screen-1.50.0.ebuild
+++ b/dev-perl/Term-Screen/Term-Screen-1.50.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
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple Term::Cap based screen positioning module"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 s390 x86"
 IUSE="test"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild b/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild
index 5b9a818481a7..5082eba9629b 100644
--- a/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild
+++ b/dev-perl/Term-Screen/Term-Screen-1.60.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 @@ inherit perl-module
 DESCRIPTION="A simple Term::Cap based screen positioning module"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 s390 x86"
 IUSE="test"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Term-ScreenColor/Manifest b/dev-perl/Term-ScreenColor/Manifest
index e115f4675f7b..78f2335c4179 100644
--- a/dev-perl/Term-ScreenColor/Manifest
+++ b/dev-perl/Term-ScreenColor/Manifest
@@ -1,3 +1,3 @@
 DIST Term-ScreenColor-1.20.tar.gz 21325 BLAKE2B a97682d40e25379220f1a43e3a1da1fe96bf1c4f68d970fb57199b51b64c513f17a6072602cf1d7724c672847660d7d6b09cf6ccc8dc196038ea546661deea9a SHA512 13f1525cb1754e1f8a7b268aa6419c4e5751c81bd47f7a703c2b71e87c50fc3189c0657d4bbc096b32d0ee7b57c48d8e190ff2a56f9e8c4e1f104882d93a1706
-EBUILD Term-ScreenColor-1.200.0-r1.ebuild 454 BLAKE2B 4e5e38c224b359a92d317ec54c25bd2aa02392ba0b36e5f77aca08248621701c4f17817bbd3c1a4663ecdfd333d158f7855409cd744caf55936d1e053ff9ecd9 SHA512 b2ef45610f421f6a58c5cf551921b9335abca21a2d0c27642989a8af14214eaf9b7806f56eb1b68210497428f00e14d11686606b4d61a15156cce39e69f3123e
+EBUILD Term-ScreenColor-1.200.0-r1.ebuild 456 BLAKE2B 6f2efd87bfa9701844c7be641833b4b9fb189f925ede9ec2a503077971c27360c5a52e80354bd7071f8656902696f672d822b004ced7fecfdecbbae1f0198a4f SHA512 7a4833902c36edc98ae99d72c1005517a66084309986de9fd05f4df94af1d44ebfe2f0ba977a879d02c4908299e2a8a6dc2f53774d3439473e43021badb65828
 MISC metadata.xml 470 BLAKE2B b8f331d7d6bf492be84d2e1cb5253c0736c09cd92d5204ff6aaa00a6281bfead87fc4ee2ad16d4bd8a636694cc18dddb1c9f73f1c0617d95812bfad08a4a3840 SHA512 1faf9bb897a417fc201ff12bfecb96a52dead8de05ad5a30cc76069a21b681e1ea16ee472be06793c928df6159bd6b50b35702a54c9ed643637175361f2dccb6
diff --git a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
index 4d1c32984444..22b61d25e919 100644
--- a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
+++ b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-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 @@ DESCRIPTION="A Term::Screen based screen positioning and coloring module"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 s390 x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Term-Screen-1.30.0"
diff --git a/dev-perl/Test-FailWarnings/Manifest b/dev-perl/Test-FailWarnings/Manifest
index 5cffff702097..e200c0877bc8 100644
--- a/dev-perl/Test-FailWarnings/Manifest
+++ b/dev-perl/Test-FailWarnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test-FailWarnings-0.008.tar.gz 13734 BLAKE2B bf14da69bcfed50d8bd2801f629ffe4f9382e89a9febc334cafa7cc69e72357e4452a21aa1d630f9b7392cbc3ead4f26c3af93d810dbb98e94d2f7993193c855 SHA512 7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51
-EBUILD Test-FailWarnings-0.8.0-r1.ebuild 835 BLAKE2B 0690ccee78407eddfdef67f980ff57852f1fefb2249d42895103959ad2e7a46bcb78716256b791254667dd25cd9739c652eb4fa94a379343c2c599c0fef76dcb SHA512 98da2b41730c6d4bf31652b39201d425d2a86407007f0fb88abe904e7a8c9d5eeb4862b269ba99b43a1bf306e144c026f726f2a80e256d4f3329ff86472e88ed
+EBUILD Test-FailWarnings-0.8.0-r1.ebuild 834 BLAKE2B 37fa1c99c918c5a0e7306a4fe1f8b947d736d55b15a382455a62c3cf9ef63b5df514947e97803c659ef111cded588759245182b1406da2b7b96f18abfe5e29d1 SHA512 cd95983d8a296f77454a823061719f663d6103e5fb7edd41f4f8abe0190221668e5b21bd0343bb5a2d44b0b8adf0cd67a8fee72eb1e08846e5e2a7314e75e2a2
 MISC metadata.xml 406 BLAKE2B 49fbe94f177fca2a050e4750fa41b51826fa42ae88cb6329ec15631b92c9e1d25672b579c6d56870e5e9cef469fcddd74e456b5f66b10b2bdf49745a1088f5d2 SHA512 710f76778cb06039848865d8c0c163dfa2789f626315ab904765647ed304f684254c08cc5bddd1f5608a97b4215db3d511e6aa4dbb3219ec4ba4c215ee2afba4
diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
index 3f19b12b0acc..63d2bfab361f 100644
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Add test failures if warnings are caught"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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"
 LICENSE="Apache-2.0"
 
diff --git a/dev-perl/Test-MockRandom/Manifest b/dev-perl/Test-MockRandom/Manifest
index 9dbe4e53a595..bc1a84e579a2 100644
--- a/dev-perl/Test-MockRandom/Manifest
+++ b/dev-perl/Test-MockRandom/Manifest
@@ -1,3 +1,3 @@
 DIST Test-MockRandom-1.01.tar.gz 24449 BLAKE2B 23b20452fba66e1187bd54dba67a9fe006549b7adc33bd8447ae4be5c3de40648498acc19b586fa300042e178f9221fceb8f948c05b6c43b615eaf8c6c8fdabc SHA512 e222bd0d3d7673b403e80d1633ddaca0ee35f96f2245e8df859d661edc7efc09b9a96d3718f25b6614395d1f24d66c9498e842cec476cf8c5b12464d585f85e7
-EBUILD Test-MockRandom-1.10.0.ebuild 1018 BLAKE2B fba67517403077abe03080288fcdcace0b1aa8a099d4350db531457f5663f4328f82f8b26f5b77370a4b581319ebd1d27616e2fa0d1a9d7b8fb3fa967ba940fa SHA512 d58a9f67b8719477e53e13304280e43d90cdefbb8a72db3fcdd891d3ed325c6dc68de666f448af4adcdf0161a323dde2574a81e77b89b109288af0ff2837e652
+EBUILD Test-MockRandom-1.10.0.ebuild 1017 BLAKE2B a4dfcf5454c6d9eabd834740571d137591dd997aaefd68c78bbb5c27bd710d94b4586ae3773d8aea68555de7eb7ababf4b78d94affaec14e55e1a31e448b5055 SHA512 b2de7e5986cb0cbfda1437c91087605f6462aef7912e172ff7ed104716e58635449bdf492042f988eaa9350de7e88a81279f3671f256e68ae4988d7d64f081eb
 MISC metadata.xml 390 BLAKE2B 14d04b2a43ac0d3837fbd53056a3928ecce101bf26c47b3763de3947f118ca035532d25fd7d401204f79ac6a6798757d55a16625728135493a04f7841312514e SHA512 935708795308c099cf850aff026347137ea3f0ca5be9f9a4d616fde8d082b3a877eeed30fc59d9532d76c71b31d167a041b26a84d6001c4222527416f8f218fa
diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
index 02dfb1033cb0..45c0bbeb78a9 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Unicode-UTF8/Manifest b/dev-perl/Unicode-UTF8/Manifest
index db05f318d1e1..f42ec6dd52c1 100644
--- a/dev-perl/Unicode-UTF8/Manifest
+++ b/dev-perl/Unicode-UTF8/Manifest
@@ -1,3 +1,3 @@
 DIST Unicode-UTF8-0.62.tar.gz 87838 BLAKE2B 95f196bc7eee1515d5016cbd28a6e134ac4cb88413d3665eb2570f7838b56582840f6e78355f23ad4a3360c9468051b589c3003e6d5bcb6df977fe15ec778590 SHA512 056026ac2ee4c101de5ea6017db59f875121dba8fd23ab5c2ae525effb8cf864e8a1c24588bb2a027792e27568742fc75bd5765694027b110afef867a4b982e0
-EBUILD Unicode-UTF8-0.620.0.ebuild 883 BLAKE2B 7d45d94e24e754cd224b6330cd5d95efc7c742add4a13e319c3bd799ebe663f173690e89a251d66836e1c05ed063a11d407cace41c0b16997aa8f2c757760f71 SHA512 f77d16323705b3ac22560f4fed8ca8cbb18feb60031b36f53879191cce17e08a52ab73d970b6c2154288a703b6dbc1c9216dcc0c404e9dadd557e58740c2de12
+EBUILD Unicode-UTF8-0.620.0.ebuild 882 BLAKE2B e1a7d367a36d16ef3522475fd918429dd41a604703a7e8c29a96a0fc72499703269d7cbc96f37a890dc11dafa11e1b250f107180179b2b5b53a86ac55ec4d989 SHA512 9213489cf79f19da366ad488710ed0eb1f227f75366aef583dc0b203eabd4434692496bc69e08084b258356975280e69c40cdffaf67f7a41752ef6e5c0e06002
 MISC metadata.xml 384 BLAKE2B a8ad6a2ec3d5e83106a0db3b02a49c47bc5865b4a25176148535f38c58955c9252001731f42439a28df10322c33c385ebf3b57d79e983be6129d31371fb71c7e SHA512 a0350d8efdbfa84f03e8b82425bf11bdb5abbf4280d4ef0c44d963c80ddc5116eb3d199555f6c2ea07f342357befbc5ef2cd141b44735c03d69b20ab398674b5
diff --git a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
index 2bf1d21961d4..7cf55ac59e06 100644
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encoding and decoding of UTF-8 encoding form"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
deleted file mode 100644
index c579894027b5..000000000000
--- a/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1 python-r1
-
-MY_PN="python-coverage-test-runner"
-DESCRIPTION="fail Python program unit tests unless they test everything"
-HOMEPAGE="http://liw.fi/coverage-test-runner/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/coverage"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
deleted file mode 100644
index dc7bb339a021..000000000000
--- a/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
+++ /dev/null
@@ -1,22 +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 python-r1
-
-MY_PN="python-coverage-test-runner"
-DESCRIPTION="fail Python program unit tests unless they test everything"
-HOMEPAGE="http://liw.fi/coverage-test-runner/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/coverage"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/Manifest b/dev-python/CoverageTestRunner/Manifest
index d4f33ef9de5c..420edfaf2849 100644
--- a/dev-python/CoverageTestRunner/Manifest
+++ b/dev-python/CoverageTestRunner/Manifest
@@ -1,7 +1,3 @@
-DIST python-coverage-test-runner_1.10.orig.tar.gz 19149 BLAKE2B a3de03df4ef8445023dba14d5f2ee16390fa90b50c716b7c817cb1b2843edea9cb1a18326f7193f9588b3e87af1d5ea3b57f1a866f33a04a058dc76b7b4319c0 SHA512 041896468863d1f06a932da4a4113d9afe952ca88004feb3ac872cc8352a94e5f4b5d7444f8b5dce49e5dc3ccfc727553d540b9865e8bf00724ae312ff1be2e6
 DIST python-coverage-test-runner_1.11.orig.tar.xz 19056 BLAKE2B 5d4084f76cafadadaf197341a14fc89dc5c19242572e9ae8b607aa3596cea194afefc9b0b0e3c4c16178794e45ff599e65931e248aa8320934e81fc5a955c871 SHA512 669947608636a46614022d8dee42d144e9a4ca4986efbaeff503c2b68c3612e60fb03fb255893dbe9bbf4b1df3c6e375e2d93f333cb79b1bbb2b63a64e59c866
-DIST python-coverage-test-runner_1.9.orig.tar.gz 19175 BLAKE2B 993e4ba1daa6863ebd07bb6ccaaeaf104d9d505032c1fb71113fc321942f6d0909fe4a8d536cb22cf267278f3b0fd065f854f3c184b6e2968d50769f7ec283c7 SHA512 7793fc4eed0eb92a53a4dd1662a92dc131ebefe1194196f9a8e022d8d63da779aa8f978c056e981629324465f919869b5dc31cc9b31fe5e3173f1ac3f3f5c83e
-EBUILD CoverageTestRunner-1.10.ebuild 590 BLAKE2B fac5b3d7acbaddd9fc0526be743f6a53c35a64b644a7c428e9c18a3ab0d24906cee70d4b683ecb9826e9e8a2aa78999c7e0ab7090b0269d18de31955bd999ad0 SHA512 7066d3bdd2f86b0204cfaa1ea5eec6d19941f76c30beaf0dbf8a89357fbd3070772b8bd4bce52b31f36a8c0a30f6ea54aedf272e1f31b0b436be55e470328026
 EBUILD CoverageTestRunner-1.11.ebuild 621 BLAKE2B 9485713c04ff6f5c2001eaf099c7dc45fa41702babb7c2388b16c163cd4a1d4de9f82a548312ddba07c4541e69f16a3bbeb34ea96c246d3af1855c7af24f6437 SHA512 05cda3d36c82e1b73ad1c809e9d18bcee3b57398298c06907e6cb34a76e9aaee9250faf2bff89ab78e9df3a0ff4c45f96ff4a692cb6a50e683873df00f53ae7d
-EBUILD CoverageTestRunner-1.9-r1.ebuild 572 BLAKE2B 4b9d2b1e9c9630d58bead94f7177256533e1091147ff2e5ad7526db74417795f3c605bc09bde2bbeebf41b4843e4aec907c6e686a1d94dec61de75a83b8ca775 SHA512 2bf2a2267483a3f0cbaa41f40fbc58092983833d0cf7a2da23b2417740878ff4bdae7b88c50ff1d87e618b4427ac419801f8bd87be8c3edb7af5449002e313c6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9c8a1f927962..4fab0574f347 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index 60d31db7392b..de327a2cebb3 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,5 +1,3 @@
-DIST PyRSS2Gen-1.0.0.tar.gz 8819 BLAKE2B b3278a68189102ccb5024ce6a3abafcea43bfc050ec61cbc1f7771a9c68c57a2dd36e6af236a84f4854cdd1ad2f827ae44542edf03257937bdfd619a1de32472 SHA512 0c8dfeed8cff3b1985e439d60083a16515883b2884310df7ea6af6f2f8cb32a5540373413b27ada0a7c5f56692c9cf61be04818d45030f2f888da33848b5a68c
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
-EBUILD PyRSS2Gen-1.0.0-r1.ebuild 437 BLAKE2B b407ae5685392879bd32fc99c3423ef708116d1ea925ce68155039b16fd9a8f7d3405eb81ad9d964ec3c66fe96192f61743d9b2415513442c78c86ebadaeea15 SHA512 7442a16c289dd9c358d6736a5067dfebe5e0e883858342a6bae179a088755b1a8d7419a9f125f85fbd2eb90b593325216fd0f56e0b7b37355c54cfdc50c3ce5d
 EBUILD PyRSS2Gen-1.1.ebuild 449 BLAKE2B e6bbb29219536f322cbc837e10d2bb1e2a10372c21adfb76c829529ff07d0ba5e0df8d4724afb27a396e60713965966b0974ff45dde6d07c23c864b9301cfc23 SHA512 d53419be3d5df366f19926ed952af45aa3942391d6f88a38d9d4aac354597188da124e1b7a88d5ec13ef260026fc979a0f20b8bd6c44e82cdfabe73546388576
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
deleted file mode 100644
index 929f770ba763..000000000000
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/"
-SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 2b0a1119994e..344e46271872 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,9 +1,5 @@
-DIST aiohttp-cors-0.5.0.tar.gz 40018 BLAKE2B 774b3da8f459828145253f21dfcd10741b428e5594b2e02c42d3b46fdc8bb3821ec53f93547665d4b56758684358f3626d811f4dbe6490a01b40b4f274ba3a0c SHA512 86c24a1fe18fb3b2b8fca38ef9aa7ebf07fc1b202d353a540b7d651cbf618c57c5afbe125d91c0d72aee937909dbea0cfb1baa182eebdc5402b66f9800706bee
-DIST aiohttp-cors-0.5.1.tar.gz 40081 BLAKE2B f491bcebf406b089baeccb62c1ce113fc3ef485f3103a24ef93b08b1b33b66c2f419f58dac80f8d6c262e4826762a27dbde479c8de6c17fe991a3b084f0dc061 SHA512 a06f65a479bbed50022394d51345e08bdf98a099f4b6efe355f4a4762155a564eee3d4e10ddb417daa7498ebc1abb93a3437b1a2cc6af9c2ad5fe8a8714c237c
 DIST aiohttp-cors-0.5.3.tar.gz 40266 BLAKE2B 701886b291a1b89f88a704ae04e3264cf2afc51f63f03ddd4464d40ba7bd3a1c6b5fe3f095b634e8c6c36c5a967e9a6b9b88335ff23988fc8bcd726c037fbd1c SHA512 0813ea48de714c85e361dfdaeef1a69526f7446dcc4ce637139cd333dedea58c635f85cfad1c3ccfb0df6e573f0351f282fdbd9726211d5915ed2ba120206b09
 DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
-EBUILD aiohttp-cors-0.5.0.ebuild 1160 BLAKE2B 6891e4427a74557d3a662513094f3c9d46cd4cd4ffc4c8265ccc502ba10448f73d57fe4378315ee62929d9701f747bb5824ec94d7500cefd843ffc2d1948f19c SHA512 85a4063f92210c47539b42ab05691c23af1bc9c70868057d635ec27419b0da48e7c63250f02586baa0534ddfd2ef245d4e14d795a3334d15cea2201d85bb3764
-EBUILD aiohttp-cors-0.5.1.ebuild 1165 BLAKE2B cc5cc061965901922276beae4224d1de4441d8cb9636964ee52b7f26936ca9901150595f5d79534ff5f654804f15b046153ae188c8403888f00d6d3892e380c0 SHA512 0f71d31846275cf8b7998367f2f897f34dc6ce409633004faf31a3ebb6b09825f9efcd4d21a7c5f39766743fd68ce307668b6bdb4ce8dd52ae3070e636cfa050
-EBUILD aiohttp-cors-0.5.3.ebuild 1165 BLAKE2B c24df6c14aca6e8df1681fa5514ea9977adbd58208bf84bda8ec59d558cc26d63de505ba43308c57284d244f5d798db28cd043f108c09e058d189f8028eba7a2 SHA512 a5f75e622c7e94d6a15536782f6c027c417d7e5135494789870b32f31ff3aa5fae816253d5e6cc51fdd2b79b891477129ec5680806e7290079110c0d34ad1f17
+EBUILD aiohttp-cors-0.5.3.ebuild 1162 BLAKE2B 414ecd7b85b7114f7084d76b52171d70a127c44fdc523e0f45b294b9e722a1ff29a620fe2e41f2b16828586028842258f35ed7733dc3357037e4a56d89799913 SHA512 4d4845e31c79737c3bcee83f7809e718c27f3e251b562b69a179c8132d931c24b86a4aa8434b20902ef43abbe74e51636c163824d2b880cda00b469a3dec8f2e
 EBUILD aiohttp-cors-0.6.0.ebuild 1189 BLAKE2B d65e97ff6a550be7ce563182e09e19de5b3e120dd2bc1046fba3cfd032072162090606ec951a7aa4320fde3cedbbbf7d28fb6aac204396b966e3cece4501fa16 SHA512 6cd255d7989b7250f74516938d71ec6b9aa1c383734af09a0801083cd0408d6815ce829a1a6204df2d2b6dbb32e292949239d3219e7b8a8864e54bd75f902195
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild
deleted file mode 100644
index f0c5fa8cee4e..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-pylint[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# for some reason, it is installed by 'setup.py test' on py!=3.4
-	# TODO: investigate
-	sed -i -e '/typing/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild
deleted file mode 100644
index 280963ec1976..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-pylint[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# for some reason, it is installed by 'setup.py test' on py!=3.4
-	# TODO: investigate
-	sed -i -e '/typing/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
index 974f16321d80..5448c38b7cd9 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.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
diff --git a/dev-python/asciitree/Manifest b/dev-python/asciitree/Manifest
new file mode 100644
index 000000000000..fb27606c7827
--- /dev/null
+++ b/dev-python/asciitree/Manifest
@@ -0,0 +1,3 @@
+DIST asciitree-0.3.3.tar.gz 3951 BLAKE2B 3ba081424ba94cc8afd9f688e78c3f05d99b01746023ce359285ec9389c1a8f4d471cbb16e2b66ac271a859379de0f195ad7072f016878b5c444bcfe4d2445c5 SHA512 7b61134299ff1cb907cbe74811dc1cab09d6aafdefad599e67025b85d8e35ffc8538524a8c6bb683009f7ff7f7f946250e81afac3fd3b7f3b3b0cd8e528b494f
+EBUILD asciitree-0.3.3.ebuild 435 BLAKE2B 9570aa6baf79aed6689386090df28ddedd31156ce526b06b39f9303df6372575421a7cdc7b49e043de0b6597024d49dac5e9bff4a9f55c82417756f025c4c402 SHA512 569a4634d169e02058aaeaeefaf46826e7fddf57921c349df30712d3d25dc2dc3dc262968576502728c8f378341964524e216f5f9f8db36eb479f97cdf034836
+MISC metadata.xml 318 BLAKE2B b16b67cc35cf940393676c21bf414ca1563aba4e6ecbc0e3d97fd618ea3540970c23e27840062e0a1c90283dd22fde9681159707e2c98ae967297810bc9ecbf8 SHA512 40e32765c53019a3b7355317409ce188f6cd50bcd85abc2870db9535f453f0bbda73b35f7fa8aaee69144a0a62bdcf23b7149c16746d33cdb7d91765b0521050
diff --git a/dev-python/asciitree/asciitree-0.3.3.ebuild b/dev-python/asciitree/asciitree-0.3.3.ebuild
new file mode 100644
index 000000000000..2941009afab7
--- /dev/null
+++ b/dev-python/asciitree/asciitree-0.3.3.ebuild
@@ -0,0 +1,18 @@
+# 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="Fast erasure codec for the command-line, C, Python, or Haskell"
+HOMEPAGE="https://pypi.org/project/asciitree/"
+SRC_URI="mirror://pypi/a/asciitree/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asciitree/metadata.xml b/dev-python/asciitree/metadata.xml
new file mode 100644
index 000000000000..34e95c6c0757
--- /dev/null
+++ b/dev-python/asciitree/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+
+	<upstream>
+		<remote-id type="pypi">asciitree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index b2af888e458b..b00bc3361f30 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -5,5 +5,5 @@ DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014
 EBUILD astroid-1.4.8.ebuild 1093 BLAKE2B 89692333f08a4c9b3b46086a20ef4e6cc186cfef6e9530b1ccd0eb6515fa74117fce8fbd1c55710323957a3f2eec57310b752e791d59a06a06926b8909d46140 SHA512 8e076be66daad2fae26351d89f3c61c6d41523ad7240c78a0e3c184fc1db634c708ca7348137d0eff11bfa20959084d7a97b0a9791caaf164c877984ebb90473
 EBUILD astroid-1.5.3.ebuild 1659 BLAKE2B 332bbb2ed4ae5a2f07e370f8f85c556cdf2a6cf486f6c261c7f18bda7f960d3de097e107b322344bc735f1eb4083461491b96cc7c36bc815aa2ed99ccb3ec0b7 SHA512 2076a3fefdc95b2f7362d5518fff0d749efba199409e51285131ea583d03135eea22a5c24907dba5b33940a80c58a8b2b04d79a69f950576fb08b9d227f1a80a
 EBUILD astroid-1.6.0.ebuild 1939 BLAKE2B c32202f279336b9d2ddebaba31f5469cc71bda427280c13950d554deafa2048f417cd4fe5eadb9a0885d62b5c53f6ce3ba8f26e14b067932ddf0cbf4d57adafe SHA512 b4e397cd08c2a326b47c3d18801975be3fe8b36de17ffe864c20eedfd1c986e0637295bbcbcb73b027be137ed690143b89ca353f347532487841d187ed427dcf
-EBUILD astroid-1.6.5.ebuild 2019 BLAKE2B f48097621e39f7acadac5035f0e300d94e632b85cae138dfbf4871d52cf9fb756a843d902c27e29ee196902ffb35faba251418fd4a4722bedf46512fe877605c SHA512 8e98ae42ae65549270b7347b85c09708c578766fbc982a6db09ce03db0b95e90336f3a3c835d51c0799c0da8781ab0dc002c30688e6ac4ba26c6254786048589
+EBUILD astroid-1.6.5.ebuild 2018 BLAKE2B 3a1bf455d17fc76abbce1b6739d4c81bc1a06fdc1d36e3b06187175cdf3825442221089a48f81b434a9daff92b4d727e3e885555ce1eb2e2dcc92263ce573da1 SHA512 61cd00a454cf0c0c092a0cac9db03bdb87eae1da854991ee4524ec749b143e05c432c83312aff0e1e9be4ef6c678a3a60b4e81769dbb267783de3af7db96d964
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.6.5.ebuild b/dev-python/astroid/astroid-1.6.5.ebuild
index 83f26735416b..b625561e4658 100644
--- a/dev-python/astroid/astroid-1.6.5.ebuild
+++ b/dev-python/astroid/astroid-1.6.5.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index aa35e943e369..b61e33fe948a 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -6,5 +6,5 @@ DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
 EBUILD attrs-18.1.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
-EBUILD attrs-18.2.0.ebuild 940 BLAKE2B 3d94e04053202e27d6dca54d8420185f566e5ae3d9c3937b6bcc238f645e061084946538121cece1f9660f107d4f1e99b657caf316e778206709e2df18504938 SHA512 3f45f206dfc805245664cfe9604a274692d5c64f9fa2dc8a50f03b9a3d02ce18f75d322d73d62445d8306e8398ebe0001c0cf14b013df7685fb2f14c732d0d13
+EBUILD attrs-18.2.0.ebuild 938 BLAKE2B 85cb3e9b4ba31d6cbdf890a2fbd406bbcf88c02ce1d55bc0d2a5caddb980ce9e22da97662e55f9a271977983157d57b4fadec0146f1b87438a75508fe6645655 SHA512 91be0430bb9898ca525a4aa2380dffd47f4620036400f6ea89c4a5ea22aa686b3969f339da9c68fbd64162245755f65362ae78d4bb95dd06fce4af4951baf029
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index 35aef82ff0b8..cbf71ae7b3a1 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 74a17ae09632..6fba1afa8683 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -3,9 +3,11 @@ DIST awscli-1.16.62.tar.gz 1147749 BLAKE2B d0a578478f5aa6e08c8de3c0e5e85b99e09a8
 DIST awscli-1.16.72.tar.gz 1169697 BLAKE2B 3ae37ee02bb821dc5e5578ff9937d6fb313bd369e9f57c276d3e3fb722743b5f07536ed60ffd98ffbb779e0ad3882f9345d0ccbed3572c2e7332c2a339320f49 SHA512 88914546c10e14749b6811a31ff664cd464ab424d2140f1218b03128fb8a7e4fcfb33feaa29cac534ea3902f1d4e0565c7578b61989bb6b8f8edbefa2d992355
 DIST awscli-1.16.81.tar.gz 1171490 BLAKE2B 343e5ba75f8cb3b058e15346627b0d9c5d6e294147843be0608ccd2a92e643d05c5b6995771608af602e565a860d4088e1f7988c567343396054cec813ed660c SHA512 44176ae796972571d07923ba13ac5a245af7b0c74488bd03a6fb5077f204f175f7ddfa9c4d592eb93d3dce14d9406b04c92ec2d1d9ce58c3a092a0b998efd2c7
 DIST awscli-1.16.91.tar.gz 1172430 BLAKE2B 158f7420299c56f2e40883bbf1ad01cb7a747d04047b47aaf8c931c8aad02ad9b39cfe9fd69b86fcdbd76d02d652d68f33d707326307c600772fab97b93f7b60 SHA512 ad489cfc1225703b9bae26f31a94c7d9c143b8e355f4e1a2f1d7e3685b7ee9a6dbd0938db512cac83775292a1347fe72a9ae192717b1c73a21ac07bea4c9fede
+DIST awscli-1.16.95.tar.gz 1173389 BLAKE2B 0babe5cb23b36e39bb495cef57bc1cba0b0c4ab3a613b88e6c52a0f22f94099116ff1a70f9149333be16f7243f2c5498e98bc0c8076aa4e24201c11b8db7bcbf SHA512 37eabd6e7cbba5e3d635098e9c273ca143dd8f37dc7dedf6b85882f08fa01931ed2c56a7db191bae2c260e065c03fbcc7c473c5065b8e111616fb1341b4bc9a0
 EBUILD awscli-1.16.59.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.62.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.72.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.81.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
-EBUILD awscli-1.16.91.ebuild 1301 BLAKE2B 69b240b729c26b7493f36f39c793e22d09363c36d7ca18beecd46485fafdb47c9bc2b49a676c0d32787518c980404c9c033a60d329b3eeb3b14d85e22bb1702e SHA512 4f8532e8c0281923e7728b6d3d483235bea2361dce3b9079cd0aca9d39ef0f2f5543d46cfaf38d0b24e69e8d93258b9683568e379633a4f8ad6c2b56fe01bc82
+EBUILD awscli-1.16.91.ebuild 1301 BLAKE2B fc7de8cbf72fa20debfaf72650c4d7f901e188485a4b4ac02360ca2360bd70a55ecde9fe275f3d82c6de3e42636b1289fc7e51647a0b39d1e9d1b6795cceb7ce SHA512 93ef2d4225bd974d1a959ab55553931336e386f80be949adc3acc2f80433be92d95c2c85565cf1aacdc9c2d350f7378fc2bb8561b6ecbf36862e0e3c1728895a
+EBUILD awscli-1.16.95.ebuild 1304 BLAKE2B c5036ca3dd03a4077b8c091fef0abb357ed2d494ef4362b1acaf8b3ff5f40ede4713014a3f6e825b553ecf296fbe88af18d3982cc4ee95d509cd0b3b176d848f SHA512 ba3dc354c4aada5e7343c9322d313badcf4ed3344aafd22069e367542349ccc0e877780722c5ac2a6aeb77619fe8f304c81d6e970e4825a7db67389039278bc2
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.91.ebuild b/dev-python/awscli/awscli-1.16.91.ebuild
index dcda38a7f874..85100cd41578 100644
--- a/dev-python/awscli/awscli-1.16.91.ebuild
+++ b/dev-python/awscli/awscli-1.16.91.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/botocore-1.12[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.10[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
diff --git a/dev-python/awscli/awscli-1.16.95.ebuild b/dev-python/awscli/awscli-1.16.95.ebuild
new file mode 100644
index 000000000000..bf41cae512be
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.95.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index 130340b40b86..874dc5329001 100644
--- a/dev-python/backports-os/Manifest
+++ b/dev-python/backports-os/Manifest
@@ -1,3 +1,3 @@
 DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 972 BLAKE2B 7998d36861786c93ce30852f8fdd27ffbdfc325740a8b31fd24999915a3362c0c09c83dec1ab797ed6414b36d6fd95760154678b787f5feab7d6305792b97346 SHA512 6e64c69bdc405cc63412d5549bd3739827749910afcbcd84e9c49d58dc66508c9353fbe75364e5388d3962ef834f1954301880ff2d671ad830fac8a98e5d1bef
+EBUILD backports-os-0.1.1.ebuild 971 BLAKE2B d39d9808f99149483247e850cb34996e7a848c68f763f066b0b9971cffb1ce3cf88dccdcff8da3afe6169dee348449e379ff85d4b8d5afc4c83ff4f4a7277cad SHA512 99ff4c3683b0db3d50bd1065e25088614e7a3277e3593cea1244db2c766950b255dbfeee436980c497f1e0c44224c9e94492940e563b1d7df875ac494fa749bd
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index 3b30347de811..ae4c9631a0f6 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.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,7 +12,7 @@ SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 6c29fa1ae7b5..781de4ccb391 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -4,10 +4,12 @@ DIST bandit-1.1.0.tar.gz 135333 BLAKE2B 828356ddff316879c0d7a308b0e1545a20ddeb83
 DIST bandit-1.2.0.tar.gz 138040 BLAKE2B d2eb2d36fa80f7e2873454ceb043ae2aad5a7df09f250f0f5d5b13852ce38e848e5ea34f93df647ccec125c847b2184cfbb3dc72f20228d808364f1c09312fac SHA512 f2119bb7b920ca7b4254fed433ee0e41bbbde51a45cd88283fac1a9ac8f60ce621fffecca676bdb8db7ea5cb925851e50176014405425c30b5991e17f57f294a
 DIST bandit-1.3.0.tar.gz 139075 BLAKE2B 870481b4ef9932ce9bae2e6563cd7007d5f2afe3abf2b4e03b3da5f8c719c6792f1dc0a9f9c252b922324ef8369d4265f0b81426a6db67ce52595dedcb5f1042 SHA512 24341cc837fa6a8bb095c7fdc684a81b3c06834b408c6328c6b3425d5cc5c63dcb119cadf54c8cea302a108923638839626f1f8c6d401ce66cd112a776a8363f
 DIST bandit-1.4.0.tar.gz 138019 BLAKE2B 1a7aee62aa44fca533d02bdb6e5d44fe136038b9ee8ab462d6af6af84a4111ae341bd791b142d5e090e90f639cd5968419b2a9fa3b51e664dda971af13d52959 SHA512 e5ae412e3b13c89f8c4a85d318b0504c2d5b9aa4ca81652266a13d96f859705c2d0112dc534373cd7fd1020790369e3fe6b55da57773fa7821e663c37fe98817
+DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
 EBUILD bandit-0.13.2-r1.ebuild 1559 BLAKE2B fe97443d55402d453ca58e5f2e166e72c3651a771b0cea0378396fa483b15594695bbc111779c31de0a33245f953d62f4286025151caa6fff07f1ab8e7104de4 SHA512 bfba294b2669ca2f5681a2f74100139ea0ae1536332324c77d4deb05aada511f6a7569961ffeae2951ded0d2f9163b2dc1e0e5de27b1d54491fcf4a1d68693eb
 EBUILD bandit-1.0.1.ebuild 1536 BLAKE2B 6486444ad876937d2fccab5947939c2b21db0591d14a9e6c683ea95a90f12c03ed16f5d8dafa0880eea6245488a4a87198c230a41b326d2e9d29416b7b7fc9b1 SHA512 e17ba0bba48d0cc3a50173d921d6ca3f8cf87e5d9fe9c30f626f8fa27f7a4a8c42454399791b9a9239a3bb1a5857c7cf8ec932aac1f8a98a013ce8c870485973
 EBUILD bandit-1.1.0.ebuild 1583 BLAKE2B e7e8fdf90154c4b473f5830872456e439fa019b0c846504729d01f245b51d7d85f205c0b70d6db717ac7b5e6d4da2b18db7df5c0b6b7598c29de689231b9d2b0 SHA512 db641a424ea1731abc76abcf6b57a2446b10b5bd1c5605f6dcae44ed8f015a3831a6e7286b56527243799ec5b037b27f3539449d97fa2d2335dd0a3b77bd166b
 EBUILD bandit-1.2.0.ebuild 1489 BLAKE2B 03c9ec24acc652ac3e4b5a828be0ce7b209c89d81e4d5f0849bcd070481d50a8942c8de74b08c72032e1df9966fa20ce65168ce468ba772cee96b1c3dcf7ab56 SHA512 a2c5de842d3cbda61c043750f404f906c6dbfc72d569bbec56ad689d9423cff6cc90e157e5deb6590481ecc26bbb8ea20034a685fd54355f64d0cd3c910ac4c3
 EBUILD bandit-1.3.0.ebuild 1535 BLAKE2B dacf827363aaeee34048e2762575bbb1e110191aa172d14daea5a0e13f57b957bca4da5274a73de77ba57ba244b1de9f44d30585705edf745a72ccb5d5c4e336 SHA512 989ad9434bd25a0b885afe08a4df0cbb9ba9ef4b54b14d4ce19709866f1a1cda7451295a02fb9b5214eea4d9f0656b07b1394307b7487a0827623a0f8774eeb3
-EBUILD bandit-1.4.0.ebuild 1545 BLAKE2B bb5a031af8813fc4f4af629eb700e15849bf6e789d56eb3d3e5dd7f2dd6ef114a82ab74206a53c3c4cb3da6841f93cbf46c1bbed26e917862a5e65287234543a SHA512 971880b0951b4cd7445da8f79a629a16faaf0edaf103b230b0c02fc3b31c8b869c7d09c32734735863420928743e91aefc7cbcba277b49aa2cd408eebc349755
+EBUILD bandit-1.4.0.ebuild 1542 BLAKE2B 4d5ca4fce5b36ba23b211b80fbeacc816f82d298dcc4c4ac69327917ff08a7b7091cbdb90c2f950bd4c2632d67f76e9a354ce8f0a18f06dd059130c9fc13e8f4 SHA512 42461ca72c2fdc1e762fe4a8067a843c7041c5ccae5752515e7a0c27b4339b3dd72b1f93b8e2f6df5b0a1ec406b93fccb3eb68efa71f35eb9556b06a64844b44
+EBUILD bandit-1.5.1.ebuild 1294 BLAKE2B 39a4233c90c48528f92e242aa152992ba02b8c26af2dd01912197508660aac564be7bef2fe630129cf2402f8820f64f2457b0acebb28282d4e1da068f2355b7c SHA512 b59ece69506909f79ad312f8b1f110c87e3b0e55db3adcc556727f410e05c6f2fca0b205cdb7a1ed4c43f529cb45de13ed7b77d28a539c4dac7d43939caf0016
 MISC metadata.xml 437 BLAKE2B e9d2b3bbc3f4795ca95af1113008d33a635efed8ab7b6da63fc1b73f426b37b7fda1dfba1f0737e8dc116447b873515d37c628d00876f480fc654a78eef9c2ef SHA512 3e34e842afdbdf7c90b6a9ed8f11d4b4955c03f7f3b3a9cde02b2fa33bcba39a00556e62c5c29b721e3d25d33de8396b5dd9737037f9000b1fc3e707ab9fd9bd
diff --git a/dev-python/bandit/bandit-1.4.0.ebuild b/dev-python/bandit/bandit-1.4.0.ebuild
index a15457cb08fd..ba56e57b2e9d 100644
--- a/dev-python/bandit/bandit-1.4.0.ebuild
+++ b/dev-python/bandit/bandit-1.4.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
diff --git a/dev-python/bandit/bandit-1.5.1.ebuild b/dev-python/bandit/bandit-1.5.1.ebuild
new file mode 100644
index 000000000000..2057f9a8a933
--- /dev/null
+++ b/dev-python/bandit/bandit-1.5.1.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~s390 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	stestr init
+	stestr run || die
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 48713966f9c2..eda6d645ad09 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -2,6 +2,6 @@ DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b
 DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
 DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
 EBUILD bleach-2.1.3.ebuild 796 BLAKE2B 84f777274e563e86919a67248c9492362cd1697f7df61b355f96746694ff57e06365064616805d048485c525b82ff0413c4cc1dfec996df97b07088baa54a9a6 SHA512 a8a5ea0f4d6f8e5c241ab38cb3aa00fefe0121f7fd20b9294b81712361baf80b700b633c5b3a9e79aebb9b42a52e1a6679b673eb2b89066db66f3366374845ed
-EBUILD bleach-3.0.2.ebuild 769 BLAKE2B 1b251882ee892f015398736f02e3cf80d3b518fcd039b0a1b56226499672eaa08ded40da3b426edd81f6b024f06e2fa28670d2d88df6e58f373fbe70a73f9f38 SHA512 a991ee186e37165d91e76dc54ee2a7d9d2e1ec1f68e07042350a8c8359e0881a3d7badb51f54512876bda239d7a189095eb5b8325dd70ee6cf9f58a64dbeccd5
+EBUILD bleach-3.0.2.ebuild 768 BLAKE2B e79c97427df61c263d0dcad15828a8da3700a806dfe0d83aa989217a9b7fedec22360f90d02a3afe227985d2ab90907291bbdbca4681adcec554abc6bdd36c82 SHA512 5ede96c2acc8ceb3e364b0e39aca31dbd6608f7b1c00de352a3c0a1c70976f949558b8a1766b1e0fa77219c336fcbccf9b4eda9f1df7b2e74bc6a37200525eb2
 EBUILD bleach-3.1.0.ebuild 776 BLAKE2B 1e9c547c067ca046d657cb77dc247812cf57abac1818bdd56b16f724a31a7648319e3d44ebd7b7c0aa65211f04a36e0180a0536b23fd70c70d8372014fc616ed SHA512 6f60c04ffb344b2ada594a7721c1812e9bb83b1b3209f8880c65848f988e24e84f7808d1b4e902e2108572c0435d852db1ea4f036d0a3bd1ef1bc726ec79c4a6
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 85cf2d90f2a0..e1f67cf30c23 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 54ce4f5dcb09..a9536a9e4e18 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,7 @@
 DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
 DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
+DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
 EBUILD cachetools-2.1.0.ebuild 609 BLAKE2B b33430c1f7562dbef7dcf04fd96b2ef44ad29a0429c5e6b7d3c7225d3c48c464deb0da00806cba7756faa4aaac76de0b9c07adf6f97d8cd8851136ff1ddbee6f SHA512 16c1431358f652a92fe2954bfc69871a5fb5945b4ce58b3f6776be7b622006732bb1cba119e2cb97681f1aff8ea5f99b9ac8a5c2d4773f6413065bc6319a9d47
 EBUILD cachetools-3.0.0.ebuild 606 BLAKE2B 264140e446bcce64ee64573d0cef8992ccb99db98ccda31be12ee34176d36d47dc3e3102bd01cadcfb3fa4f86b3e9bccbf3f322e17bb43a7c45e3178494b97a0 SHA512 0cf35e2780c2430cdaecf91f24f03f9aacfef994061d8d34e469d8b73ce6937aabc8d48fa86808ae511cef5824ad29052840d6b3ce848076ea385ffb46fe74e0
+EBUILD cachetools-3.1.0.ebuild 610 BLAKE2B a48e57a3b45be58620d5018229251aba1f32dd92acf9cc6ca9addb04501ccf5077135caf67c932b5f13944de0b394c32de392b77306c257e869c1a27fbebe321 SHA512 ce93a5ea946c0496480425243f25ea2f78abf4e28953685dcfdd954ebd1fead6c7e7509400e7b54662d35023cca225a7fdae7d79100dbcd0e662a8ba17c138b0
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-3.1.0.ebuild b/dev-python/cachetools/cachetools-3.1.0.ebuild
new file mode 100644
index 000000000000..1c9f5b206796
--- /dev/null
+++ b/dev-python/cachetools/cachetools-3.1.0.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_{4,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/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 9ad6898f9ad2..a118c1830e46 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -2,6 +2,6 @@ AUX cairocffi-0.8.0-tests.patch 751 BLAKE2B fa20431b8884762f5ebe25a59731743b8c2d
 AUX mapping.patch 426 BLAKE2B 9c432bd2278bfc1ea996f99f6abb07635223350bb6f1fd305d28adcb9477b0efe880f83f76c3b12cb6e0a4dd14f5e05dc69672a41da33ae89f5836c2fc360e27 SHA512 ba09a19ff80b14275db9bcec51a372779adb6b2d969a9c07c11d9ba23de094460f2a84a837add9cb1f77084e0cfb791437fcf6c9bb67ea3958d2a006969b6d2c
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
-EBUILD cairocffi-0.8.0.ebuild 1270 BLAKE2B 5dc63dc5cbf1058ae8556004325a009483e9604194f77be0416e3299dc08b6cc0713b47a23398509fb865c917c3d5cc624406baa125d81b1bc989910b29bd2f9 SHA512 a25d469817a6bec7bafcc1736da49c11d0a226780a7f1630151fc180d539afc70c0d7b0e532628861dd5a874a7c6a90a9104baf7dc82352a73b558bd58dfec9b
-EBUILD cairocffi-0.9.0.ebuild 1238 BLAKE2B ce2828c89a2b9433d4cb83c7fc6a4df6922581b60b5ed702ac885ba861eb9df2e2e06c93b070d152176e899b5997c24a53a1e3a2c61afc5f3b97244e71711376 SHA512 22de34736fec679b1f327af6fa35db32a35516fe3f352701d128e85f1d8f9a42685e28586c93f4da06736306ebb8a919e94299b199da46501f3a8c88f5af9a3e
+EBUILD cairocffi-0.8.0.ebuild 1269 BLAKE2B a772082b416ca70f3a45d9a82e512ab304068f9a2d479eda06c73ae395c3485c72ee557b0c241488f946ebf7838d0f62b32f7f502e8b286293e60af2cc120db8 SHA512 315cb28e0869b45d8c828424738624ddf16febbdd5aba4b582396a39c49259d1fc1a77f22f5d2d6047d03725b2f1661958978ea1d31d15ea7cf56805d5d73f37
+EBUILD cairocffi-0.9.0.ebuild 1240 BLAKE2B e30dc5e0e19c79c96a6714dd803bf4bd5d793a8947f610e886e4a6b218b93cc388a50e2394613ee798fb90207d5b08b7aeb902e31627cbeb8f7e1f51b9563582 SHA512 b9397ac911823afa6f31bf4fa0fb2316c9b5c917a839c6a6850cf47ef996b398b5ae135241ca4bff6914ba484731e275fc32c239182a70a01e53e8c23f2167f1
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.8.0.ebuild b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
index e5fe6c9ee2a7..60c44fead3fa 100644
--- a/dev-python/cairocffi/cairocffi-0.8.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.8.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="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/cairocffi/cairocffi-0.9.0.ebuild b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
index 7291340fb126..75d2f934e061 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0.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="7"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index f4a4a2915931..e7ec8885b66e 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -1,9 +1,3 @@
-DIST cliapp-1.20150305.tar.gz 55133 BLAKE2B 8a9a8cee8565e6ea6365bc19a2fab35bf7434c52fdc259d534006faebc7d67d54e0bde5d1f44f7146b0e0a87c9aa05d8ce97517c3732d77825e6e94a12b16da8 SHA512 a32e987bfc6e401672dc1e94fb29034b96fec5bba5864e1001d52460ecdd6cb903ad1bbbe52cfb6d8d880abd029c98f26c3edca8ed79ec10f77e86bfff595aa3
-DIST cliapp-1.20160724.tar.gz 59871 BLAKE2B e978c6e477905f17b68df47aaa0ef33b1370170250b0de18114aebe56f0f71ea550066b4429db035fbdf935f58d36905aecc83b50fc4119187d91e678cde4fd7 SHA512 9c38a063b2a77143fce47dd462be00d254600efcc7c8eac3488243f79257e1a465ebc6800a16658f5c894db17ca456f38b3a538be03d7fa72ead93f3ead83e93
 DIST cliapp-1.20170823.tar.gz 54601 BLAKE2B b2a414aa77de872045983a9776e2afd55fa18a5997306f1e532b4b2bb413eedd6a868fe52f91565829be09f42808f745bfefd94ab307a61eb39f64805c3d7cdd SHA512 f66e35faf2cf64d56bfac546cde7e4818d54e4eded9841c788eb7800ea87211594cd9921d6e5f7d2c2b69b031823ab85aba92b09ea204f3b89f060b353a2d311
-DIST python-cliapp_1.20140315.orig.tar.gz 51107 BLAKE2B 3ff4b1203041fbc5ff0ad67a7a9d89c9f7f224cea097b8b81e099992c03727b1b94d41edbd558e9ef391f27b36d9d69a545391aa4eedd5c416f73a7f908643d7 SHA512 ce538baec212d5d5149b0aa0ab542919e465fee6700104079842022bc47ef42e65d42179689e998d524feb6b7981e3e396f30266a4a8aa7373ebf1ae8013c2d9
-EBUILD cliapp-1.20140315.ebuild 619 BLAKE2B bb2d6ab798d93d38d31be45d4ba0d5e986a4ed2ba0fe9fed8ebab3fdc3c924347c1603ed5f0b1dc1bfd23482b16887f1d338eb62d6b2b48050dc42be67feafc8 SHA512 1c1d1e3b682ae148e5111004fddc77dbf8ee710165409e484a7cad2e9d086334a7d17d601c68d294c3c2ba28b6adda6a3df8b1ee26b46287dfde7102be2a2a76
-EBUILD cliapp-1.20150305.ebuild 605 BLAKE2B 823c4863996f55a48074590d0c2d910d9255fba57bdc325480d720a0f4e79fa4eb641daa4bcbf6a7ef507aec6fbd1459cfb7ba4d9e672d58ce6d3a625aecb152 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3
-EBUILD cliapp-1.20160724-r1.ebuild 732 BLAKE2B 1e5428927cb789cf7bc6b71c89a6e737beb4243d7179ed5f30a945969df818f7eae2e7ae806c4235fde69b1d1ad5732f4f21d8d1565806cb800ba25ad2376427 SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d
 EBUILD cliapp-1.20170823.ebuild 677 BLAKE2B 7df51b212cab73bec4ed27f0b45d2a4b299c131b82699f37db3179ddc5fb6629558df4accbeb1555e635172ece424818d72372dd952c2cc9f9819bd20589d41b SHA512 055f0484ad2e7ba1161fdf9aca3d226ef2e82eadab6bde1cf41e3c6b4fa1de19ced902112afcf708b582967bc782f22598a7a52af2a4aa6fabf051203e8d3e86
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/cliapp/cliapp-1.20140315.ebuild b/dev-python/cliapp/cliapp-1.20140315.ebuild
deleted file mode 100644
index 365f5f2bc4f5..000000000000
--- a/dev-python/cliapp/cliapp-1.20140315.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Framework for Unix-like command line programs"
-HOMEPAGE="http://liw.fi/cliapp/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="${PYTHON_DEPS}
-	test? ( dev-python/CoverageTestRunner )"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/cliapp/cliapp-1.20150305.ebuild b/dev-python/cliapp/cliapp-1.20150305.ebuild
deleted file mode 100644
index 508b93d7d42f..000000000000
--- a/dev-python/cliapp/cliapp-1.20150305.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Framework for Unix-like command line programs"
-HOMEPAGE="http://liw.fi/cliapp/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="${PYTHON_DEPS}
-	test? ( dev-python/CoverageTestRunner )"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/cliapp/cliapp-1.20160724-r1.ebuild b/dev-python/cliapp/cliapp-1.20160724-r1.ebuild
deleted file mode 100644
index c3daf94d0458..000000000000
--- a/dev-python/cliapp/cliapp-1.20160724-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Framework for Unix-like command line programs"
-HOMEPAGE="http://liw.fi/cliapp/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-MY_DEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	"
-
-DEPEND="${PYTHON_DEPS}
-	${MY_DEPEND}
-	test? ( >=dev-python/CoverageTestRunner-1.11 dev-python/pep8 )
-	"
-
-RDEPEND="
-	${MY_DEPEND}
-	"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index cfca0c545dc5..0fd9662faeed 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,6 +1,6 @@
 DIST cliff-2.11.1.tar.gz 76570 BLAKE2B dc0b4a702c6807077f830941516e8c5f2dc6b732e7a7788eb2c2e5fc5c3fa8d893e7156d6ad76904deb2d1cf31d1ef50d08b73b750422b84bb053a09e4930bb2 SHA512 ba494cc26e103c6043de49a59b3e9c0c9bb1658416095f02c6bccd3536f24615239a66941fb971c289926c88e85eeb29eb10065379e4f21645828f6aa4a2755e
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
 EBUILD cliff-2.11.1.ebuild 1750 BLAKE2B 06016d806e98b30952753b14b0ad02dde34157031ce10e113f2c9e796cfd96640c8652d450d92d7be068c568ee1d1557622dd40a0ef9a52e02b2d7ea19bae3c6 SHA512 8ee15b50b9a0e0e12a43a23493fe2289646968c94f3555cf963cfd8530afdc4b652ecff69756ee49332d06901e3f252ae414bd2b3723e407e54381f020f4fa60
-EBUILD cliff-2.12.0-r2.ebuild 2021 BLAKE2B 462e0520d50a8bf215bf03b69dc40b03af1ccc176b210890ca407cf53383259d56e7ac482ee9a2b1672f55b01f6a50e26e37a2126cfcec2d4df305427fa138ef SHA512 2bad50701855eaf7d1047ce7bc56ccf39d0c27efad7e1c300aa2ade27b9952b5aff32b278167e06a43b2b347e19f70875732f0b2e00e16c07441b07d0867e9c0
-EBUILD cliff-2.12.0.ebuild 1765 BLAKE2B 5e7d838a1a592a563a0dcb2b42265c09daf56ed1c89cf8579b5771bb612825f005d1a20c14a9d14b0cb40cddfcbce71fdcd7d3eacf1b0c26a8299df75077e297 SHA512 f992e4d4cc6332f6edfb7e640987c72eb17c8ac592928f5feb71cf3db46fa3b17bfb28aead76f5d476b99dc8868321d30a6a1d42deddb04f10d035b9ad1c5ec1
+EBUILD cliff-2.12.0-r2.ebuild 2022 BLAKE2B 4195768dae523d3909cf6c53dd50d40aa64ca7d48548a4849fd6d20c047436d42cba561248a28bc94b757a3eaabe94626a26470ac9652b07c94dc6e662b9a455 SHA512 be5695fae940efaf84b51c265a43f8575447546f6fa782c655ba6c9d2e640d9ffa5d97a9a6d035594dcb1f43334d2eed03cd751752c28a3da8a06ff161aa10c1
+EBUILD cliff-2.12.0.ebuild 1766 BLAKE2B 427d9e3ad46554c2b8d9cdbe4af1a8a78db4deaddf9396b5832f68792028f4ec1b61c0c262e4c106c1ddb315767a584227aac4b45ddd2a57226f6d19b4072f62 SHA512 92170c2d0a85a181d695ee9400d1562d84980992090a1e1e3957f15c7eb9ece62d1fb136b904f3487e6ba2fa5017c155fe5f2a17d91ca25fe2b61dd538645255
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
index 88264447c36a..3bfae9d94018 100644
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ b/dev-python/cliff/cliff-2.12.0-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=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 VIRTUALX_REQUIRED="test"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/cliff/cliff-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
index 982051ba5b1a..ee298f09d816 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d1c80f3368a3..c19444574c5e 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,5 @@
 DIST cmd2-0.7.5.tar.gz 64939 BLAKE2B 57c8d3f4c7c94e8e2627fb5d2cf8c164da72c531808a53118f950ee79fcc2e0f431621ffbd74d275bf508c8646ded761d2d38c2b99570fdadbbaddf095e422a1 SHA512 14376ee283ac1c153ab0194a5dfa168eca36174783322ff72e190ed96b8c315518fef4f3ef09d77633851cb53b32f71fe380042ee3c0ef8ef2cbdfa16dabf704
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 EBUILD cmd2-0.7.5.ebuild 903 BLAKE2B a70910a059ed60cc5020f02cb72edd76125ec36294086ebb54d7f228ebfe1dc68b6c0497a2a398511243bf238aa58bd75a56f74617480a244845a31fad88b0fb SHA512 e99f600e4ac11649242aa8155245e109cfee733915b59edc48f76c2eb48cbc0c6649b21781760ef5f6d006418e5e1dc6c4069d6943613881533d25a63dcdbe39
-EBUILD cmd2-0.7.9.ebuild 902 BLAKE2B 34d9e0d71829df809cfd149f0b62988d80f7fa7177422c748b4940b492dc898737be3b7a4a82bd88e748595cb163bc76702961f7e3bc447193796d410ee833bf SHA512 c838fd329d738a8ebf439ee6d215d4e789f12ecc01aaa1e2740a13369d3ada79abba616021e65bea85d658339bcdac9a158cbd283a5c0978defd20dc22fbfbac
+EBUILD cmd2-0.7.9.ebuild 903 BLAKE2B 5995d46308050a1f2d2373a80f4014fc90f7606724f8c3e12beaf680a031ac20d7f682d82ab05d980bd7bc20975398b57f3c92f5d75e71f2c651f816e7805e1d SHA512 489d95fdee37dd1bf0b15f97f9abc4dea8dd8697bf495dcc09f9b6818af7e6c445ff33a3ff287f9d69f3600858b91985bc72986d28aa30853b9c58849cb5ee33
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.7.9.ebuild b/dev-python/cmd2/cmd2-0.7.9.ebuild
index 1ea36c4bce31..ffc5df4bcea6 100644
--- a/dev-python/cmd2/cmd2-0.7.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.7.9.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index c7da9278f6b1..91be0328671b 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,3 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
-EBUILD colorspacious-1.1.0.ebuild 673 BLAKE2B 7a6e8b7288fc0cc9fcb9ee09f89ec6df10a5d8c5befd847b6dc4b5e52383034166d7d9dad08923d66e19ca3e5e72973a054d43b444accb73c962a748565fb591 SHA512 a4e6a4dc321b87e3be0956c53177c7874d82c0b50bcbdc9b50ed1aa45fa7d89a325d200965c2fc8375357aaf5f485b75202095a9862946a62dd8b7cc3a21f279
+EBUILD colorspacious-1.1.0.ebuild 672 BLAKE2B 428abed74ca267f37137a217188b65e7e62635de470982d6de65947fe504832543a57be8df653529afa325acfd9486b1925d5b58feea79787844a00095c9e78f SHA512 78192a89210931001a3645ca24e740bc5d5b50851ba52627e422f4c96f0d713d428a0ac09434b9a83218468b7278e021f60ce5cf88050038917134dbcfbfc0bb
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
index ed280b7f8aa5..1f0322163fb0 100644
--- a/dev-python/colorspacious/colorspacious-1.1.0.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index abd2e644e46e..ce1715f25b3f 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 EBUILD contextlib2-0.5.4.ebuild 612 BLAKE2B a8fb7ad569e4793d01c265615025ed788241e35144a206693641840477ab5486eeea51ab613ca2cd1d52567396565104e7cd6398b7375a4b99bbe6379b120951 SHA512 a62109193b08b5200a432bf5c75b33fadd0d357226c4d99edd9426b25599a0b74424618160220145b7255453951acdc3b57b7ad5d694d8c662fcdeefe72fbc99
-EBUILD contextlib2-0.5.5.ebuild 673 BLAKE2B fc6ae0c3141bc5dc7b82713ae7348a5952d28e4789aadcf0b4333bc82df1afab413aae4b6a2bbf5f2f66ceffe56733834afcca37b435f8ad85938b1c4447530f SHA512 6bd69087714deea8a35ef1dbe3c89823337b149294412fedbda45ed3448eadb3f99a8fc7b128d8fbded8db19cd7d6117bc6a63aa933921eecb80f52af8f41f1c
+EBUILD contextlib2-0.5.5.ebuild 675 BLAKE2B 2f001d46218aab4ace2588127c1c29d8dc63ba608acb02f10d25fe5a162f57fb19f6c0429c60e1b8906d494b27acb566c2df48f413ec695da80f1c4e9ab10e25 SHA512 e923eba1484892a0598efeae6291d9b15dd2340d0071d32a2c8841270326901416a17b25715345a654a70c773541179ea250c191841e2ad24fc35e373906035a
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 97a9d05fdf58..2c8ca48d9756 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 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 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index bc39717538ec..7ddbe26c5fc1 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.10.0.tar.gz 16553 BLAKE2B b2f3263e18fab74eed8c92a888f1a5cd47a2c24499fad3d9b9737b2fd01c3b085d6008d65e7cc075d9336321193e779e9c1c7b4daf9bb33be219f54267cd40dc SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819
-EBUILD cycler-0.10.0.ebuild 828 BLAKE2B 8dd872864b57a7ac148b12e036ae117bec390805b9312565dd1beb6d78fa89ca74fd0bf6266db53ea4cff19a3ec01d53eda1da42aeaa874ebb664b736feb8628 SHA512 925f7e1c687e499f16d28d6193847ebffeb9dd85d5c46ce0d5407cbf9482e74353a91d85eddf642d99763564aa4bd061b04991ba315d8102e0d4168ffd2edad4
+EBUILD cycler-0.10.0.ebuild 827 BLAKE2B b72afe301f1806830744aef20fe3dc697a6d2ccfd6c2a8fae148cce395fcf60bf1d75f4a595bf773427c680ed5ec879a4348ffd34a21bfa229809eeee0a9448d SHA512 d624e4d338b972f514937b208273e7feb4e0ab3891ca1fdf26cd2da4d620a971bf6a68bdfd35200491c75f5e178fe43a21ba526bf289ca79598ec1faa00a4cc6
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0.ebuild b/dev-python/cycler/cycler-0.10.0.ebuild
index 9841cf8ecde3..3f6e8557d607 100644
--- a/dev-python/cycler/cycler-0.10.0.ebuild
+++ b/dev-python/cycler/cycler-0.10.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index bf829c217e7e..507292055b2a 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -6,5 +6,5 @@ EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
 EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
-EBUILD dbus-python-1.2.8.ebuild 1683 BLAKE2B 056f770bf60f6be49b27d430772f6b7bf683a0616b364bc12fa08b9333f9eb2100b310f246870772be663ae9a38aacde8f6f82c3f4df176ac2a38b3585a72c09 SHA512 3fd5217e93bdffd0db070502c5b0045350f71be5f51b5de09a96221829615ee7a64b21663c97ce7a29ff0265a554868b72dc0d36c54cdef25d65c2c3427258f1
+EBUILD dbus-python-1.2.8.ebuild 1689 BLAKE2B ef7767b2714978cd3a10da656dc2beda245473f87e34a49ada79d636855b6c2709e7b9b65f73296b4c33f71c8a39ea7f67b50d48190392ba0b1f8899008cc822 SHA512 a0b9a0fcdb79d9b7c3f1d6a4c0901e8339113f6eb2e7d27dfdbe800020dff9f0fd6f80efcaff3c9391e4b15a64488b253e6b5cf96fbb1c5e4a0e38101df78a8f
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
index ecfc97896786..4a5ad18c82ed 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 3878160ba6f1..c05bae2faea5 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.1.1.tar.gz 10021 BLAKE2B b2024bb214bbc13b585ebfedecec32e3e53072a9c82ac2355625ba0e8a77159cc8e3c3d86788b5da4319f9ba6afddd61086b1b305ae7e2b9bd71edde139b7185 SHA512 3839ac0448292bde07d676456640cd9466353e8c4481e60cb51e33704c21f92fdf840901430aa7f5276ccf579a7cd70b277fa2ceae03bce183e2422d514897a9
-EBUILD ddt-1.1.1.ebuild 627 BLAKE2B 6f093302435e142ce44c892e0b7c96d2133acae6517a5001c97812dadf97ae13efee6c08eb55b022abf2cb57889da054dba197d1df5d4f5172c0d53559a18d45 SHA512 ace296f823ccd960199a9731513a9c3c2497973e7348655e3f03b88f608c6910b01d0b5902ffaca6231430b223544b795ec35bf3965968fcf847d202dbc229ac
+EBUILD ddt-1.1.1.ebuild 626 BLAKE2B 1c13a541bfe990d32cf7f4f0bf68def1a1a52a65c8004f9372ea49ce272e6cc7058284128a3820ffdb29264f6f5ab10a2ea0b0451126e5ac16bc5a032ce3f1c5 SHA512 4d6ddc9e052bd6e9dad68daa2697f027395e8c21de90d64550d788c5c65afd2029ae618874b932471fb4c52107bfaebd1f26f0b8b8e5c6ddf9836cc2b2771d1c
 MISC metadata.xml 731 BLAKE2B a3bfcf8b61d030a5b8637c1c913e999ac5ac960333bc56bc7fd20edafa538a0b679f818677a5a32b3a6c06e8cf5d42e120b89b76c4c4dd7db47e989cbc252a2a SHA512 71dcc2ff9b9b0f152a361e56cff5151c43d16a7517c26982e0af5133fd2ed953f38976ec75fdfa7e2b138e8d8d3d983777392438f2495a188ed9a5fda9ed4538
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
index e72f2e687f99..6f32ce596f27 100644
--- a/dev-python/ddt/ddt-1.1.1.ebuild
+++ b/dev-python/ddt/ddt-1.1.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
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 15715ea44ad8..6ad4096c5923 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -2,6 +2,6 @@ DIST debtcollector-1.11.0.tar.gz 26266 BLAKE2B e94c8754d730417638542229c0c47d798
 DIST debtcollector-1.17.1.tar.gz 28805 BLAKE2B 25d965359ba815e182cddb2a8c82d7360e43ec549185380e759cb993dc44dae88bf1e6e21a67b6929862389f80450dc2f07eff7b2f7a5af58f1d8b64a2716255 SHA512 751ac56695369a36c4baa7fd60b3c0d2c027fb23f7b71cf4103acb70362af4455ebe50b73ca0ba4f946b318c38e67f3477ae937afd697d505a6f2455f932faa3
 DIST debtcollector-1.19.0.tar.gz 26176 BLAKE2B be471b8ccb8cc3df3ade1af544f6326073f65cb1a6c64a8a864ee437692508fe21d7a117f47ab9f0c8cfb74502a7cf1c68e5e9dc26d8da3cd2ac0519c93be93b SHA512 f2bd1eeb9f402853e57ef6bd31d9961acc45617c50be36192b8761454869b3b9fc7709dbd14c36be469e6dbf3532f5d75a9fb863c7ea95c276f82d06f69a2164
 EBUILD debtcollector-1.11.0.ebuild 1857 BLAKE2B 916843c31e6d04dc4b31091c69ee616339d92512e435deacff02045d96cb49fea70570cc738ab550a2f546d1992e2afa83a8b6994ea55935be87bf77e709aa8a SHA512 f0edbe840bb71b2f26f8e599eac5a75b983832a350fdd851706a4a91337ebd293494582d965338fe83ab3d3201e828c9f1b70dfc1e52e8136093177236834cb2
-EBUILD debtcollector-1.17.1.ebuild 1997 BLAKE2B 4535d4c860797170137e33836f3b4745b289ac1231a7d25c5fbd5f2c468a61badd25370c13624ef65ddfc8bc761001c35fab5b3b439d53c3b8baa550885bfdb9 SHA512 a26634bd66fb8f8d73579d15147cc95eb3fd6466ccdf1629454f52b451e65372917b0c86a04b6d6bef7be7d1c8d27c35a5b4c05d70edbcacf44562f0a3813e63
-EBUILD debtcollector-1.19.0.ebuild 1869 BLAKE2B 997049404631fb24a4757405ff9a23cf320a75236a3dd3025347a9cd29a54cc47617ea5ae837bc034ccb2c68ce5647bb69a3f3b7bf39d89a12b7b23861803d9a SHA512 b361e383a447d248d45d2e730e589bb830cf251f5376fffa329644cae64e3d04686e8298f3b00a7a3c8ddf0bb4b58b781e7524294a345e2f519bd6e3568f49bb
+EBUILD debtcollector-1.17.1.ebuild 1996 BLAKE2B bb8742d02f1902dcfad0152730cbf8112466b9e46004a6dca44d1a99e6cf1fee477767ae410821f3e48ba1c34cc8097301d3beb12f67f0a5f3f68900112d5f09 SHA512 2f7f52cc7610d11240f70016e28356aecb0f6924218f8b878c61684ba072449c7bd3aec69db5a2cbd695ce388c8cd8da32f22c9866ab623400d4d13222e49632
+EBUILD debtcollector-1.19.0.ebuild 1868 BLAKE2B 99254cbaf6d27d8b1f5e66b5083b9e357c8d5684ba6d7cbba5404d9c1bb24baa05b5e47300f8dee278b484716612443591eca3b6d5870ac42c28d7090e05b884 SHA512 2dc3c2620705d11ae9fd6f19d3687451bec7f821d223328fa37be54612ebfb7ece9f40c292bf84285a1d6362eef08eaf7f2888af8760404db0c2106676902d2c
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.17.1.ebuild b/dev-python/debtcollector/debtcollector-1.17.1.ebuild
index 8490a275bd66..fe557a18f361 100644
--- a/dev-python/debtcollector/debtcollector-1.17.1.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.17.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/debtcollector/debtcollector-1.19.0.ebuild b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
index 77677acbe94b..f94f4364eb20 100644
--- a/dev-python/debtcollector/debtcollector-1.19.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.19.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
index cb7bbb74c6eb..32d3c895f896 100644
--- a/dev-python/django-otp-yubikey/Manifest
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -1,5 +1,3 @@
-DIST django-otp-yubikey-0.3.3.tar.gz 14233 BLAKE2B a85eba8bf9c590d4747627baaaa6c038afea7d766203974508ee1ccb6bf807642720fae78a64584230f013daefd87475c5c9f94f1584ed4ddbdcfbdb31aee57d SHA512 80c9ffb42a7109a04eca4fabca33294b3a65abeb12f408cb6d7c6c06644896629df43d32833d514e0a60ddd6352af073fb5b2f1174a07b370214a76ccc093c3e
 DIST django-otp-yubikey-0.4.2.tar.gz 12670 BLAKE2B faf060cdc242378ba762ee6af4cfa124da60388ed23fbb33016e47dfe22542075573d9792924f72701aa09d1dde37a79f56674b26d83c2936223602f4ab1eea4 SHA512 bc6fca539e28b52086768c2874d333c7f42b69de4cbd99e57c3cbbb4d0aeae31335a54d6d7f03a9252c0524e75ca20263106d1aabe30a21f5b4046fb2fc2effd
-EBUILD django-otp-yubikey-0.3.3.ebuild 572 BLAKE2B 2f9dfe15e30dd4cc43e27bd4c265e018db2f140499b07bb5edd48c4e1475972da4b922bd6feb1adff3e423ffa1eb3f39f23b7e6e5885ea2eec249d34a03cfbc6 SHA512 4a8800b24cabba93de68ccd8416bb8aa77ef29db4bb2ae00a6e1402f23c8d2883a1fcbf176e094a044ba1016c9f03c57bb3b5aed8f08c93d00eff15e0e459d6f
 EBUILD django-otp-yubikey-0.4.2.ebuild 572 BLAKE2B a7ca9c9cfceb41699822d907334bc784adeb23ee9eec7f48e5acf9706567b95579c5d79e417d97d4cdf21131d6d5e8bfe10b6979033f58311649f38f5dff769e SHA512 41f435d81701d3cc43ca36ada647f14ad2b8d686fd1351a57dfc953bd5cdeb367444a56075f807f572a20447676ff943601b8ac846cf1651fba4b2e3df610fda
 MISC metadata.xml 316 BLAKE2B 07e00fa2de594708826250b71745951204e35e8ab7c74257eca61057a7bea5b2d9fb5f18724b0048da782f415751ceea4dbf4e79bcbb2135c77421a71a8937a8 SHA512 0a65b77aa7db9ea74f8643b05534fcaffaaedce5e7edbfc35c0f86e831c942b4464d9e4c225e3373d18b1b3a61e58976ffbd222843efcede3eacbb0d4177e597
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild
deleted file mode 100644
index ddf4f69cfa45..000000000000
--- a/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
-HOMEPAGE="https://bitbucket.org/psagers/django-otp"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/django-otp-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/yubiotp-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 5c7e34087bac..7f153c0cf883 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,5 +1,3 @@
-DIST django-otp-0.3.4.tar.gz 39992 BLAKE2B e85cee8d868038aa936a8a3bd7dfd326a28a7609f3a6273637e075fb971dba27060b39f18773628c6a963525a0aa83328d72de937957f430629b8ad6fa77e127 SHA512 62b6683050a9dbd0bcfc9a63bd965f19e5d088c3e53c5e45067f8a785aa7b2a7b540d0331742bf8b979ad95d308f944bfef250989d1f782849a71bbc79a7d53c
 DIST django-otp-0.4.3.tar.gz 42480 BLAKE2B 09398e4e06425fefdda45a3a200576efda9409a42fb8f1c640a996e066e1ad2cf47e6ee0879e4a61cdc64808fe8f030aba19dfd99fa4da7d3e86597bda881d09 SHA512 3f3ec761dc12ed40e8c757dfbe1fd951c7c6aed3abc311c823acdeca08d5864b54c8442a49807228be17b30c20093b1ba7fb8b2c0f86f00dc1cc215ccd7c28de
-EBUILD django-otp-0.3.4.ebuild 541 BLAKE2B cfd56608c112f605107630452694b00395e30fb4c5852e7c5ba99b449e6059fb2ebd979a5d6ecf045714773cef98f3dfb9ad4e9fbad127b4c0f6ee54b44e0868 SHA512 3f66855843e29cec6873333a0cd2c247e28edeab90bd776ecc3097710d60413cf90bf64b36e3839535825149d550b75f25d84e8cb7ff80c7f93ad9db3940245e
 EBUILD django-otp-0.4.3.ebuild 539 BLAKE2B dec8d59c9c7a0481465d857666fccac9e143159b88ece94225039fe5d52f4fb81a6db4843e76926788d8e383ae33832efb4e3b7796041b497f4ceca07f188f8f SHA512 ff41c34c765d3e884d6320266d3411e6224fcb8a02ea67ea35b7cf6a37dc1cf10e2339e67dde186e6bf822f075f6cb9148edaf2c2ba23045d62537b7939c8cc3
 MISC metadata.xml 308 BLAKE2B 4ab31e91721855334918e7c51072069b20202977309fe1e9509952351500a59b7daea3adafff99e44bb4ffdef76e900716e7718fefe3f4bb3f790a80955baf6c SHA512 06e2750aa7131626332ae0b473edb21ebba3ab26aeba63fde2dea4520c38a8e3d94e18e5f4aa5c759493059aa127858e1595975503f6a723611774d7fcd2550b
diff --git a/dev-python/django-otp/django-otp-0.3.4.ebuild b/dev-python/django-otp/django-otp-0.3.4.ebuild
deleted file mode 100644
index eb05d4af0f2d..000000000000
--- a/dev-python/django-otp/django-otp-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://bitbucket.org/psagers/django-otp"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/Manifest b/dev-python/django-phonenumber-field/Manifest
index b118eb51eb22..6c780ec2b0e4 100644
--- a/dev-python/django-phonenumber-field/Manifest
+++ b/dev-python/django-phonenumber-field/Manifest
@@ -1,5 +1,3 @@
-DIST django-phonenumber-field-0.7.2.tar.gz 6208 BLAKE2B d0c771a61a299551d075208f5d9bc8077910111bd54b2353fdffd8243f37ec492e57ebcee68341d368d5cd851da6b9af43655ac05da7e7da0e172958ac7608b3 SHA512 bdb48ac1fa22c959409ba37b28786fbb46220628bf88265dd3c13ab2c676816d0dd1ed9195ce614a8184937347c3c4760fbdd1f57e235758790881af9a44f504
 DIST django-phonenumber-field-1.3.0.tar.gz 14501 BLAKE2B f754f464376d684bf6d2cdaec8b16996cc4718947c5c4aab43e41d6dd66823d0ecfabc261bca918376ee92b33b1397786c88c82fede60261f073927a9a115470 SHA512 2a0065691f9874edef96e41c237d8a58b4ac5c3efe7a82c421dca269185962f518808083ce82e73a281c95675703b24820a7b5dae09a08474b6c2e3e7f529f1e
-EBUILD django-phonenumber-field-0.7.2.ebuild 611 BLAKE2B 0a6d8287b6be2e0d324361b6ceb534185d0a1ed9e16b1a176c4165c9585af843fc64c1e1c01393bf949cfc7e8cd5274ee43fd9e06487a7a9d8c8264dc173397b SHA512 daa21844659aee349f7df1c96cca599dbc56706df7e9b1d395b5e39a0aa15f1f6621c4690d28320f831a8fbc09ae25e98968a3da3e2be8dc291c8c70f39784b7
 EBUILD django-phonenumber-field-1.3.0.ebuild 617 BLAKE2B c42b0be8193b95bf895987b6e7ea2e04f3f36d38d3306e965ec043bbf6eba787ed7d488f91cedc7155114a61a4fdd77793f4ced34693075530acf559b5f03cd7 SHA512 34ed9398d82a256f51ff3cf7d40588113ec908a3f0696c86cfed901c7f00f81231676dae672334b6fda3f4b97ea30580ec52173e2e1f4a3c7f689272af31866b
 MISC metadata.xml 338 BLAKE2B 12b47e6adabcc7a1310337756accea533bc1bf550204ecfae9d84805f14d71a71f8b2aea391642566605551a143dff1c026403d6de26e9ac70d84c5c67067257 SHA512 026eaadd2eee602dc6194d1e19a18c1d93be78dfa9b3ed5a4bfef0d614d3655ed130e8ca08ff9a7fd77609ebcc17dbfaf42582b4627983a9b08a5ec572822811
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
deleted file mode 100644
index 011aa81e4d56..000000000000
--- a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Phone number normalisation in Django with python-phonenumbers"
-HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/Babel[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
-		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 53e85b980dab..1c2caa4fe2e5 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,3 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
-EBUILD doc8-0.6.0.ebuild 877 BLAKE2B ab450c74d1c6ba45574144c81e656a203db33f6a2f523f406d87c653f0446c8fbe60fffd334e64761b78d1a9c4a8796ec082ac1454e2bfc961f185ebfaaa6b48 SHA512 eb523b4a582a02093faa4cd18091c178de6d8733ae5b400f6cd72a995f6d1b8f8d4df79e673e3ca82242f734314d5a5eb6a507dcfca597f3ec7a045679d7a987
+EBUILD doc8-0.6.0.ebuild 876 BLAKE2B 069c43d44721a8380307aae07cdbc9fad134a5e81c856ed67a1794d80e0a02dc0af16db4cba713100c89fa0fc733d09b6b30c0560baa09b4630298076b8f1081 SHA512 43254ceee213497cf914663c806ec830035a11750a6c94e8b2a2073337883aaee1617a5f6b3404dece62ceff961dc275476e81990dd4da20a893f1d4465d2a7f
 MISC metadata.xml 321 BLAKE2B 91708fe1c777fab5db78b96478a40afe8e209db0a4eabe6e6f76bba6efa7c81add8a4e9c5b91cb126d491826b9e3fc325c3e0adcf5fe6c00360cbd60295220bb SHA512 ada3a7f942be7daceb700085466dfb812b457c8d1af21047cf359786e8d9d6f122b84481bfd5c05f3d07f02ced2e1b91b9edf079bc0c0655097e3884862ebfcb
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
index 654a966868e0..d036678e2e6f 100644
--- a/dev-python/doc8/doc8-0.6.0.ebuild
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
index 5679005bdfc2..6d753a0aba4f 100644
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@@ -1,11 +1,3 @@
-AUX enable-4.4.1-swig.patch 2367 BLAKE2B c4feb89c9cc79b94eba3d919a769df6349aafddbb2d45b6849945144126534fc163719eb4292351c3f43a0a2e888ba01f8b1ec8df9ae08817b0cf721b3625422 SHA512 a53e89d392346a6d3c1ea0fea102c37101fcc3cba2cbe25221202caed9b770caab84e91096a40c08ce5888fd927299e903eec403e2b60ea6df7887aad5569582
-AUX enable-4.5.1-doc.patch 917 BLAKE2B f1b152bdd70fcf90d11dcb1310d049fe3e740e46f2ab982ae658d9964bafe34329bc6e2e19b06baeed3c88c6ec624a781bda27032f7d0bfece14d024edc6617b SHA512 6025233ce500d324d75a23535ceb0dac50b7d5955fc76803c156d3813a157fe8ec4d855913a6aed9c966d594fed4c7c36d6af6a175155ee2190f9c56f7d3b177
-AUX enable-4.5.1-gcc-5.patch 741 BLAKE2B 328876690cc58996fa05a84fd2794ac3896825712e8fd62b67b7a39bfd3e5725a2cdda50ca2a669781c94d58e5e44760a322bd04660078b14ee3fc2685afe3d8 SHA512 40ac44b7cc219f99ffca594ac675b970f2a7100c381a284a58fa208441a8a66361f70d70a456b0bb98bb0c0d670a0555d2d6e1daa56ddeb23910ffaab68a33e3
-AUX enable-4.5.1-version.patch 1297 BLAKE2B 561ff91e65b55eb97ba9b163fca4536bdea6955f0badddb0d67faf7a9887b814ea90b3b15d536f1bda7e858b4b695bd4a8490126ae905c48d96fe7a1fda390d0 SHA512 b198640bc503ace1aed8ae8c67dc500647d2679e3e516ae62cd1800b8aade433e776db2be5d519b1ea8e0ed2f47e3285102e5a6e1ef89bdc46cf753bbd214150
-DIST enable-4.4.1.tar.gz 2507048 BLAKE2B e3414a0505acafece3242a40400aab9ea00062bb605baa500f604df875b1caacd446c30189a23bac856c6cb39067f120be6e89ac9c95a05e92dc882d839a7e4b SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff
-DIST enable-4.5.1.tar.gz 2571975 BLAKE2B dfd294f80e22fa89243057f405fe83ecadeb3768cae5a103e62219cfc62ecb5bd3acf1bd2d575da3276e8111c5c5330fa88e1ed06c6eb67a04974a57dd0cbd98 SHA512 1095a4490f4918756dd33864aaba2636c294c3b177d3f500d98a355ec86ef86ab211d33cdec95c2d37e7e1df41622acf2c8ecf524a1d93cc39797804c49e6971
 DIST enable-4.7.1.tar.gz 2728889 BLAKE2B 2952c1772ea902b2a040a5dbc1ade4fcb41f38da41cb9cfd3a574d16397fcceedb5d2216e19bd14ca9881ff27efa93ec0fe4b94db8f3baedf174fe062c825f1e SHA512 49ca414d1273fb5ddcb1732e621f91a5ac49ff02d63b5b36b8d9e28dd737eb4a312f35345fc29db555db1c6e0e8c9bf2204f8662b43a2761db6c2d656c6b2140
-EBUILD enable-4.4.1.ebuild 1666 BLAKE2B bec6b56b0ad122d2d2b9458292e518a427c97a0113dec8a2bdbd3fc09fb8f89f84ae15dbf2223337562170db0056f857934d1ff2abce5dd3f11a2d01e84d6fe5 SHA512 4701233e904bfc9adf144bbd6bd89dc2c86c66e382796ec3affa161254eb9f3862e1b4443bc2941dee8626e092ab014c3e6f21393dc19b63bf84cbe163fb876f
-EBUILD enable-4.5.1.ebuild 1945 BLAKE2B d89ffe2526ccff7a1d0de99eeec095ca66849abfa76a51d8e41e99ac9b1023a89a1cf8cd5b190010d07547a567a0cbcf5f5b16396100d2ca635c67c846487762 SHA512 32f6b2e4728085bc4d0e610e38e5889a901ea89024cf7b4d415aafd6b69c90db84c0fe576dddcc7f443fedf781ce936309f5d19247cb13cea8133322892c21de
 EBUILD enable-4.7.1.ebuild 2033 BLAKE2B fc9841f446b7129ec8bb8d932c0171488dfaf13396064b5b003dcb6a33eec405a2144e4416036d683749c1f58b1704a4b58962400f20b235642d322e8927383e SHA512 409d14e71a0bd0097c2c1dcd5e7e0c04aa6b6628f718bebfe706fd40673d882d872398625e9a456eec6481cb85b5a86e58fe1e2a86e504b56b737205795a0e35
 MISC metadata.xml 636 BLAKE2B b44b5cbab602b1fc525e1500e814120417f10bef9236a30fc982c4b2d06bdc8b3cfeb5166b97ee400756364a7329e5abb8383367f1363884b2fb93f75ecdd55b SHA512 1f7066273188655ff2c98f2c90a3e39916c8d1201ee62e0ed024fa8e847e5578034af870956fc9efd3c900f075532b31703cb301fcabefd8a2c876dd9a412eab
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild
deleted file mode 100644
index ad35ba85b45b..000000000000
--- a/dev-python/enable/enable-4.4.1.ebuild
+++ /dev/null
@@ -1,70 +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 distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://docs.enthought.com/enable/
-	https://pypi.org/project/enable/
-	https://github.com/enthought/enable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-lang/swig:0
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-swig.patch )
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-
-	sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
-		-i docs/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	# https://github.com/enthought/enable/issues/158
-	PYTHONPATH=.:kiva \
-		VIRTUALX_COMMAND="nosetests" virtualmake
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
deleted file mode 100644
index ef3d56907cc6..000000000000
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ /dev/null
@@ -1,78 +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 distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://docs.enthought.com/enable/
-	https://pypi.org/project/enable/
-	https://github.com/enthought/enable"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/apptools[${PYTHON_USEDEP}]
-	dev-python/kiwisolver[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-lang/swig:0
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.1-swig.patch
-	"${FILESDIR}"/${P}-gcc-5.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-version.patch
-	)
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-
-	sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
-		-i docs/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	# https://github.com/enthought/enable/issues/158
-	PYTHONPATH=.:kiva \
-		VIRTUALX_COMMAND="nosetests" virtualmake --verbose
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/enable/files/enable-4.4.1-swig.patch b/dev-python/enable/files/enable-4.4.1-swig.patch
deleted file mode 100644
index a82f3af1c7e2..000000000000
--- a/dev-python/enable/files/enable-4.4.1-swig.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From f0e399174c5f55eb3a72860c620fdd5193ad57da Mon Sep 17 00:00:00 2001
-From: Jonathan Stickel <jjstickel@gmail.com>
-Date: Wed, 25 Mar 2015 14:05:01 -0600
-Subject: [PATCH] fixes for recent swig
-
----
- kiva/agg/src/affine_matrix.i | 4 ++--
- kiva/agg/src/constants.i     | 4 ++--
- kiva/agg/src/hit_test.i      | 4 ++--
- kiva/agg/src/rgba.i          | 4 ++--
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/kiva/agg/src/affine_matrix.i b/kiva/agg/src/affine_matrix.i
-index 2f30e51..7c05a6a 100644
---- a/kiva/agg/src/affine_matrix.i
-+++ b/kiva/agg/src/affine_matrix.i
-@@ -157,7 +157,7 @@ namespace agg24
-     };
- };
- 
--%pythoncode {
-+%pythoncode %{
- def is_sequence(arg):
-     try:
-         len(arg)
-@@ -184,7 +184,7 @@ class AffineMatrix(_AffineMatrix):
-         """
-         self.multiply(other)
-         return self
--}
-+%}
- 
- %extend agg24::trans_affine
- {
-diff --git a/kiva/agg/src/constants.i b/kiva/agg/src/constants.i
-index b680cae..78f9d0c 100644
---- a/kiva/agg/src/constants.i
-+++ b/kiva/agg/src/constants.i
-@@ -44,7 +44,7 @@
- unsigned path_cmd(unsigned c);
- unsigned path_flags(unsigned c);
- 
--%pythoncode {
-+%pythoncode %{
- 
- #----------------------------------------------------------------------------
- #
-@@ -141,4 +141,4 @@ interp_enum_map = {}
- for key,value in interp_string_map.items():
-     interp_enum_map[value] = key
- 
--}
-+%}
-diff --git a/kiva/agg/src/hit_test.i b/kiva/agg/src/hit_test.i
-index 76de0c9..2cfb1cf 100644
---- a/kiva/agg/src/hit_test.i
-+++ b/kiva/agg/src/hit_test.i
-@@ -22,7 +22,7 @@ namespace kiva
- }
- 
- %pythoncode
--{
-+%{
- from numpy import shape, transpose, zeros, rank, reshape, int32
- 
- def points_in_polygon(pts, poly_pts, use_winding=False):
-@@ -92,4 +92,4 @@ def points_in_polygon(pts, poly_pts, use_winding=False):
-     else:
-         _agg.points_in_polygon(pts, poly_pts, results)
-     return results    
--}
-+%}
-diff --git a/kiva/agg/src/rgba.i b/kiva/agg/src/rgba.i
-index f7624b8..183014f 100644
---- a/kiva/agg/src/rgba.i
-+++ b/kiva/agg/src/rgba.i
-@@ -74,7 +74,7 @@ namespace agg24
- }
- 
- 
--%pythoncode {
-+%pythoncode %{
- def is_sequence(arg):
-     try:
-         len(arg)
-@@ -90,6 +90,6 @@ class Rgba(_Rgba):
-             if len(args) not in [3,4]:
-                 raise ValueError, "array argument must be 1x3 or 1x4"
-         _Rgba.__init__(self,*args)
--}
-+%}
- 
- %clear double r, double g, double b, double a;
diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch
deleted file mode 100644
index c9cc1ff2e3cc..000000000000
--- a/dev-python/enable/files/enable-4.5.1-doc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001
-From: John Wiggins <jwiggins@enthought.com>
-Date: Thu, 1 Oct 2015 20:40:07 +0200
-Subject: [PATCH] Read the docs version directly from enable._version
-
----
- docs/source/conf.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/source/conf.py b/docs/source/conf.py
-index 10b7552..995e315 100644
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -41,8 +41,8 @@
- # The default replacements for |version| and |release|, also used in various
- # other places throughout the built documents.
- d = {}
--execfile(os.path.join('..', '..', 'enable', '__init__.py'), d)
--version = release = d['__version__']
-+execfile(os.path.join('..', '..', 'enable', '_version.py'), d)
-+version = release = d['full_version']
- 
- # There are two options for replacing |today|: either, you set today to some
- # non-false value, then it is used:
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
deleted file mode 100644
index 700b0b3774f9..000000000000
--- a/dev-python/enable/files/enable-4.5.1-gcc-5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001
-From: Nathan Ringo <tikiking1@users.noreply.github.com>
-Date: Wed, 10 Jun 2015 22:06:57 -0500
-Subject: [PATCH] Fixes #200
-
----
- kiva/agg/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py
-index 5b4d458..c6e290a 100644
---- a/kiva/agg/setup.py
-+++ b/kiva/agg/setup.py
-@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir):
-         f = os.popen("g++ --version")
-         line0 = f.readline()
-         f.close()
--        m = re.match(r'.+?\s(3|4)\.\d+', line0)
-+        m = re.match(r'.+?\s([3-8])\.\d+', line0)
-         if int(m.group(1)) < 4:
-             use_32bit_workaround = True
- 
diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch
deleted file mode 100644
index 1dd3fe42775e..000000000000
--- a/dev-python/enable/files/enable-4.5.1-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001
-From: itziakos <ioannist@enthought.com>
-Date: Wed, 20 May 2015 22:52:42 +0100
-Subject: [PATCH] check the enable._version.py when installing from source
-
----
- setup.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f765f51..3328b93 100644
---- a/setup.py
-+++ b/setup.py
-@@ -92,13 +92,14 @@ def write_version_py(filename):
-     fullversion = VERSION
-     if os.path.exists('.git'):
-         git_revision, dev_num = git_version()
--    elif os.path.exists('kiva/_version.py'):
-+    # All packages are synced with the enable version
-+    elif os.path.exists('enable/_version.py'):
-         # must be a source distribution, use existing version file
-         try:
--            from kiva._version import git_revision, full_version
-+            from enable._version import git_revision, full_version
-         except ImportError:
-             raise ImportError("Unable to import git_revision. Try removing "
--                              "kiva/_version.py and the build directory "
-+                              "enable/_version.py and the build directory "
-                               "before building.")
- 
-         match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version)
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index ac7efdcd516d..8d01c8770eed 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -5,7 +5,7 @@ DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1
 DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
 EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
 EBUILD flake8-2.2.5.ebuild 1099 BLAKE2B 95b243ac6b57a1876810d4189dfc2b70aecc993194b62e95a17d6e410cf1e3378adae7eaa7a4027ac55b0528e0315d74149d0e2512c55450801fa382715b46f1 SHA512 552e6145ec0ad5a64055722fd6c93019e4a3169e80ac57eccad3838fb9b9b32cb1a111307fa6e6f5e1e5331b10d958b9d269ccdb5a791d75588eb8f15777e571
-EBUILD flake8-2.5.4.ebuild 1605 BLAKE2B 050d4a5fe950252e89f9913c375bee3e73dce9b99eacf6722c72035ed4bc60e349e1184d1afe2fa54652a19b2ca612e56d786642d7aef4646621aca078729a3f SHA512 7e0ba75cc91d90a2f68082cc6ac0d41388529271f7bb42f9088a9f10033405b980864f4db136fe640ea8a0201a45b4056b49179f9747ac051ace2e344ce7f301
+EBUILD flake8-2.5.4.ebuild 1604 BLAKE2B 1e0c65296854971216aba308e2bd8d99760d44a0a3338d1f1fa6cb83a6db13e3696d06671cce0717575b0d71aeab328bf1745f4414a04f9cc33d23fd9c7d69c5 SHA512 6a56bb2adb6a82dde6f2afe9226119203b9df5b8c0a43a4ffb400dc75f6c2636d9289d78c8602d9cce83b22113c51e5a9de5d29bb0bc23d922e2ce29724a0e2d
 EBUILD flake8-3.5.0.ebuild 1637 BLAKE2B 250dba56f400fc9761907c2d70bfb251a2abdd820ea698d48f4898b405022c4f811da90336df9f81a5534ca82cb3bd19301cbc979780b720528ccee9c9a88c9a SHA512 1e0467aab3fb0738bf798f915cf6c4a024c0895998a4c27043a30161068d85b4adcbd33ad13fde458288f5439c3839444fb2122b3dbd6dc2348df71984abdb26
 EBUILD flake8-3.6.0.ebuild 1646 BLAKE2B b61ce7b2376c3abe6177c4f8dbf4b3658141720d05415e55f9f87fae374e2c434c610253a4d17b0d5ffa6b35708d245dc78d786d6baa9cf25f29b500caa87bcc SHA512 8e4203361704b7878d615cd8182eb743a9527aa7f6fa7566ada7207ffb08b6124b44c8162451a1105b0f68586347291427a19a1e5a403da1db8fa13b1e359b1e
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index f561da9fb34d..17c56ae9baf7 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index bc00e1413c9e..2a91b4d6977c 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -2,6 +2,6 @@ DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721
 DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1073 BLAKE2B 6e0dd038d4c0f28cb7edbf89a8f1f7a3cc5425adc7385e16b4ce181d125eb4897e51d4837df9c7561c0f71dac15c9e2de0a4c31f69eaa91c89be87d17b564b91 SHA512 a6c1b36aa1846f904cc4f9a9d1d9efd4af92f8d8699db38dfb91b576b944c10f8809e292507188b64a3bd50d9f5f27a2483464dd13942e0763a4d13e72d17fec
-EBUILD git-python-2.1.11.ebuild 891 BLAKE2B 3052bd8613842f2fbcb22ddd83992f096aa54d627d4a0d71e97779c355e967b52b4143d5f973f228359f91fc524e6fd6261c8ade182daba2ebfd6b722f5e0404 SHA512 faa49d40a5fcc9be3c814716b2227dc3f419d0ab5faa5b5c550d2f9bfa42f871e7ba17736bfe3b10c0b7728b5316b02ade56addbde89ba4d2286f7173c9b0bc3
+EBUILD git-python-2.1.11.ebuild 890 BLAKE2B af4efa6491e548dbf37158dda4a2ee239634709c31ef5694f4e61b932a04eeca3c67ae6ccf1cd8d18189f33d9b0b9d978d82638fbaae0326759999b95f99a427 SHA512 104bae93fc5947a0b2273cb5027df42a6f7b8f59498d729e496e06691d7108b03cc0604ce10944753ebe81ec74160a6e2c1782abb9f1629d8e7ea7e95171b81c
 EBUILD git-python-2.1.7.ebuild 892 BLAKE2B 1dbe094db47261a1a8e6c841d4e7be6be55944a709c337ff6564b30f22b991987de2cbd813b3f9cfa5ce49a2bfe0e479be9c7f9e5af4ffc01fbccf45bd54a56c SHA512 e6d094f2729cbf83b1d03818ec2c059d760f6e2ee6e81462f90b8570b07069e7cfe539f35db2f5e92ba0790579e96227eda06133bc69431382863dd133d0d64f
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
index 96f8566ba217..1b693335df12 100644
--- a/dev-python/git-python/git-python-2.1.11.ebuild
+++ b/dev-python/git-python/git-python-2.1.11.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index f8a5fbda0ac7..0b77de60c7f5 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
-EBUILD gitdb2-2.0.3.ebuild 1236 BLAKE2B 2000429fe7716f5f890b96b02fd3d27265213c6c642bb8cc8137a3c491383589bc04a29d170ec33a4d24099a603d8bc3ee0128ebd60cc9aa28c74c7c73ea5c53 SHA512 0e4d04ab628e41963f2799149b91cd3c519e6ae544ed29687cc973065324ca0239af3b2ce709bdea3c5feaf83793bf6d2cc842c704eebbd2243fb0ded32766dc
+EBUILD gitdb2-2.0.3.ebuild 1235 BLAKE2B 0bf09caf855d20917ad88e3e976de8ef39146c404cb85b5b9c1bbdeae341f40a681a70f4fe70c9a730ae1004d08c5d44ca6836253523d26cfb2b03d2d5493458 SHA512 dcd2bba9e8dce2524383bf4bc8425c01f2b2f334b06e60b1d7af7b32f4876e8735bd92f3106358bceb89fbe319063ffd326505d84d7a3dc4f8ceb625976f0705
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index da2f3014de58..523560b0b5d0 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 131e29696574..cbe19cac6d45 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,7 @@
 DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b301de6aa450a46918f69132ab8d8d5a3f9b54095feee436a8aa9e9045c27ca1a120d665d6031c14218f0f5 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4
 DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
+DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
 EBUILD h5py-2.7.0.ebuild 1383 BLAKE2B 97660943e83ecee56fc008a312482ea9dae7be654ded10855c3dbd1b7648ab8edebe7d01f086ad42d46773ee19a28e1c2adc3aee7500020fb81a35ecdd695113 SHA512 f7687d5f281f9892660784a1f47192212cba546ee85cf1499c2a6d75efdcb9622d71884422f03395830746026630ce5bdec74c32a1e806c05d42c88ae6fcff7b
 EBUILD h5py-2.7.1.ebuild 1385 BLAKE2B f64206a537b19fac7fee1356dc00ef1ca70bcd5e6c3871eacdf4c9f8630411ed63fe63085f875ca4add7d9536ca7310756e3fbf971e8b1713a7017feffd1034b SHA512 441204b99fb0b8bd64aae4cdd3557d4bfb391d19462bde2ec9241f2b0eb847eace1ae6ddec7b6f21039dd0ca25da96347555b61a0df2e1a87ae1da04866fb744
+EBUILD h5py-2.9.0.ebuild 1382 BLAKE2B 2b7b8dc99ae948ae1e33de0aaf9b1deb35b7819f3764343c62926842b74797e25cf6e629273f78615bfc367a83c33edc36aac05de86254a28342d00b989f7803 SHA512 9d7bc05142fea9b234fabbb7f5ceb2e38e29d8889e0e9ae2cac6320af9cc22a827fc7e75cc242958ea57639df70ff573a59d00bc2751697f3ddf59966864fe09
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.9.0.ebuild b/dev-python/h5py/h5py-2.9.0.ebuild
new file mode 100644
index 000000000000..9ffc566d5d4a
--- /dev/null
+++ b/dev-python/h5py/h5py-2.9.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="http://www.h5py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test examples mpi"
+
+RDEPEND="
+	sci-libs/hdf5:=[mpi=,hl(+)]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		)
+	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc
+}
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	esetup.py configure $(usex mpi --mpi '')
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}"/docs || die
+		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
+		emake html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	DOCS=( README.rst ANN.rst )
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS+=( examples )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 9c3bc5516de0..7101d5148fca 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,9 +1,9 @@
 DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d6976961140e2e3f0988d2c693db87de98b27b38ce456b4fc681bfbaff428882e7fc072cd4511935585d789850b85a4 SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417
-DIST hacking-0.13.0.tar.gz 49171 BLAKE2B 2784f7303dc985ba8d0cc0c9d91dc76ff9b6bc02c1bbf1381e0803e753c2a4aa0560acead7e653616a2316bbd3ac073142cfc078dddea36b39b2c5e5bbef0f8e SHA512 ca3fe0bef1c6348ee9497c136d002b04c9f67a766192d88456b749ff860528a887636b1f3db23fec336749dbf3e5bb413a1effd2261e42929d5826e54336e314
 DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
 DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
+DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
 EBUILD hacking-0.10.3.ebuild 2115 BLAKE2B 58a5bdc96cde6a5d5fc63847dec869a6056103047d0b7d3d4b7cd2e78d2278e086afa945d1ffcd95302d387c2b35e3de54b7908916a925319bbac9202338df49 SHA512 42602898d7935c5127c28529a241f4a319b74c6c3b59d51e904ea5738dad573d16a027958a9cb290f3f7901cb4bcfad3e479d4d581552b54e227b0a688d848aa
-EBUILD hacking-0.13.0.ebuild 2116 BLAKE2B 375185270877f4fc41ade17877e3eba86d653ce50a647c0e4cbe5636d99974f182de1c7ea5efa8681836d9177a70c453af30eb234c028eee1bbf551595f38d37 SHA512 51a10240b218de9eaa832adf5a5de34df75ec0b741a688b094676bbfcb7d3726728f1409f950ccbd70216276c75a42c6f28823ca82f26b22eea5499ac17dc0c7
 EBUILD hacking-0.9.2.ebuild 1942 BLAKE2B 453052e1370d760467797a57e0bdc11c72039a41c6f0f59153405a548f20b7e128ac563a5ae2a9d327a3cb2182a60d4e97b02111d105e5a58c83d84e1f2856a3 SHA512 f9d49566d6b2ac6489b9d0e163960733222e929feaa12d6701c54cac354299214deb979db2a6c1b466cc0df3d6146bbacc4b4a2534e24648c9162ff59834a49a
 EBUILD hacking-0.9.6.ebuild 1927 BLAKE2B 7ed3b24c466e37c7526e14ea7376317e7582da8c7eb40f027dc59d97641bea859974bda082e9d1edd9f68718c0523d438bb8f44de22d6fec73e1240641208818 SHA512 05e14f7072171567a0bc9cfdf430846b34404bcd1e5dd3d8ae0070203fe4b29d88b9360dd59222162bdb4411651d210bb443c0f386433284bec1b31cea918513
+EBUILD hacking-1.1.0.ebuild 1729 BLAKE2B fc96859c2c40835cb749f0a76965fa83e82ad408553e257128bcf05c3758de7a42762537f8409f254911a09028c9ebe97a9530fd38022688159f1d98de5111a4 SHA512 39dafe85e40143c615f337fa78144418bb0f68b62d897ab0ef9abbccc80d63c3089554f325cd438d58179e8cf69c2b59f8f2501edb0fde4084c04804de673852
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.13.0.ebuild b/dev-python/hacking/hacking-0.13.0.ebuild
deleted file mode 100644
index 9e30c64b836a..000000000000
--- a/dev-python/hacking/hacking-0.13.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
-	)"
-RDEPEND="
-	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-	# relax deps
-	rm *requirements.txt hacking.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-1.1.0.ebuild
new file mode 100644
index 000000000000..6b5bc774fe4d
--- /dev/null
+++ b/dev-python/hacking/hacking-1.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? (
+		>=dev-python/sphinx-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 22f922493477..975b5108d184 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,5 @@
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1037 BLAKE2B 192cca26649bb8e66e5cc4b6da74d6a9a3360f2ef3e817882807d3f506a66d5a39abaa0b6ea0e5b112067844a3b183412a7a5fb661326c1b64888869ac79078d SHA512 62b0198a3e60209a460733e74c54fc48b0a1f777a9ad705eb0aca1ce13f88d54f83045762c5e28a073ed0ce767e43a0f3d8186c3cfb0db7eea7d065088a186ac
-EBUILD hpack-3.0.0.ebuild 1073 BLAKE2B 9af85fd6e1c154c42756251b26f5bcc64b42bc74fa96b4ba258a93a933e988036db75455164fa7037a3929ad84404c73be0a0fe8c760e6530ac42a54f6662918 SHA512 2b4d950e9162abfae8a974be8fdd4fa244f13b51c95603dd6f2b017e946de65fe54cbb3d7317632dbe08f2fc7e79eba874450547f20c1c9240e4f938e9b7e2a7
+EBUILD hpack-2.3.0-r1.ebuild 1039 BLAKE2B a06f45791ffb30a0c76fa1cb666e2329c5def6c2009099d47edb2f36b705a8fc268042e223823738f545797ad95b9e81444bec3c9c2ecc899b02734c96e056b9 SHA512 974c28dcb2c851133da15946cdc7beaeb9110ae524c6234bc7ff9f23196164fbf7a2dd7651a0e2d45def1649befe8f53a53fc0d697d5a672a21c9bc79cb7a1a3
+EBUILD hpack-3.0.0.ebuild 1079 BLAKE2B ab69ba150a56f66b79806cd0420870d5bf86cebe6e4155bf554404be50d586112a5d03e76bb6dd6dde1105ab00d22e6b3bc9cc14667868e9dc5bacc3ca0f9d0c SHA512 4352009777d9b490b4c97bcae82cb22d7d21bedf7c018bb593a15643bf730c433aa8cd93b71d6d572978c9ef6b0328c36ab1dafa797e68523d66d07261a17c36
 MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 5c5ebb061613..43a4c23db3fa 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 812dcbc63546..bd7d46650509 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 2de883d2c69f..53e98b8097b5 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,9 +1,3 @@
-DIST httmock-1.2.2.tar.gz 4975 BLAKE2B adb42f1a0602f2221adfa237e4529791a54231d2839963a99250c68f799d014b2dade9db332bc302a6d138e6c80522e1cc022121bd065f5411357b54f8e5cf5d SHA512 0be8ae754bd3ae34166b0b001a44e664b07488ba6d44ed3dc518b310b82418dc5ab2f15ef13cb20909109f19c22a6e13dfdfdfa37f26f3c0688b19f2321be767
-DIST httmock-1.2.3.tar.gz 5203 BLAKE2B 8b288a7afce514b6961ba3f5149bb07d822f82a811c5008262476e65f4a1dcd0afd0ffc9650e283802e33a9a093eb30f217466899464e527d4c0eeb5647d7449 SHA512 23b7295f2685639eba44714b3dadbd6eca20b7f50e636d6490d5c3f581429d84e1f4b1e15f4ba31a7ccee1596768003e68a7f1591b75aeb3d5811b279b3f1bb1
-DIST httmock-1.2.4.tar.gz 5412 BLAKE2B 503e8725dec2de095aad2a7177d81ddb47c00bfa3e1e50c72d6c894cd8c0b7012c1c99ccc65d5026f3e57a765bce14149b17d5cc0d52a0f129151b6d3444ec7f SHA512 868c38e84665d7eaeae2610d79f21d991f1ddebe72bd9d396a906f59595695199ff2c11c80318e6c246425b9acdb7a1c8b36d570ac0af04d04f4eaa4d965e01b
 DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
-EBUILD httmock-1.2.2.ebuild 541 BLAKE2B caca350d40dbecc0123aec2311fbbb0e0df4d63d3f1cc14c75ffc5378280e248cf041e11bc9698d9ee231a9a13cd14a26476163bb876e0341a4858f44d6261a9 SHA512 39368f0c06f16655c5d48c55679240a3a23da72c422c318c2c703ea739335f81fba887d0116c98c04af9be31ab4199ce7a7fb85b62368125550d59d39f7b640c
-EBUILD httmock-1.2.3.ebuild 553 BLAKE2B bb9fa583993546d6bd9c439f2ac1559eceb19daa6b9cf5278bc4893fe9d444d32e7f9bd995c1f442cd251d0cc3319399c5f622b9c9f25a5f2bc0943868158bd6 SHA512 b7b91018246ddb4718b414fdc0ef08a150d3fdea8fb2059c13815f4b37dd4c23fd7427a12994a13b868259e8ba7f3a6b7600b6b0ffc1de15fb7b20df2037f813
-EBUILD httmock-1.2.4.ebuild 545 BLAKE2B a7a17e3c6f94b13d4b824e63b4cc897cb17831fb0ba0b1ae99d350056eb422e4e6f582c10fac48723f685061a72d8f6c316fd41fbdbba08177eb394b8cc243f5 SHA512 059502cf827d28fb7748d884c553370341256cd0e42a5cbd0be03343fa70f728c7a34dd50f9a6b699db921460e48c88e10b82c7b74396690c691a0bf18fb2b06
 EBUILD httmock-1.2.5.ebuild 549 BLAKE2B 48e7314ed8caf7a788947b4e4cae68fad53ec290dbeed0dacc536025c2b4f6da097cc2f3b442c58ab11d91274e81f54cea05c8271b7e6ac1d5064d633a96a530 SHA512 8ecef2290ea7ed9fb96af6fd586edeaa8732d173048a75ec79785ec1c8c6e665bfc44b59b5b870552b4495395c72e714010e17701a7c8e1fdc33c9aa8969b9d9
 MISC metadata.xml 246 BLAKE2B 7bbbd7b1426aa97da0217eb9a4693facfd85920a077235778070e692ea562e596cc884db84f66223af907824cd0b97f8b1617fedff2dff37ab8802cec0874cd9 SHA512 8e33ef8d63dacd3d70b04a4b0f2e206148f09bb605a51e1d51d069351b498238bfd205574f45a0cd606422364e093023b8dc40bbfa3ab0afe26ba8e052df4f74
diff --git a/dev-python/httmock/httmock-1.2.2.ebuild b/dev-python/httmock/httmock-1.2.2.ebuild
deleted file mode 100644
index 1878d487dd3b..000000000000
--- a/dev-python/httmock/httmock-1.2.2.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=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/httmock/httmock-1.2.3.ebuild b/dev-python/httmock/httmock-1.2.3.ebuild
deleted file mode 100644
index 57a4bbeba389..000000000000
--- a/dev-python/httmock/httmock-1.2.3.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=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/httmock/httmock-1.2.4.ebuild b/dev-python/httmock/httmock-1.2.4.ebuild
deleted file mode 100644
index 4e2a45ca7f94..000000000000
--- a/dev-python/httmock/httmock-1.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index a2cea03a894c..5e79e49a90f5 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -3,5 +3,5 @@ AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d
 DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
 DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
 EBUILD httplib2-0.10.3-r1.ebuild 940 BLAKE2B 0298eb3562438abd69645aa560e61d1c7c8afe32ec7cee359c1808e25fb2bf9bf4627eb4f292171a8068dfd47871b1cd05879c7f6e41b68b351f08e08f028e33 SHA512 1f3821451c34e16d71da69d857e0c3ac49a1f792843beb56db7ca85bdf7af7609626d511258b65d5bedbf4f1d6ba14ead2f413e35b124f06dc3994fb3cca117f
-EBUILD httplib2-0.11.3.ebuild 964 BLAKE2B bb0b4ef07c9421787815bd8dbd01876a61f4ef70ed4c4125495d40218bb3b2da0915bbeec574674d27e2d7ca2c79494a5b00e0813ba526566f6f6b8f1f2c4857 SHA512 90e3267f5bac5d963d8c0105b5b90e6702c99ac24ef0dc81d3678f6fe940ec07a1b8b5c2d3a60a4d86b8b2eed858c06b0b3153bb3c17d1573846c0215505f8db
+EBUILD httplib2-0.11.3.ebuild 963 BLAKE2B 023a09283c555df784315c75af3da17e0899bd9286c9d8bf532f280fa18fa3d8a9d74eb7e3c82791212026d9c85c8360681f055e54d4ebb15205496d1c4618ca SHA512 61eb164353a8ed14de4ea20dea40200963504b2bfd28fa7630e13dcdf1ee9d42d18ac7c990c8c8458c6d3c75058608a4b5e52d57905894f902da49bc69333572
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/httplib2-0.11.3.ebuild b/dev-python/httplib2/httplib2-0.11.3.ebuild
index d320d3aad252..5d1a3b0a80bb 100644
--- a/dev-python/httplib2/httplib2-0.11.3.ebuild
+++ b/dev-python/httplib2/httplib2-0.11.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index c035cba4f86f..8ab592a4c6f0 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,7 +1,7 @@
 DIST hyperlink-17.1.1.tar.gz 23067 BLAKE2B 8bf1e61c6ba72c1cef4a9df62168b513004ae8ef2d4fcc13a1984bfdbf174c6175e2bcd241396c97d4e07dd06999718c217b27432fdf36d632b34c2b97bcb1b6 SHA512 13b20fd54c6bb5d7de3c9a04133fdd848413d1308d9944a2288c76d5f8b9bb0c54401ca5ed53460112209806407497526f2e68a92d119656eb58a9a618e9b708
 DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218f0ba6d4072c7448433c6bf63891fb59999358c5efa605d21e28ab6e39a87cb84b1e3c8e2e8fce24892acf2eb679 SHA512 c0c9d99a530c938b1d1e97b8344c5a0fb18f894c8b0b294cc8ae6aa6a550a5a0272cc6be7a913d371f3ce3dd8695b7ed239999f3ae5e8ce97e3693625ae761bb
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
-EBUILD hyperlink-17.1.1.ebuild 750 BLAKE2B 28e596497a229d3939e08be7a20b553abba25dd5fdbf13b5bc625105638c84766267be03b92c04d6963fc3f109a2fae5c25973ac125ed9a3722de9b5aab1e66c SHA512 bcfa4f179f4a37e05e3e9e28720847e0bffc2f384d950026ece4526590555582248ab2a41fe64cb810dbe000e4bf74747452de90ace91daa08df60b7d524e38f
-EBUILD hyperlink-17.3.1.ebuild 774 BLAKE2B 6c87c7db5fc0877cf222ed2a0479e8cc174a324cf8bc57e53e90a5c3a7726bfe8d15967ff414c3776ca3f8fc3c8bea86a62a36e91e7c295f0b2f8f4571a6317a SHA512 129da86ef743fa68c780b221cb0d24b9c27da4466420e40b5ad9f90627dbb361d656a55a5d1ddee2e6b346b8885f395a9c5532ac37a0ca4b5a4fc603f8360ac4
-EBUILD hyperlink-18.0.0.ebuild 703 BLAKE2B d1637b5fa9d31dfd8cd19bd499116c273880a9fb180c645565696e3cd322c679c4fe225ceef7d85502ac8a64b4c5883c138ee98f6874d12bee56b3de4d069a59 SHA512 2de4b157537075e5e844fc630fe1650440d7cbd95c9253081b546b15c9debf0953c2c4daae3c510e0072100f70a325fb1179e52be9c0ca2264f12ac6d86e1a90
+EBUILD hyperlink-17.1.1.ebuild 753 BLAKE2B 61b2994479704ec998887e1cb7ec7f12caea553c774b75312ac121a5268b8ca673176a602ff77c9dcf4a01eaf53e90768cbe94908c5c5f596359dd6eb3108f47 SHA512 1c7b2b09cc674fa8c3bf71f2aa1af3f1463f6de9d2d486d9543bbb90d69846b91b3c606f8679d8097b622ebc6eed636dcfedd879770a9df172e962adcdf0043c
+EBUILD hyperlink-17.3.1.ebuild 777 BLAKE2B a21e08a88bb98add80782f3e0bee5a3555d42e325d05e262075100d732bf43f2a945b2b97a6bff37becc52b5ef5905a3ac8175008ceae573ff97ffba3ce63dc0 SHA512 137f7c7cc48d23ff84bc98202c7a4998ce03d4381f8a60dcc16362e9c8fe301dbb7ee9a424020af8019354c7c2645ccad2c9eb7ff15ed6dfe446065b882eff3b
+EBUILD hyperlink-18.0.0.ebuild 709 BLAKE2B 472c2d3e379fa761be0b2f5c59044f914e9f276a313170c28424db49b4983838279d75fe56b98a4c712ecbd5130fb63c6d93409beed182660f487f6d5ed23b8c SHA512 f8575aa2d7a7b954f9c5f32524c0a69faa64f95d3e5670d2ff3f6b2209f8d6711f8621b7f672c0aacca6912d756a0e0569bae3ae51d2ef78528ec1ef30174336
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
index ac6dfded277d..0714550b07b8 100644
--- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
index 4ee662544c76..257c10f24663 100644
--- a/dev-python/hyperlink/hyperlink-17.3.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 2d159e486d47..91efd49bbde9 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index f3f5eab8e3c7..f443e28305c1 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,7 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
 DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
 DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
-EBUILD ipykernel-4.6.1-r2.ebuild 1131 BLAKE2B ee25175447e339c402f03caf3ab67d21b4dc5b0398d4916292a0373337bde8cca312cdfb7508488e187d5d690cad86dcf80c2fdf23e7de12b50c7b3436ea97fc SHA512 1a9fe2d39244a8e585e1cfd5ff037fb47f6cb239a3ed9d6e027c71fa7ad31d4f75e31ff835de265c32e7a880607803c18edc16b4fcd95275772c2af261718cd1
+EBUILD ipykernel-4.6.1-r2.ebuild 1130 BLAKE2B ed05306f1ec37f1f2a5fa77f828152ba257595910394975d3db810dd4ff3b16fd6f1788b06a18d635a303ff2750bf837a57817153b6013fd0201353affa53bd2 SHA512 bd5b47362824ce8407005a0d0a943b1591b3e30f35e58a76db8715311066cd844ffd41b117c6a44ed174454c2d2f3bde559b8ac24b54bcdbf80a0064451faafe
 EBUILD ipykernel-4.8.2.ebuild 1133 BLAKE2B ec80ac77a49ebd001fe29e5e77d53b0c5d8f0539a43e2bdf23ce0507bca81accad10bfcac1feefae6aa142634403c7ec4ab83e10e914807b7ebde8472990f3e0 SHA512 574fe2341da6a1e218390945037acef7d6e79b80eb99ea48feb7bf2e0bdbeeb786b8f12abb34559b6b099b3e081186981395973829e52abbac33bd200ecd5df8
-EBUILD ipykernel-5.1.0.ebuild 1120 BLAKE2B 5d1b00d4801f6ff260734de0189a926834b213aa672977e8ee5cb7d3586694830fbea11f4bd04993aab1d00eb66059d8bf41a15679e7a71c3223eeea7427076a SHA512 2879a4bcb4a17dd233eb5d00c576099c8b85f684efdb9c0a4335dd0369c8484c42e06e097a34a998649df50fd5f5ebd5f70347990bfd55791270b02fda7a9c92
+EBUILD ipykernel-5.1.0.ebuild 1122 BLAKE2B b6b5cba76926323a3a0e3c8e62378bd2b63de999b86c2c97f7222c9e23c055e7cbc028434cf993ac6d038827b17b22919ccd290f8465e9e60bb1523d1a14d270 SHA512 74311b27e7a6dd9a2cc2f5e9d4c11231632707160afc55f9d5baa7b2f36daaae923e6c83ec44df2ac2debe0d377660f0e865eac565132321e2496d52bcdacc12
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index 0b67f85acfe5..551646927ce3 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
index 42545dde0b45..5b7e27bcaf35 100644
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.0.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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 255633aaae2c..f80141c05de4 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,3 +1,3 @@
 DIST ipyparallel-6.0.2.tar.gz 2366627 BLAKE2B 333d6043c1e3635a37ebd464a5eb6bd0d21d0815abf106f8a7dd138128790d89ccb856dd981c281ce023cded589e6352fd6cd48efab61c8955abfbfea157eb35 SHA512 2dab781eac81bb3c2d4eedff9689448ed8d4317b47a1e8110a0b16147f986428f6fefe13acd12ee8604ec7775aee46a5f62c7d6a676bda7f8d3d39d95d90f28d
-EBUILD ipyparallel-6.0.2-r1.ebuild 1693 BLAKE2B 230ce07d85481205fee5a195fa47747194a0154a3766fcf6a90c903b750ac55d857c96b4da1c5da4e90a3fb14e64f85440d8ad66073cec0a2c4f090d2c6324f9 SHA512 12c271886db253d9d97401e3ac27389604bc2c6dd3533f2170640ca947800e8eb606580c4f064d889797ee69d37043a38d38d6059dc41a55e36515c3aa1eb4f0
+EBUILD ipyparallel-6.0.2-r1.ebuild 1692 BLAKE2B 13ed66734ccc0d7ee66b937221068d0cc7b06717b516071490b296539814cf89f098d67a422c1e0144c38b24080b511279c3666fd98e0375508b1686d0309f59 SHA512 401ec20476810dcb853c5774155819628ca753532afda97e14c67397fd111a82c07f91b941e6267a1fdb2fbd00580c48fe1ef467a230b85348ca3fc7eb451c75
 MISC metadata.xml 541 BLAKE2B 1864cc5953409eb51527e721ab298f8296453190f32fbd620da058a2907ffb3778ac1f6723b1f50cd86a27d967d62d882cc5d0cba2709f653b0bd7328288f69e SHA512 47be22e2e5c3d43e92a6e9fcdcfe936ac7690499b850920196fca218b326f708d2350ec23f3084b58d0c9630f8dba06b90414a2e325811467034ef9f35a07a9a
diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
index f0cfc3cfd1a3..95e69d34e5e8 100644
--- a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 7bc5ac95bb11..316673f01c34 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,7 +2,7 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
-EBUILD ipython-5.4.1-r2.ebuild 3708 BLAKE2B 47ab2288916b066abcd1b2c11360f1764f182cb4462720b033e0c3f06081e8df0f819e01ccaffef729f05f2354b9d2f48c16a1fb2c8ad15be5bae60725ef2be7 SHA512 11f99d893f5bd8082e485e149b1b02266a311bc2526e9db522cb1056731eb49efb88e7f379c526f151c0bece4c0c7b7a8e893fc3c3eb6f3bbd6094d5699d5616
+EBUILD ipython-5.4.1-r2.ebuild 3710 BLAKE2B 6a7d9429af254c409a43a20ef43c4f8b3665c8363f1e3c57dfe8af1903b92b1b1f66f137ff5752bd29d0f63e1c18d72b8bb7ccb14871b4e56ade4f23efe8f437 SHA512 57f828b78e3528acd8732155334d755abedbd3257e82e6d422bdb3a64ef11e6b878e318023481684766dae36a016b18c7feaf762ec554ee46a6bc15b74745a8c
 EBUILD ipython-5.8.0-r1.ebuild 3792 BLAKE2B 42e9d5314694221cdd5aef1ca86bd860799ebd5d87d197631777365f4d87a1925f8a63f7160d40531c2df193935f52a3c7aba2df502687bfd68c1f7c6abcea2a SHA512 41934ced17636c27de6214ef2bfd1797e808135521681ac22617f65468546ee1a20c30a1069037e3af55e7c9de144653a6ce3693c4a973d8a9920919f7cd6670
-EBUILD ipython-6.1.0-r2.ebuild 3441 BLAKE2B ec48de937f75912708d7877f220d9c6644d32741c80187fd2200f2c1279b7102a7fc6c0e5a073e8d31979363e3c1d4a2623dcdd4f8f1df14177a77ca5415bf8a SHA512 54b09e9f252b042998f7fed0579fadb061e815a5b46dcf794b905fb73e6b288d2ed77a8b790bcef2921e77be451018ad3a4b6245cea7b2d377cd3a44b023b1be
+EBUILD ipython-6.1.0-r2.ebuild 3443 BLAKE2B 131546fe2b0d722a19bbe8eb5b2a9bcbada79cf87dadc8fffbb788e5a01eb5e25219bc0131c252b0a3829dc972956a2b3a86910c63b7a5db48238d94290a0309 SHA512 59e69b84558b2ad798d538f6e463983a1c9f481db07fdbb15b1a6ac3fc2dfb0beba8c1eb743dc6911e2406f76ec0789a3b76a3021b7e3d212709e47bad48d4a2
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-5.4.1-r2.ebuild b/dev-python/ipython/ipython-5.4.1-r2.ebuild
index 39d2a6d696d5..90da276d529e 100644
--- a/dev-python/ipython/ipython-5.4.1-r2.ebuild
+++ b/dev-python/ipython/ipython-5.4.1-r2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils
diff --git a/dev-python/ipython/ipython-6.1.0-r2.ebuild b/dev-python/ipython/ipython-6.1.0-r2.ebuild
index cf2d06ab0493..eeecaab5b9f0 100644
--- a/dev-python/ipython/ipython-6.1.0-r2.ebuild
+++ b/dev-python/ipython/ipython-6.1.0-r2.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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 eutils
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index 453afe6107ca..a053affcbbcf 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0.ebuild 621 BLAKE2B 2c53473c21f32df1c6f8d7ceed91886b0aa4f4ccb7b317946aabe9f085bbda309954754e2d959933f178c72288524f8fc86468c7202498bbf164509799aa49e8 SHA512 d192e908205f10020e35d91bf5baab7e7d0214aa6f5457051970956ade0f36e881343efd2d05ef0d6422fe4f3114014aac306a93271762fce47f9db4606057c3
+EBUILD ipython_genutils-0.2.0.ebuild 620 BLAKE2B fb1c8f300d1c4b46c91764467fa737ffaabacbff06ac35fdfec19f7b50e367cd1780b7d79f733123fa4ca4742921f8558ad180b97be27db572a49dec31867598 SHA512 abd0a2177d500e1c8f9b6f3ab876514ce73e942d07d3a81601060dbb2f25c2094807fd91fc5d25c8f08f435356778751c01f181100be0cab062eb711bc9e26e5
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index b1cc5f7d33ae..615adb1f7954 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 1f48a5c672d5..9d726f7ab60a 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
 DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
-EBUILD ipywidgets-7.0.0.ebuild 922 BLAKE2B 969e60264bbccf53c4938c14fb968b39e0ac717fd82d844c14b0fb0a6935a4f3ca2fca6a5765f8c23374476696f284ed2103340d361b94add8ee10436ecb2ec0 SHA512 7e885fe4844671d12606ff3cc52d9560bb168e3aae2d07db1275070cb5e37e8210166dc3f4371fe144c25fefea634d5e7ac1ed8e7a2dab9086c9290205e4a39b
-EBUILD ipywidgets-7.4.2.ebuild 921 BLAKE2B eb66417d2955213a4a8d51d5737adf84ffd8ce19f50bc4fca076569753bc26e6541e49a7a41077d76013592ac8b4a358254bb55da5a7d1071cf5ec487c753da9 SHA512 f96609ff7a45954548fc443548214e6b9e115365e619e3a6926bf3ca98f962b635bbc33b6152b7fd70d45da89fcb7a2496bed425802c2717e8d710de40d6aa3f
+EBUILD ipywidgets-7.0.0.ebuild 921 BLAKE2B 09d26e240046a81f0cf4d7052b44e36e6a58d60fb6e000451d9b7415c49e8810ebb7600d885328e5a1b7a6cbb281bc07613051b9e7a7a85a4a5e74c7fd369339 SHA512 2f4b5142e25f2e5a746a67b307afb014c092fdfa4c317a99bab6a05eb0d45e64f40a8b11b723a41ddaf21324f3cdf9b9b9351405ad6418165c72b635704ffa17
+EBUILD ipywidgets-7.4.2.ebuild 923 BLAKE2B 1741ed02b636b320f824de406e8d7f21cd2530a53fc568f6dcc3aad593d87368c7a3973d91fd2da2e20e4bffe266052f0ebe51d3996129fda73d037dfda85604 SHA512 fd3108860172e502101fbe7e567619ded83e85eb562d013865fa46fb2b5911382a770c1708f75a43c3a711abd02c30336f8bb530f525f2b9dc73c2d294f42af3
 MISC metadata.xml 520 BLAKE2B f8892f1fa8cc869c859fddedb9aa976d5a564586d23d30b758301810ab21bab4b28067c7411de000ee16312b3c12d16ef9fcd927c42601cf4d4560dbcc242cb9 SHA512 2072af0fb3f92af2e73edc7d2e69b9773325ce5c1bb8046496fbeb4908789ad2896126c78c5bbccc475e57cd78385ea15c03e4c4318325912cb23babff45b10c
diff --git a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
index 108a75b21277..a5b3bc6c9a26 100644
--- a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.0.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
index 2aa8dcd33cbc..d779be9c795a 100644
--- a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.4.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index ccc150627c34..e1b19e0d62e8 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,6 +1,6 @@
 AUX jupyter_client-5.1.0-setuptools.patch 1062 BLAKE2B 1d01f2b7382d19f63c8bff813d6fbba21db25453e73366681d2b1a361f9842002ce7d5f535aca5e49e4073e36e708c28ce91aa59037daafe1b4da7627a47616e SHA512 b373c4bd3278484252430bf463d873249895aa6e5b041274352866d73de9fe3196dd64a73385aed8878b44a33e742e64623427d6a2d68706fcbdd70d4a539109
 DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
-EBUILD jupyter_client-5.1.0-r1.ebuild 1006 BLAKE2B fafe7632922c5b611495bac2ecc5bfc1c97bbe0fbaca3167ea3d806d39f7b4b48af638fb6f45b03c43bdd65ee0e2bbf47ec0f52cdd2d949e7d54eaef4c62e86e SHA512 07112f26abed3758fc0c793e6e237c6612ac64df90994e32decc5f9a48f999692c627dbefff010f50277ea3b0ad03f5dde57b7ad97a6dc867d579f6037fedb88
-EBUILD jupyter_client-5.2.3.ebuild 952 BLAKE2B f807026432d5ee8f7708f1a064b71e20e609c6fc8d7c2ff76d0f9fc4810f8f17b76c2c51c94f0cbc0412856ec7675d9e7158598cdbaa7f285a43faa55422f49f SHA512 04378d26190e45cf42f35a8fb11c24f9bab15c129535d27b09a89f79c44dc17d4c17f3b6276fda796d27f57c25d30e291c51ec88ce2a0efbda9481c249badbbf
+EBUILD jupyter_client-5.1.0-r1.ebuild 1005 BLAKE2B 02a999cad4bd0ad8a7e785099c3cb8b94e4dc3d9d7653b8287817dfb568f6308f09f7cb4e9b41d00da4133b65187f283775dd5ade3bddcf01e300eede6360a8d SHA512 19556140e92ef8a4ddac5c4274eb26ceb1d480883dd4426b269cb0c8def10c6b4446fa0be7780a1279a2c2ffdb8d5cbcd3e1e385aa75524082fc54bc9a0e633b
+EBUILD jupyter_client-5.2.3.ebuild 951 BLAKE2B 8354ba2b1950d6a98c7feaf41ff4bc7edbc42edc1f824ad47a97d6309d112730a5f571e5b1b20e8e6c8d110a6af833df87ee8c2f5149c1ddd6416e0d3cb4fac2 SHA512 87be54757dfe6c18e6a8025d8d8d9f4dc7eef84376aa3c839b86c35845f5738fcec9afc4a5067ea670c62d6453ce0207192bfb86c289720b187e149c6a290671
 MISC metadata.xml 647 BLAKE2B 39c5be4c32d971bf1aacf3d384b370fdcaec2d77fc675a71065bd5b124559b174b3e4b7f1ef8bbdae4fd3f9b873822f4a2af68b1a9e5c05425c67cd67b226ccd SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5
diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
index f1357b425b2c..09bba7902305 100644
--- a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
index df80a23326e5..e8954466c964 100644
--- a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-5.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 051ac7600c10..bd3ec98609ae 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
-EBUILD jupyter_core-4.4.0.ebuild 1250 BLAKE2B a86cd8f580353ecb3ba5d61c6d3e92b4738d81deed38559eb9838976886715e63e1b891a2f868027d9660604f4c27f5776db874cfb0ce1a43f5f9ab7c3d4cfcb SHA512 5ebe15dfd489d4da3775247c5a96b952c35f89325c0cbc19bb9a67b01140fe5ceeaf0068ff3df94a0e09deb433e56ebb53db2514cbcf70241a85d94dd7d28bbf
+EBUILD jupyter_core-4.4.0.ebuild 1249 BLAKE2B efde634f9bc7233dc7f5bd4814b5b8f6f6622e9ecdfa56076603f909761ef788030265e8a52887af0cc88e3d42da657c2af40b4b5a03338ea1e7b57b8cfe6d7b SHA512 9ed3c6c701dc4415b78d6718310da69733ef24509edb14cddfd9b4768380aa5c54fb42373d9c5c8ee06c4b1ea54b59313addd3fb02f9c2b20fc750ef58783947
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index aaba36fb5686..946ba98cbfbf 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 2ea5fde7b21d..62db582b7e7d 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -2,6 +2,6 @@ DIST keystoneauth1-3.1.0.tar.gz 217744 BLAKE2B 4e07c7f4dd6fc097c6838b2a18105656b
 DIST keystoneauth1-3.10.0.tar.gz 242560 BLAKE2B 40569c8078ab851d93ba2e4ecf3a3c77ccc2a74bae2866a0993e03021fb475f644a6b04956be756f67754dac31cbc3b53d085a0de82f5c7613b2fb6e138be427 SHA512 ed4451f26f775ea5580766eb431d563bc5bbdde5df24e529c2f3c4517ccfbb9a657e5af535fa6176d905922fc3b6540b5dfb98ce1627efe91861fdc23da8eccd
 DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
 EBUILD keystoneauth-3.1.0.ebuild 888 BLAKE2B 503f687fb600920941bc826c1a157b310797942135ad5b45fb94657fb409d6e8f8d301d8b2cd272e3c0f211d4fe8af0069a9ea1900142bdd6d898dfd03a28a51 SHA512 dadadd0754f365119b68199e92e6d7d63a2ab169f69d49c237321e8d2503df4359f46cd1d11f734a187b3142729de49c857458ab0d439a9a967306057f6e23a4
-EBUILD keystoneauth-3.10.0.ebuild 895 BLAKE2B ca18a052156a0530d6048aaf7b0b97b87cdfb8bf1e2de0e68d2eec452ebf51b1bb8b32d4da6e45f22f50df713eacdc39d575e02c60d0b051ef82692772142792 SHA512 5ec699a170241313b3897f435bfc881a6e901163fc674fad6e643aeae706ac38bcea388026fad8c7f3ce3ff861f011a506279838999146210477436c7d1bedbc
+EBUILD keystoneauth-3.10.0.ebuild 902 BLAKE2B 172616cd97261424f01a8174fcf1e176cf5c08fcaecbce524f68cc827b98953fc424d2e744db90d1305bc9229ad2d70c9c1472a583aacf1b1ddf01e0b038bbac SHA512 d31edc6dbe404e79b24e96ae1919a159c20823cc8cdb972d1f73ffc98288b3e5c182344cbcc11175cb130eab18953607d7887bb79be0e4c51e897d03f4b17c59
 EBUILD keystoneauth-3.4.0.ebuild 840 BLAKE2B fec1e19678873cf2c91afe09e92d7d59ce46933a71e0ba3d8d60064381aa65f0b8c11e223dd1b75ec00e6afa15e01e08529fd26bf0ff91c352f2befc16a496f6 SHA512 b3785bbbd9521eb91968fd56dc39b0f43138f146a7fe276e024b76e031cc23a5be995d832144aec4f2188ccb7fc70367e255fa2c18b6743bbb43c45ac266144e
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
index a02c806f70b9..a19b39b3f877 100644
--- a/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.10.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
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 317aa6312002..55e2ddd87c92 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,3 @@
 DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
-EBUILD kiwisolver-1.0.1.ebuild 544 BLAKE2B 2288b76d0747fb8553d7162e33a5e232312c89c33d89920199f093bd4d40419515c1abd98abe112530309f0a051a009805c1e7ab72718f7c151ad8bc47b1f09f SHA512 c6a070444270afb74d1f9097cca430a05594da9207617ff3612187da2c3a3c4c867f92a5627847d023f7319de2d4f54a18805de936f324e498b3be1eeba56e61
+EBUILD kiwisolver-1.0.1.ebuild 543 BLAKE2B 7a37d99b1b13611dd985a4936b474275a9e60e3c61054e033bb7914ea13319c082f2e2079902acd5d54d30ab79f95e3a48043d8eb16437c457cb1c70fdefdb03 SHA512 09bf034f5ece6111acf3486d802563c59ae60cbe9c517356e3885d8dac473079f61d44ce1e4b666da4bd7eaaa05f230451874f8e53cbea723735808ba00d9b95
 MISC metadata.xml 297 BLAKE2B f3bcf69a0615862f39b7182500b5f2b476786d974a7dac4ae07d7409610659ecd69bbfe13a926615ba5ef59a3438cba37ba246ab1dd3666e84bcba8efa03357b SHA512 8e2af9d77af6a660d6624bb67076747b79884797a2a1cfd32df0301e7aff0d2d4f8dfe48acb8f3a2de5d3b4c51ed647cb2a373d04e5a5d1e3abc763b270197af
diff --git a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
index de1d25bd72db..95e3c4f86d21 100644
--- a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-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="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
index bbeebcb4b0a2..cc9afbcb0903 100644
--- a/dev-python/larch/Manifest
+++ b/dev-python/larch/Manifest
@@ -1,5 +1,3 @@
-DIST python-larch_1.20130808.orig.tar.gz 88271 BLAKE2B 0a797c05ce5e177af608720a6711cd52d1d82929002ff98e51291fe0f918f571e6bae2d616e49835ceb0efe9436cd24d1c9b6fabcc316d73c06cf0ba41518a86 SHA512 84bab884e3ff8e27cc43e2520eb10fb7a38d99eddb06b9163e174329d69552e678ef81d606fa041f894794f0ba3bdf59ace3081f71596869e1167a0e23d56c85
 DIST python-larch_1.20131130.orig.tar.gz 86509 BLAKE2B f964bf4af316e010cc40513e3a767ee7d0f058ec78bfa417931ae0087e0b8d0e0c577bd99b5edfedce560fc3d21747a81e75dc1ed3527f9b054d3e8e55df7f38 SHA512 e661fa29043a5254eb3615f0eb54f6afbaf59020607bb72f621083e9f6acfbe92b1c978ce2be73336d8984a4a64ce6d0153556f0af0ca63ad53aff40f785d052
-EBUILD larch-1.20130808.ebuild 670 BLAKE2B 616e307de7755446f6c5050ca43109910cf1128441e09dc94d765d39f2c959cd1ed3e932971a7a996a056a02f6b0663c99e1aa7d862efaebac8153c922015362 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40
 EBUILD larch-1.20131130.ebuild 670 BLAKE2B 616e307de7755446f6c5050ca43109910cf1128441e09dc94d765d39f2c959cd1ed3e932971a7a996a056a02f6b0663c99e1aa7d862efaebac8153c922015362 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/larch/larch-1.20130808.ebuild b/dev-python/larch/larch-1.20130808.ebuild
deleted file mode 100644
index 7154cb4765f6..000000000000
--- a/dev-python/larch/larch-1.20130808.ebuild
+++ /dev/null
@@ -1,34 +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="Copy-on-write B-tree data structure"
-HOMEPAGE="http://liw.fi/larch/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-#RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/cliapp
-	dev-python/tracing
-	dev-python/ttystatus"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 9edcb334eace..15a829c3701a 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,5 +1,5 @@
 DIST lazy-object-proxy-1.2.1.tar.gz 28860 BLAKE2B fecf6830111c9ac317fae2ebeae624b4b62494eadeca08bc6cb63bd6a23132cd954a55c97efbede3b136f4bd20d2c35c861d3f89022403d7d777bf762c656e81 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8
 DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962
 EBUILD lazy-object-proxy-1.2.1.ebuild 972 BLAKE2B 86b1ec7fbcf0670a4493fa328a25a9aa52fdeb8f34c778c84ec03217bea602a7a059f17efde9be96fe46fee111ae004cf18a44662018d13ef946cf8ee84d9346 SHA512 2577c19bc8adff8dc23ec67804f7a7b8fedb7edcca24b8659bcdda59c2261b9a3c61f610defc22bfb9d265d8a99957aad0bd7113e8a70b1690d6a247355114ec
-EBUILD lazy-object-proxy-1.3.1.ebuild 1002 BLAKE2B 0296194c3670dd8138a6c4582067ea9eaad32e0fb4c5d8d2c46f2adb697caa7119aef7d7c920c2c4dd216428c7baa16d083280a599bb34554ce4de840c6dd276 SHA512 966de11450e8a8de7cea0784c9473cbdb1fdb4baa1cf52dfd19473c51bab03cae83d4dbd89fda6c8363cb88b73cb4aeb56f1012535f89c0bdb76474778975923
+EBUILD lazy-object-proxy-1.3.1.ebuild 1001 BLAKE2B df90327a590d1e9622ab37088c6121f9c5bbbaa4af43cb9fe12ae2f4cae1ee43b5f859ae13856408df22e126bbc41585a0ac234d254054b06859d8982c0f599c SHA512 8d8d341957c36aaeab1aa4536b24a1fcf03a7963283fe93d94f23bfa91ecae9e11147c2c3d64d74fc918f97535b74982bbf4b6e1d07bf416760e9c0d38fad2fc
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index 886cdb2fe518..6077f718e68d 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index f4a0430c0c22..341ec4a5af0f 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,10 @@
 DIST libvirt-python-4.10.0.tar.gz 192707 BLAKE2B b128bdb4e33ce3ee826f30ef06cae080df4da01fdba04a65747ce6f6dbf6b1b4383b2dc010c3cdae9a33c2d9a816f4f5214d8f095aa719056af94f723860a70e SHA512 30fac35ae04c18b340b5173c2a1ccb867147da3673a4b72ad612fb5f03b95ee9259459ef9e11cba4a101e7aef4b71d13e1b79a25eab39899a22c0e8261aba7ac
 DIST libvirt-python-4.5.0.tar.gz 190016 BLAKE2B ba3aa68b2de6179cfddaff54bf96fa876959d97e72245ccdad8f9f681641166f5827d5244ae4c18b7a7b90a3201b3a797d30c2436a6ab5fcdbcfd56462348ba4 SHA512 14572225c2f5233aa8cb7257cff94d38effc4d988aac36108ca510dcd442d8c5194d6b25bddb2603bb1e1bc4dcb284f103899ce81063dc6a7994d78beea355ac
 DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
-EBUILD libvirt-python-4.10.0.ebuild 976 BLAKE2B 94acfe059fcf5e53a03fcf74b9832fc43a568f11ddf1f053a34995d72d2bf55b16749c77916a4f14874eb42403d00e879c49043a72fec71190c025ce0bdf8421 SHA512 c0750a64152833580e078d931e37d91f671781fdbc3d4b4091937735b2788c72c49ec0371d4b1e39888bf4f3e720d8061b1fb5002d62b017daf5e7caf2554d13
+DIST libvirt-python-5.0.0.tar.gz 192726 BLAKE2B 1ab4d4430254a1288714db32d76baf4a78f733bd82d33cf9f6a40aadcfac9c1dd73db91d38326a68ad04b8454f4c6417a16f07f9ecdfe8ccabcb0eccc9d13060 SHA512 318ae32f4c59b6cd278c8d07566e5e5f34759167084d4c722687d3cbf19efecea3a0c2a4ee37f42e58aa3f42f07fdd50bd9dd0539002388a7f79b138ad434dff
+EBUILD libvirt-python-4.10.0.ebuild 976 BLAKE2B 036220930d4aa141ee2e499ea9504a32f98995bee9adb9020e94103e6edeaa3bfcd55bff0336ae1ef4d0e6c745d85e9af8035c5294688c2803a0937fb73eb07a SHA512 873a6c930ef38a21d050fea2b0e149ac61305f686600a8ecbc52079367508c97e4ddaed9bf691a245960d340d2433c4ff42095883e8906b25e9d6b1f7a030da4
 EBUILD libvirt-python-4.5.0.ebuild 982 BLAKE2B 4becbf00df8460246d3e933df6b701c95a616ac6f26878acd29200e5d12101fa94edf59ccfd9847d2ee03e94aacc1df78cfcf2da66973021a181962c885a84fb SHA512 c1c53e1a5d7fe3e71a7d5f99d943c1da3e118151fe158ecd0c50f8f0d40a9ddad370759cd65bd32453d0ba2d4a2f31b7b4a25718f530e784e56b39919345f574
 EBUILD libvirt-python-4.9.0.ebuild 983 BLAKE2B 17ef41fea1af1a1abc363f31e4d69e7f720d06e4461daf5d27daf51dd769e3b114de403cb2ed76cc35b8990c949640dac49ebfeed9953fb836975120c11a05f0 SHA512 01a2bb6bf834d53d030cd0bbe1023a7a170e3476da923171d3266ac217fe11a2c7eac836a129524f4a487fd4c7d77a424efb6ae1f222923644e733660067af8d
+EBUILD libvirt-python-5.0.0.ebuild 976 BLAKE2B 036220930d4aa141ee2e499ea9504a32f98995bee9adb9020e94103e6edeaa3bfcd55bff0336ae1ef4d0e6c745d85e9af8035c5294688c2803a0937fb73eb07a SHA512 873a6c930ef38a21d050fea2b0e149ac61305f686600a8ecbc52079367508c97e4ddaed9bf691a245960d340d2433c4ff42095883e8906b25e9d6b1f7a030da4
 EBUILD libvirt-python-9999.ebuild 976 BLAKE2B a427ecbeaff49398f9e9ac09674e881c143bd5e966b6b90d0d998c70dcffbf64419d651556e954694fca4807e42e7b1f84ab34f91d9618a93e1c6d106c65cd3d SHA512 6d7e5753d16cb3402475086d4ce4ce5d95984c2cdef6444d6ed1662fe6c24950826daf892e5360e0bd208ae1c3457b7986b51ebb877a401897e7e032e1f5ca27
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.10.0.ebuild
index 514949ce2b06..92f5219f4a06 100644
--- a/dev-python/libvirt-python/libvirt-python-4.10.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.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
diff --git a/dev-python/libvirt-python/libvirt-python-5.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.0.0.ebuild
new file mode 100644
index 000000000000..92f5219f4a06
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-5.0.0.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=( python{2_7,3_4,3_5,3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+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/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e002d52763ab..50169b7bb477 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,5 +1,5 @@
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
-EBUILD matplotlib-2.2.2-r1.ebuild 6349 BLAKE2B 3fbe4a41761a0c6c4ba3b79469815cb342b05c6e74bb26041877927fcf7e662e2e7a46d321b43fdcf48ae610b835083049731fe317a3057780e73b4a302a533d SHA512 cfdab393703c6b1106970619ab90d83896fdfaa96e3073cb6b41b430ff93eee46fbf2191cb54c993cef3869f581bc050e4507c849f713761a190a0c0725c1b5b
-EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
+EBUILD matplotlib-2.2.2-r1.ebuild 6348 BLAKE2B d24e348cc6708a57c30639da6fdabfa6a81c8303fe174c1b18aab7f19e23d564cae4e489ed4cd3c3fee86a21235638a6eb76a921ac0cd71bfa08c3e7de287544 SHA512 a36012d13d84ecb15d2bb219a86f913f3a8f19190806a317a859bfb8cd9ee4a384a3ee77aab853fafa3fdb01bb493128ae5211c4a6ac5f7baa15d50c1b1b9e8e
+EBUILD matplotlib-9999.ebuild 6301 BLAKE2B 8cccf21f21ec444a0c96c764c7960f7254c2881f949af8897c97ffad68618cb3d7dd1fc6f0b98786d3b39fa938a033c0eed62793dc32a6b541693715e5b87ddc SHA512 eb76e188c88c693e9836c15c562f4deb86561fc68a5ecb543abbd2bc5423bd761385896bccefacb885a5306854386c1bb27e9890926a8ed351fe6d305c693f52
 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index e250f5c8bf73..75c92266f98d 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 98ec197ce5f7..ad0702ff7c0d 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 PYTHON_REQ_USE='tk?,threads(+)'
 
diff --git a/dev-python/maybe/Manifest b/dev-python/maybe/Manifest
index 23f9e904ec21..03d35829a01f 100644
--- a/dev-python/maybe/Manifest
+++ b/dev-python/maybe/Manifest
@@ -1,5 +1,3 @@
-DIST maybe-0.3.0.tar.gz 5738 BLAKE2B f41094425bbcbb1a691b7b56a667d840822b9a8ce717ae7dd503c214a11a0309f2c9311bc9c800b1bcc17838352ea066afcc48e22eaac2c1a1081cb652dc5c0e SHA512 512b7b5251c27a64891bd105599b5625331cb21d40dbf7d1b88b56375a5ead484f02f87da6410c01682c180218cae7b0df7a9f92ad7a69a862b333ee36265152
 DIST maybe-0.4.0.tar.gz 6105 BLAKE2B 73052b156e8940769897b5b9505286d1b78cc156976445d5ebdceb6cbe503ce079872836ebaab5fda3fb77798909467af17bf37451eaf563ca9add7f2470aeb7 SHA512 39882c69375b408e809e899b997675c9395ddf50b8625fd04a0d78cbd041f6138e491b76578c8b530ba122b921c694bc27d256eab7485ea4638330f6e0411129
-EBUILD maybe-0.3.0.ebuild 609 BLAKE2B 942800fc3bc3570fc547ee4de76343a18b13ea7bd7c7e768987c218e410841791101edee98c4bdfc8ad63575a10b256da092d88777b5c4b7f09d06a7f2bdf079 SHA512 e704c68aaf73b73cb347344bf896a8934514fa9694910a86d016bcc6cc8c3d48d3cd23e685d7a9add42748afc833534675d85f5549736f72ebe6174ce734704d
 EBUILD maybe-0.4.0.ebuild 706 BLAKE2B 721442ff309b1ce138db6787f2ef06e5a9436c89e3175ebeb1daeac8f95d7389d70e526b01d0e1b3b381c872534f6cddfee820fb659465706f93e4518b72140f SHA512 cfabacb18ce953702099f7a7dc231585e8425791c31fb7376b955878bce845d94e3a051d7bdcb725f535516bd8903e53711593da23d67dac7acf98ef8391b046
 MISC metadata.xml 432 BLAKE2B f76231919313dd725c8ffb701db9153ee9c08ffbf7833dc0d36405359137cf71d5873aed9aa437e9d34f448bd4c44b97477bea5e622c353575ca4b6691d81aab SHA512 1c30bebf7c6b34ba11e4f8bef92f9a2b4238eee49c19078d817063ad35c45008e8c53bd9f534677325005ab29c847c9fda9a2cd07c722e3250b00a8d07d41b95
diff --git a/dev-python/maybe/maybe-0.3.0.ebuild b/dev-python/maybe/maybe-0.3.0.ebuild
deleted file mode 100644
index ef0537150048..000000000000
--- a/dev-python/maybe/maybe-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe https://pypi.org/project/maybe/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/blessings[${PYTHON_USEDEP}]
-	dev-python/python-ptrace[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index cc63c3d192e5..c16041c42967 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,5 +1,5 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 555 BLAKE2B f147db69dd5c55397dbb7048f8da70c7a1a123e61561f76481d38e9640a8c88fe5f16a2202635d3e9b9e3269c8f5107147f1f08be6a34be6f821d0563a1177f5 SHA512 01b50a88ad0e946783fa9ec1bb541f602a81da4951b689eab4f7581c7914e9d59cbf0c26bb6df6a8bcdca7fbf8fcf33d1638771baafe6b526fc8697c8e30aeab
+EBUILD mccabe-0.2.1.ebuild 557 BLAKE2B 3df56cdf23c81824b630c489de5ae869d6f766a7a2b02dbb8745e5a83bbffc697f1c84a4643219a712d5cf84ead99562dd23165200a48651f845b075d5c4dc16 SHA512 de71ac58d523c9dac9832af3e2946ca3bc85de7d7509d25e6f2c90824547ae5c3a8aaf2b9dbab98ea042448d81b18d19f81e10358d820d669a87e32bdda65341
 EBUILD mccabe-0.6.1.ebuild 887 BLAKE2B b5a622e129858488c551930f9ca759de6e7b43cd532b31e79c3517f952eaf9e3d0b27fdb88ffa81b2bddb228290fb6729ef6369e89802bb3b7f1e77d85ad7951 SHA512 8bf4174aa76de75d34b31cc94df0fed185769dcc52ce8654dbb83e7ef36da05edff40bbf67ed606f129bf647b1a33a98b43f97bae7bd9dd9cd4b6e1de3e33782
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index e4540b3038f8..82b4598dacb6 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.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=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index df1f6e67017a..90e3db6fff48 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -1,8 +1,4 @@
 AUX mox3-0.12.0-RegexTest-python3.6.patch 652 BLAKE2B c7a53ec43accd137c100c6cab6e208a5e88ff784a59b01b2c71316654f9fe7f39273eae7be8a8810548b25636864b32176997a19020c878ba7861b3e86d74c77 SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6
-DIST mox3-0.10.0.tar.gz 42424 BLAKE2B 124bb4525ed6d24ebf75037c1f049fc851d64bdf8eed29c26fcdabcfe5f6211aec7f16f5038b397978383bd11a81588b44aa790608bfdf5b8596daccf3230542 SHA512 1f56e17ae150339cb2f33dca065c246cf0ff2f633f182336a576e9ab0bd4512ec8f42a4cb128f38ede33fe7e796552768465cfc626abe4f734b7a06b4625710a
-DIST mox3-0.12.0.tar.gz 42377 BLAKE2B d6a841c8b28d47f21ae8e6f65abb7e2079762d45ccf670decf5815c5a2638af615804e711534ddb0ebbafdae6609f30e50ea20f224a7ccc5a02148f1ab0d23b6 SHA512 73e0215bf127589f791721a0cb9b8e3dcc379a23199339e370d641850a0a14c264eb9db94fbb37c99f9925ee3ebd302de14ec12fe1c8809dd3ca9c10cfd75468
 DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
-EBUILD mox3-0.10.0.ebuild 2093 BLAKE2B 23078bba6c6a1a04627b8c1c9d90fb4936742d061d14fe86a74934da28deeddc7a43003c3306353d6870ce15b404edd895b0cb120e35fe01de2ca80e835f816d SHA512 65dafacb31908c9e8291ebb5e3be9c8010894b882ca0f3ffec2db33da5635f3782894712ed491ef95e337411e7c6e52db4c374511e79d3d5c517daf3a77021a2
-EBUILD mox3-0.12.0.ebuild 1464 BLAKE2B f4cbc1508ddd3d3a29680e9db11d8d8a7bda44b489247599ee54befb9e2e5acc0b2a425800d952136bbdf7e1c144b9c2fb823044511e5e3eca91a3be9838b04f SHA512 07d475bbe8181819ab03d648930274ea47ef4213f41c11e08fa6958f29cd74c36e6582ce2fc21564082dae51112c48fea5add532cc5985f51d12350482148cdb
-EBUILD mox3-0.24.0.ebuild 1440 BLAKE2B 8a26040fa7b31ce078820eb7dbaaade6c756cd2a67517d4b922e1a642626c9ade6cd92b5f676a3b1d8fa301cb7ac94dec9d6c36041c77ba1f8f331a3682ae436 SHA512 16f32f0dd82a39d9c9fd8fd8f63bdc79c35c07d80ef30b662fd4d94f84cbc33badffd1e86a8885ceb88401e9abcf9f65e5a867298d83b7356692f342889add7e
+EBUILD mox3-0.24.0.ebuild 1439 BLAKE2B cefd8e34b204b5b624f55baa9e955fcda875a91f13eb53b1f88cd224c3b19d4951ae18e82cf13dacdc8373c5784d6930c4210e8d26202339f50be61bc5a4e64f SHA512 f2ecb637705538aeaf998be3c46b5693311ca1b423111d13ae2917d81b4a0f3f297a989dc8dfc5c2e9022fcac553d7403f9803b4c84d9c8404a44c13c67be323
 MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/mox3-0.10.0.ebuild b/dev-python/mox3/mox3-0.10.0.ebuild
deleted file mode 100644
index 0d53cedaed79..000000000000
--- a/dev-python/mox3/mox3-0.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-DISTUTILS_IN_SOURCE_BUILD=TRUE
-
-inherit distutils-r1
-
-DESCRIPTION="Mock object framework for Python"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
-
-# NOTE dev-python/hacking isn't actually required for tests
-# >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-# <dev-python/hacking-0.7[${PYTHON_USEDEP}]
-
-# NOTE dev-python/pyflakes isn't actually required for tests
-# ~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-		>=dev-python/flake8-2.2.4[${PYTHON_USEDEP}]
-		<=dev-python/flake8-2.4.1-r9999[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_test() {
-	# This single test fails on python3.4.
-	# I speculate this is due to the old style classes going away but have not
-	# verified this in any way.
-	if [[ "${EPYTHON}" = "python3.4" ]]; then
-		ebegin "patching mox3/tests/test_mox.py for ${EPYTHON}"
-		sed \
-			-e '/def testStubOutClass_OldStyle(self):/,/def/ d' \
-			-i mox3/tests/test_mox.py
-		STATUS=$?
-		eend $?
-		[[ ${STATUS} -gt 0 ]] && die
-	fi
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/mox3/mox3-0.12.0.ebuild b/dev-python/mox3/mox3-0.12.0.ebuild
deleted file mode 100644
index d34633d97b0f..000000000000
--- a/dev-python/mox3/mox3-0.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock object framework for Python"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-PATCHES=( "${FILESDIR}"/${P}-RegexTest-python3.6.patch )
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
index 4a42c64cee2a..151174638541 100644
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ b/dev-python/mox3/mox3-0.24.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 86fbc08ef54b..ab44134d5369 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -2,6 +2,6 @@ AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314f
 AUX mpmath-1.1.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
-EBUILD mpmath-1.0.0.ebuild 949 BLAKE2B 754a1b4fe71fd30363daa59304106e4887f7fbb8567872d2eff73bd3651516d9b74f664014521580f2696a717e9472301321114ff60d5f4e80032834fed6cfd0 SHA512 1f66dacb4c67b2a132a45727bc2df816760537f69fb3acd109f601c3e0108d793c237546dec4f9bcd26e87b2a2e2817b72436941c473438670491d79482ff08f
-EBUILD mpmath-1.1.0.ebuild 967 BLAKE2B 75f22f52e39bb7e0240e94011f4f66b4fa3aedc2ab0089447cd79c9a90ff973e5dd12735d8d254868776f0deaf0b712627cfd9e808cf394714b7c379d558d17c SHA512 bd56c669183d9c3f4126e238f88e764950361b9c4ad6233da4c7fb42dc1a7d0d2dc75ffb5b663de86320927ad159cbb73af95cdf16a7a1c2cf2d109f3b2d11d2
+EBUILD mpmath-1.0.0.ebuild 950 BLAKE2B eca7163bcc0c1531df273d9785fb4304e68c4ce87b25eabe212d456174a15f6b5ab42de999520b17b4053bc55c1a6bb50198bbc3c344abdbec006ba75b598a69 SHA512 5aa4c51dbcf0612a47b2cd6e98b58042164c1135484a142362fe72c262aea2edf284215d2c2baec14a4edd1a1e4422b03b033d092f779a57597ca59a23988d77
+EBUILD mpmath-1.1.0.ebuild 968 BLAKE2B 822c481dd6938212afb87d56115d1ab9c3120817830d6861538084a025794a94c86c3ed306ae1fcd1aef70c43ae75ecb4820c204dfc9ebf5fab03fad3c1840a6 SHA512 b819cfa4f92e6277d17cf73b5700edd03565c3257864da7cd9e937708e30d98c6e27928a3f4bc99e5b12639448ca8dbf962d37a95144120587476ae3b17add56
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
index 2b17f2bde3ad..fbbd15df69f3 100644
--- a/dev-python/mpmath/mpmath-1.0.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.0.0.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 08a77279f3ea..f90e9a5b5e19 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.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=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 0741c946d7ce..d304f7ecbc2d 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -2,6 +2,6 @@ DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8e
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 769 BLAKE2B 55595b08834bdab3807098fc725c5b010c4d8c82564b7cfa02008f00a4977d076c424d3120afd7f9cc404a2ce5e0052cb71301c97266becfbea7fa1e76b340cd SHA512 7e530dd4a2c30903fc98e5fc0aa5671bdfc35051ad2897634aaaa51e32f934f4e465815946777e969533f4ddbbda6cb371a9c119f486f4e7ca6a7988efb2f89f
-EBUILD msgpack-0.5.1.ebuild 766 BLAKE2B a89198b22e7cd9ef6e2805970f422cc26da63e1b4fdf7ce5144f220b7c291b98580a977d1dbda9bc3e7265e9de3fe9bc07df7ab933d4b644819512556793f1a7 SHA512 ca9ca844dec32b297eba18a615a4cfcd06a5f7f8db079c24f855385f0b96d3b33242643b1dc0831c607328bb61bae9e4fca82fa43c0c9db2ef15eccffa3f1f0b
-EBUILD msgpack-0.5.6.ebuild 1056 BLAKE2B 4fbaa865013162d3a1ddaf94b49bf6a0d784dc70232a2b5df2dcee31dc4084a42fc7bda88789ad2e265fd5e5bf9bd5f35637c46324b8f8ae308b7a131b1ac2ce SHA512 e39152c8d7c6bd1b4db26b572c6e443d5228d195a6885c22ddff3fd3374a135dbbbada68405f919634aa9a48fd9be430a913156da2d966134265793aa05b8acb
+EBUILD msgpack-0.5.1.ebuild 765 BLAKE2B d294ae5dae5e12ce7c01ef1ac732799421ee8c9889b0ef41515bec3c0d1a978d49fb0e13dbd15e674dc5e6479d0044913e705c65fa3d801390fba49bdb118a10 SHA512 87830eb4d0c1465da706b471d738a70e6e7cd914e7bb377b538634b95a7e4498fcb36be368777254e5dab277be13c91fad7c58f0b0774b4c79560f6258083e28
+EBUILD msgpack-0.5.6.ebuild 1055 BLAKE2B 717ed370a9b4b01cb31f886b14c3d62ae1bcc7315c413520ddec567feaa538e5717cd302d12cccf4ffd63e1cb3eaf0ffb4ac0b8c4cab6207fc39dc92a5c8eaa8 SHA512 2a70cf5e9965c59d43439434055cb950883b9e9503e307b793c270de6df5e9846316119cf4bcc9d25ee3b02d29b4964aa0febeae4871a56308d6bf8f24df131a
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
index 73c9c38efe44..fc0b57fa9b50 100644
--- a/dev-python/msgpack/msgpack-0.5.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.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=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 74000584eb74..8c00cbe126bc 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 55d07264edb8..e8da920e5bb3 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 987 BLAKE2B 6bdfd39b8cb18bfb9656c4587ad8924b802dfc7f3994cdbda0b0666c3bf408895706171932971eeacc7a4a668d9cb161d50d41d0cbf99405b3e1fbdd92b027b4 SHA512 d1c36a28cab8549de17df791d09a6434b4609f6dc4eb0201f38774e0482e8db694dc419e8243f6b5fb82f6a370a423ab33157e0ffd59da3b407d2d48b15820b4
+EBUILD namespace-sphinxcontrib-1.0.ebuild 983 BLAKE2B e3f15d1a959164c9d7ac79b127bfecda76597e2875f5c297e1f613eb3ad5a5328ba131c5d77d911634444e478c08b0f8254175d91a098ce608486e2e35d2c1d6 SHA512 2cea293b63474ac0f31a64d65583b27f44e2d0596199239e76e48d368c8e22dd87f579b2931bf579bd1df1393c0c96f43d902ec5573fde13b15bce82186567d5
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index 4b3f31512b2e..cf2a578c87d6 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-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
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 0d1b06427c55..bb026301d92d 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,3 @@
 DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
-EBUILD nbconvert-5.2.1.ebuild 2134 BLAKE2B ec64b45f1b9845bb9bc027d272cfe80a591d721858176fdedf9ec5f06c950cbe6aa354b2444f0318c39972f5a92eade2878788523fcccf16d10213e7fc1ba14f SHA512 67987d21d08b79238f831593b08f00cb962fc6799af62a97ea9ad4beb5044b2876fce05f264b71719ceeda26f45f6f73762204cfe421ee3a158d338d3194ba82
+EBUILD nbconvert-5.2.1.ebuild 2133 BLAKE2B 503f26718ac768f77471ab9a15916b24dd32de247a79164300aa7ebef7ea88176475bb49f67b8f5ea6a38c8d006bf4e4ea6bb9155e487a99b6e021dda5cd541d SHA512 46f67b6462779379e99eae03f49940081ad1ad4e9a2c55f15ee12f5f01db6cbf00cf7f2bfbafe168c59b804154f6ddbc22656f78b532da62011e69087c3420fb
 MISC metadata.xml 534 BLAKE2B 011d472737f4929968f44c9ab3beaaff8938a4550096b8abc2bc7dc72acfbde4eb745527a6f9ce3d1188bdc09f11607db2d9515a89b53793a88259513cf0056c SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8
diff --git a/dev-python/nbconvert/nbconvert-5.2.1.ebuild b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
index 37409d046e73..3d79ef4395c1 100644
--- a/dev-python/nbconvert/nbconvert-5.2.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 7e51698a4f93..bf118cbc5ddb 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,3 @@
 DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
-EBUILD nbformat-4.4.0.ebuild 1288 BLAKE2B 45d2493a1658c073fcae78d04cf78947dfb8b376f869647263c44c66965d3891906582d7db4c77fc698fb0d7cd9b9b5bfb5f2917a573719b734f1119a539b825 SHA512 a71ccc0b09fbe55d2e39d15fc056d6ab45355fe8d619115617141c985455ead0d2db7e7cd10d875de95e8c17a1d29235e00302946989d4788c9a0b0ee7b01f52
+EBUILD nbformat-4.4.0.ebuild 1287 BLAKE2B 780564fb410c1bf360cd79b1991d44dfc7b1e81c5d4c0c5dea039bbdfd48c449d30881a20b727b5c071259b7e1f97e820b3d6dba98b00d5d0526d1c8534f840e SHA512 ef3f7a467583febf88c37f23ea1db6d01fb4460a9bb1a36ed67d3f5d7f05264304b482364792b515b45f6034f20c4d4cc8b2850a2ae23765bc8ee7085b251a46
 MISC metadata.xml 647 BLAKE2B 0d115b188530f78f963105d8e9e4246328526a00146c79590a288f822a3326521950b0be1fdb348cacea47729c6600a99a82e57b02e191147cf0a05821187d26 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f
diff --git a/dev-python/nbformat/nbformat-4.4.0.ebuild b/dev-python/nbformat/nbformat-4.4.0.ebuild
index fa1d57d19a11..23e45e233342 100644
--- a/dev-python/nbformat/nbformat-4.4.0.ebuild
+++ b/dev-python/nbformat/nbformat-4.4.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index a887c933f9c8..62b7dfcc4933 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,5 @@
 DIST nbsphinx-0.2.14.tar.gz 98368 BLAKE2B 2ce32043fd3371d54b1922f973b9f8b4fc1bd1ace05fb2ee4136ed759454ebc5b3ac34030156d15a72d8e58bd739e7a4bc458e2cb26b8f80e9498df47c857a7a SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6
 DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12 SHA512 5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617
-EBUILD nbsphinx-0.2.14.ebuild 669 BLAKE2B 57b04296108b499197f2e6dd3cedd90dfb379aafdf7481afdc9bb1bf5ae5effffe9812c950f85334ddf1b1086a312cb3c0d4eaa0f7dc745bae94e0ae289ef831 SHA512 0a1753f26e22dd30a641dda079a5f99273ff99f9ac0890e0f5a935a68ac76d8e8f1c52be8b7eddebff6b656451d902edd4da92c562bf49eb28883c86f614e2ba
-EBUILD nbsphinx-0.4.1.ebuild 658 BLAKE2B bb0c8c1a77724b949c32632ff2f2a6105f17844f54d3a67f3c5e4cfe428006d754c12f0b2df00674313504d582f5c0ad3aa866ea21d7b6c429864c8fdbdfc0a2 SHA512 2978811f7988cb53d456bbec254be2b68b0b04af616ef51072b09a15dde5f92f36dd94c2ae097c621ef852fe1be0c9f2bfb7c38c73a7cd23a1858255699e6004
+EBUILD nbsphinx-0.2.14.ebuild 668 BLAKE2B 6f7d3476dde95cb6e24b2e034b181300395d91817572075633a8f581a20aa4c4b36da6e0bbd2ef508a6cf35b750f05b025bec802eb1554ddb5e31c904caa9a7b SHA512 87bb7647cb9a931702fe03e89b2f8503c3d5796d5885573df32f52b73416ca39bfd6995b01ac5411f4fd4ce7dbe9eec6c50b0cd39953c23e61b677925aaff379
+EBUILD nbsphinx-0.4.1.ebuild 660 BLAKE2B 209035d404f59f4876bbe96d27fb099c0fa6d8d188aeb7c3397648003aef6315136c507128f8c1c126538b9d0ad96630bc878b3db0fcb79298d5a041264ba436 SHA512 6120c632f19fdd9fbd4371849aac0695249345cc1e0b57d19be385007db8b8deaec5722f4438e8681b952f6952e13f6e64331cb4d442a5bc015865a6b622595b
 MISC metadata.xml 809 BLAKE2B 2724ffcef846efed97ee16e7395b3362596c46347fda07bb418469f3e39f06e0523177e7a8bee35cab7113de6380a1b7ca34a6b8bd108e765796fe12d4fcc478 SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
index 2d245d087a3f..c8242b92108b 100644
--- a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.2.14.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
index a8a61ca85072..e472fb1ade7a 100644
--- a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.4.1.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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 50e89f9a05d0..d043047ddace 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,3 +1,3 @@
 DIST nbval-0.7.tar.gz 51805 BLAKE2B 3d1089cd480832847ca8ab5c64b69781216d4fbf2b33f7cb6a26e321062c3def85ab9620d3190451369f70b0051ed371e2df01bd0140859c98db3600cee3e543 SHA512 f146910d7fbd6a1f18b3d9ae006a1b252cc2e038f8a316463530b564e007b4b4e0b2daefbed7ae9ec7e14280f6f004b437c9570fd4d1e959c53165dcdf3cac5e
-EBUILD nbval-0.7.ebuild 815 BLAKE2B 833f4d635e0abb96d4ece255a38beddecfbc98cfa0c811b0d5a8991af5201f5e6a0a91bd4cce9e3a48b30d57ef20b221d1fed2f544a0b01a549789043bac0a8f SHA512 eb4a8c39e73420999de1341b488b9757f56aa5402aa7ffd72ce23593be4dc73c61b91070983dcc315afedb9ee426369dff5c756c2f766b17fa0dc105fea88bab
+EBUILD nbval-0.7.ebuild 814 BLAKE2B cc087b84af57038b03a9d2284f2a3bb3f0ca849c07b268fe3e6ddd947a9945cfdd5e099633b4043b67def32eab8ef3c3a979d52d2d16f5bb3fbb2b365965e273 SHA512 c2fdb26d0b07acdb0eccb015f39a90442f6ecece7d1209b6d22e7f33d99bc53bbd7461d64a7f9be1e3c7727965fa003df5f8689974cc118681bfa73a78f197b0
 MISC metadata.xml 1206 BLAKE2B dcac4a50dae5beebee0b8af144a0666c87f43474464d06a7ffb5a3c5f02501f760d346f9c10768a7065e6f5a054f2aa8e664a6f5f259306a6db691d90446cd53 SHA512 2408122c980076cea7021853c320bb48b93bae5cf20b4101c07681ee0ddf8e741ca39789b884ed04f9ab0ccb2817e9610387e6efc1dac512dc05c9c9126e2e36
diff --git a/dev-python/nbval/nbval-0.7.ebuild b/dev-python/nbval/nbval-0.7.ebuild
index fbb65c03f937..7d8db1038302 100644
--- a/dev-python/nbval/nbval-0.7.ebuild
+++ b/dev-python/nbval/nbval-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 1b02fca8e9f1..0e2e51723474 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -11,5 +11,5 @@ EBUILD netaddr-0.7.14.ebuild 633 BLAKE2B 8f246484f11c771db1d8a8f67fb9842682d7f09
 EBUILD netaddr-0.7.15.ebuild 748 BLAKE2B a5229d505b5cd40b78d81ea194397ab7db3f74b8cd6d9d2792c733bb5fe747bac8c35f2db92aa3412c0c9c0aba0dfce1275abf035187d409ec427e6eecf695b0 SHA512 c3e0990ce985d76509dc926ac70fd8e48ece9f1a9f237f9ddca92e6168edb2476116f292940a59412729a350f62a8d9375fb5fbf366c5eb68683378b72e5a187
 EBUILD netaddr-0.7.17.ebuild 674 BLAKE2B 677f529e83ce4d27e7d4694805ecc78a19eff1b3e8d0453c6405b70777d83b4b7c3ce9a87d281ef65db7eadb818099fa928e625eea18dfec66ea8b3899902d6b SHA512 89520271c2d55a275efce32cf55abc4fe266d448d6da19a4d6e934656fa404c29fd3a7560de747c5be5c080d331d52c933ceac457495dae3658de4b233e251bf
 EBUILD netaddr-0.7.18.ebuild 690 BLAKE2B 2ec50498b9035790aba9927cd160e51ef9f8c6a721872b64adae6dafecd1b75ff9c634db2039cf63dcfd404b005ac2c543439a1ec5af8b735c5925ea4bfb8136 SHA512 a0fc6116f24f73d4b4cb6a6e25e65b5933bea02a66eef7db6f0b6665165241a251a7b88404c1831abe88becef4088d469aeabe3a306be5331b35530c08647894
-EBUILD netaddr-0.7.19.ebuild 729 BLAKE2B 8733c81e007b4ba2be613add20c22c3f86d89a7774c9335bf44ac9f4a133c5b2698cd7db3723f8c998d6c24596c11076ad278b767da64871e6f9ff4600696499 SHA512 f6fe6dabd619efc90e25e8d0f9cde52e5a0760b9cb1a228140fea92e09b7eb61528d796faad0e724da38d88f1dce6dbcb83e5324f713e82233cb3f2542d8d9ca
+EBUILD netaddr-0.7.19.ebuild 728 BLAKE2B 227dc97b29026c00f1a87f527987b4cf64cf15bcc02f0deea8a57690b3f71983e0c1393b1a76837c8c2d74dba706e5dc6914821a3617f45916f09ef52864ad79 SHA512 ffb645b1143d45346a3d1b8e08a03a421f285c0370cd7da5ad995838171e25a1f8fb046b4477830472bb778258ea7b1803332ced96407d23978a4374117102ab
 MISC metadata.xml 486 BLAKE2B a7a912615f72839971663e2dbbf5e4bb7fbd87a22cc9bf1080edb6756553f34eea3dfedb7487df85f6d94b0d9d835f5d3b5cecedf7f03e54af2026fac5e09be4 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index 4266e494c78f..1da5d51b6ba4 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netlib/Manifest b/dev-python/netlib/Manifest
deleted file mode 100644
index 848258c6da18..000000000000
--- a/dev-python/netlib/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST netlib-0.10.1.tar.gz 299633 BLAKE2B b03e1586c2e062843644b15f6bfc58f53d5c2c6af3ab5479c2400fbc4552dfccfbe9a7ee932d04a6306069e6284abd07d5b3702c602212722f137dff801d384a SHA512 56df59b94b6dcd61809f7319dcfd6807294d0dd1011d64d6b26beb50e3217052a96b267f1facacf46cbd0379a29df7ad5f68ee025b64b7e8fbfd31a9b4d06469
-DIST netlib-0.10.tar.gz 60256 BLAKE2B ee4319f5c060a7c668a0a950c411547c3e21c34bd3fc262a8cc939c32e5dc4529feab3797a822c7dd196a2e66472dca0ce9af6deeac735e1eda308e58f3cd84f SHA512 e6897a1ba28942eb30f19b4876bf1fcc03a83ec619e162ee09d9c3ad3348cfaebf9b413fdc4c534c56342270c0c767f16b63b79efe51d6589e864e9b51742f4a
-DIST netlib-0.11.1.tar.gz 43539 BLAKE2B 5cc49aec0be3eabb4d3fbc301cb14083a2a3c2726a6a4abd05d24153886d45a79b58a8a73300a74ca02a6586bfec6cc246ae2e10a9df00a74b4ea50d426a0d85 SHA512 1682bd73d0ff592ad8ec4a79c1f4acd1267440ad0d120a5693f66fd94bfa10b40fdec69b4d43052952a3ecf64d27cb928fd3e5747f54acc419e50c3e1d3b4fbe
-DIST netlib-0.11.2.tar.gz 43569 BLAKE2B 2705d503aba01b78177cb8cd35c814adbad21e413e47f31bacb0d6063b1ef7e3be7fc9548bb64ba4ab0d62de3177da7c077a96e0dda5bd96478311b6bda2f4b7 SHA512 ef1b489c5affb4bd7d840af955c50fe6c180b179ebe0a4c67f8005a4e02f03e1ff0d47f3b40da9aae7fc7bc179f82203a4ab43798406a917ab1a1b29eebe5443
-DIST netlib-0.12.0.tar.gz 53923 BLAKE2B 2099043a8c25a80de5c7fa300d8d754359f2d503d1ce3ee74d077f6cb531917aa148c36677d417b81c79ed95764f8ab92ed49357bb8f269ba1e64af031159c48 SHA512 18a716e084eed577d7731a44cebbcfffcb58140ae808273d683df7f95818fdc990e817fe57ad43a5b439766e022c4b8398f85c3a694f29556856a658a86ac90d
-EBUILD netlib-0.10.1.ebuild 733 BLAKE2B c93ba76700bfd7c8ab1073f3d191b3427dcb97696374174eea2ae3e386b7888b127faa270235a0a0e3a85efab9eb1e4ef1fc30c240ac1db372ab641da13e5fcf SHA512 683811b2c2f929f4739fa41aadb89fe3441eb441bf7b4a808b739c1bb0c3c7308ef39f8981f60a29612d066ec8f22fea8c2d820c3ced1660ca6345a388f428dd
-EBUILD netlib-0.10.ebuild 733 BLAKE2B cbba44a25469ee91079150c5211245e9e0a0e4e96562918cf5c6d10a375e831f54a01d6e9e6a11c208471609d175a5a61ab8d9d0f228e2139af563e558c4fa16 SHA512 df734a002a130d92024cfbc1ffdd9bed58bff2cba0f282eb182f2d9f76f1a28b53887aae649c063b60c7d5eed03d2e8645a486a5afbbba856fb92f0d72d78a2a
-EBUILD netlib-0.11.1.ebuild 780 BLAKE2B 9bb6041bb2f66fe6ad27ae04e2fa1d6d0a5451f14a450059f200c3a44d8201d0750aa65cd3d3ba103063db35832394b2624f0c4e67fba731bd34529566c035b2 SHA512 0bdee21357dbb0174eb567aa9b101db58804beaa3e19f323b8b61b1539e62ea7530f29a8b78f89e24d2f15aa2bd86c495045ad4ee9f05230ada76f58e75c1727
-EBUILD netlib-0.11.2.ebuild 829 BLAKE2B 48350fe6c46bcc387bd6538a26fbb0037ea1ef5576dbdd78baf008c24d79079d178f413741cdccf1ae3f6d75fe7b545307518f37db72c03bd9f1c2f5dbf68f9e SHA512 26992ae5f984e5e7ae6e38c8703f7bdfd5c046e3ecb62161bfb73610f6d499987ae34e3c92fdf7699c902ccfffcecc9e9e764a54e652dcb8bc77e5ebe83f8285
-EBUILD netlib-0.12.0.ebuild 829 BLAKE2B 48350fe6c46bcc387bd6538a26fbb0037ea1ef5576dbdd78baf008c24d79079d178f413741cdccf1ae3f6d75fe7b545307518f37db72c03bd9f1c2f5dbf68f9e SHA512 26992ae5f984e5e7ae6e38c8703f7bdfd5c046e3ecb62161bfb73610f6d499987ae34e3c92fdf7699c902ccfffcecc9e9e764a54e652dcb8bc77e5ebe83f8285
-MISC metadata.xml 381 BLAKE2B de7223f101733184f22d2fb3724174ca98944c48321d99dbeec578fe68cf58db3b86d69bd55474e47f05e9976cfae7faec0f626c793008052e6106fb58e8179e SHA512 03ea4f721c07fcfcdccf5d4211cca285de9b724bcba8a499ba90dcf6b7815af93827934a12e7c1cc73433b381e5475aa443a19b8dab92c0f0d5fb007c50c1f1c
diff --git a/dev-python/netlib/metadata.xml b/dev-python/netlib/metadata.xml
deleted file mode 100644
index 0bfdb3b09754..000000000000
--- a/dev-python/netlib/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>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">netlib</remote-id>
-    <remote-id type="github">cortesi/netlib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/netlib/netlib-0.10.1.ebuild b/dev-python/netlib/netlib-0.10.1.ebuild
deleted file mode 100644
index 9f5c850535a2..000000000000
--- a/dev-python/netlib/netlib-0.10.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.10.ebuild b/dev-python/netlib/netlib-0.10.ebuild
deleted file mode 100644
index 30d678a37f9f..000000000000
--- a/dev-python/netlib/netlib-0.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.11.1.ebuild b/dev-python/netlib/netlib-0.11.1.ebuild
deleted file mode 100644
index aec31955ed61..000000000000
--- a/dev-python/netlib/netlib-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +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="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		www-servers/pathod[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.11.2.ebuild b/dev-python/netlib/netlib-0.11.2.ebuild
deleted file mode 100644
index 0c08e722b36c..000000000000
--- a/dev-python/netlib/netlib-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netlib/netlib-0.12.0.ebuild b/dev-python/netlib/netlib-0.12.0.ebuild
deleted file mode 100644
index 0c08e722b36c..000000000000
--- a/dev-python/netlib/netlib-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
-HOMEPAGE="https://github.com/cortesi/netlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/nose-parameterized/Manifest b/dev-python/nose-parameterized/Manifest
index 00dca2bfc6b2..54937970c610 100644
--- a/dev-python/nose-parameterized/Manifest
+++ b/dev-python/nose-parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST nose-parameterized-0.5.0.tar.gz 10363 BLAKE2B c149af7a4c909ab34ef6da01355b6fe69e5d965aa5b03d323f3207974c888ed5adb8379b3ce043e31baa5bf269e682b966b3a6d46e39a39be777e7bb1ead20dc SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91
-EBUILD nose-parameterized-0.5.0.ebuild 559 BLAKE2B 3448adc1265fc168cdb0c8f4626e974ac30b7eec9ea448910e5305700fc3779fb41ebbac4824e35bb41e7f65c36ad124806ba0beb0fb0540e1dafd8ce7f6755c SHA512 dc425e274e074efdeb5de2ef3dbdf03bbcda4863b75f6d23ff73b90d18b2279dbab5d6a5df77c46c67eac8efa0cc9acc2f44fd907553120d1e1d00f7e5eca779
+EBUILD nose-parameterized-0.5.0.ebuild 558 BLAKE2B 9acb56a4271c9af7f1fde772c300a7b9b8323a86518dd77f962c4655610e81ce39e7f0d61eccba6e758a79f7ade86ff3f94502d26f1fe102d731373c36bf9acd SHA512 bda78a0b58f097e5f5a203df8fdb2721b2e2666fa769048bb8999a45e82f0d51be5151027ac40e1944ee6886977e29b7e0f2601f56999e76e11263551b0bc085
 MISC metadata.xml 557 BLAKE2B 4d3521c481995f51817adc64c6ec24360ca387dad6ae23b068ce5bf5b9d23ffaa3ffe86ae41a48d551e2fb99a31b4f94131c7505e45f3b9d9d75c4d694db8a3f SHA512 8b5b5040fc5c105f62c02616b5493f3ca7a1fccfb769f1a94dbf24fcbaac62b908005d119b49d115400c9d4b6a0c5e6a5cca2cd368281d8e1678d26750fe2f86
diff --git a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
index fc355afccaf6..566e2a85ac98 100644
--- a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
+++ b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index a0aef5a62c98..3e93aa1dc7a3 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r2.ebuild 834 BLAKE2B c5df058df5f04d13ead12ad8b94ff274912138ed58981a72a75c38e8ff0d898e3ad958b2061db0bbfe42ce76d01d025f97209aaee3b3c2ed5c055ae55eb884c6 SHA512 a4f4f5d78d3a6a56025bf00a1fbed2c934d171411d665273dc5bdc07b57064ef84a24d5db41aeb492243a1c7af4f27d1b031501b90a1634f09d0bca6e96d3024
+EBUILD nose_warnings_filters-0.1.5-r2.ebuild 833 BLAKE2B 9e2c79469cc56895cfa866f1bf8b989ed236a99bc210284bec3686f2c32103d7a4771e76766d5f725b82c61c553ef7fb9ddf5eb4938f0f779107a41d32b9a2a1 SHA512 2be7e5fea0b6d7ac079c0ead6f6af6be84207e8e7f3bba514817d35dde12fdf9db848204d00856d4191370d9a21b4593c34f0f532f258f01cf00562bb0d85f28
 MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
index 3a8e695fbaef..6d89ed13500b 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 3c7b29a318c5..cc1cada6c145 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -5,7 +5,7 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
 DIST notebook-5.7.0.tar.gz 13394162 BLAKE2B b74be075ec97896d8ace2ce9f45d4759aee3dba1a7515a412daa8fda4606198d1487e6760ed01d8a2726ac3bf334f2335f40bf8938e8ae1ca23c9cbb5a52eded SHA512 bc5ff0316b0f89ae2c8b8bc271a8824848e2a3d93420e895557229663c889916aa98e4d1503957abbd38ca61a1b3f9d421946d6c98e36f1153b1833f473330b1
-EBUILD notebook-5.0.0.ebuild 2271 BLAKE2B 3454254a51dd97b18559593c8c8c6da2c9132d8a9d3189c9b69a1cde5d376106ec43b434baecd79dec98c39fb9eab4b49bdd78fdc777cc08510e65ccac34f182 SHA512 7151e9322267c0514b0795da224d57fb4689a3beba5c3073b4a0968aaafe0b83935122d6c154933c5cb3e6ad045eda702d2ef1345346a6a07b3aa59bbeb9d504
+EBUILD notebook-5.0.0.ebuild 2270 BLAKE2B 58eeed902f6625c4a3743e0031e542a14b973ddb482ffbca6281aee22dfc19ddc200aad807ee184207c31965c92ccba1584d812000f88e6499b5a546006e0650 SHA512 376fe86fa075d640574c0dd901d6482de809950acf4ee8102ec13a6f6da7047693e9be2c5281d23dd31dfcecbc2f5e94e66b942993c98b33775e1b7c28089c04
 EBUILD notebook-5.2.1.ebuild 2652 BLAKE2B 5076fbe22b1ab7b0100842c4a7b8ef1b072923f6d961c916973bc00671af35a2923d152e363d5cf62acefd511914ca338f87ca036d1eea3d06c6788db34c4df5 SHA512 85cafa203f79831b8f5f86b1106778152580af0ac15bfca8f09fadc09b10be3c13226e224f04eb070480d537060d60f0b92e2de217b5cf7fb8b8b3b4d967823b
-EBUILD notebook-5.7.0.ebuild 2757 BLAKE2B f80fcb72fe0d59cbb63e1f90f98d40475914feee2aba240275f9cfa90e9af2359fb75ec16d4113fda142d2bb0d104220a86ee652235e6316d1382346e2ded48e SHA512 1fe0db8b849b550c5f01b8411f5b05aafcac9929d92c655f82c2adb995d6c528a8981c60c3a3eea340a728e7dceac61f0182ebc85984d16e92612308dc4c18c9
+EBUILD notebook-5.7.0.ebuild 2759 BLAKE2B 9bb8df5e884bc8b0d68d53b62166355a25e6f2f7a624d4b4e8860090989100c793d6597f2ce28fe1fe227f820415489f2b2d88c28e8fd50ceb906ccd36a0cfe2 SHA512 0e5c695ef7e82e8b4292db8aba1d86c9510762da90020fdfe79f900ddaff350d22df3eb39155bc44c7c19391f35131e5c5d622ad9816b7d1c761612f57c5a6b0
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
index fed4d7e6dc92..9e50e9d18e9c 100644
--- a/dev-python/notebook/notebook-5.0.0.ebuild
+++ b/dev-python/notebook/notebook-5.0.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/notebook/notebook-5.7.0.ebuild b/dev-python/notebook/notebook-5.7.0.ebuild
index 4c76d3957178..fa8bcb70462a 100644
--- a/dev-python/notebook/notebook-5.7.0.ebuild
+++ b/dev-python/notebook/notebook-5.7.0.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index e7ec9d648e61..38f6f4c77d83 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -31,7 +31,7 @@ DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4094 BLAKE2B a20c04c9445b3b13d30706b2fa26633541722175c4f2797777cd90c5c5d1a7af5079009bbdee026b0b437e6e82ece7efa60f16d59a09e7c39b2139162c76bd86 SHA512 f0817e879689c05b76cfb921db376828227f947fec740126e59969bf75933d5b0bd969f5dd836c7060a4bcf079ab7174db33e0388629d8f323585d7e31ce9d18
 EBUILD numpy-1.13.3.ebuild 4646 BLAKE2B 717d5acd1683ef3f5d7ea07475b7d3a5555991aa2240c5cade1170f01092e12e315ba99d408f2f04e8e998d5c0820bbc2034ef177375d729d19280e6940c6f66 SHA512 2eccdcda9e51aeda860a1cc02538708709687a202a8d0ed9cba6ab6fa45ce80153b118bda265944235040027d7b15f36c281d130e2e6a59a66d9ecec046240b8
-EBUILD numpy-1.14.5.ebuild 4065 BLAKE2B 42f9c13392d122e0aa3fa01d2a55d370b4d37a1f932cb860b1f9d81c551632f3778a4ab94fa911f7a9db6a9686d1541d54f450cd9e78fc9168b2cb00bf9c15a2 SHA512 915326a6ccbf196e98e3061a4abc8817246cd6b46cdeaafb7d93dc577358da626334563398def155de38fd090a75c3c9e4b45753c231851ffe6774755e5e74d5
+EBUILD numpy-1.14.5.ebuild 4064 BLAKE2B dc8888375a4176f5541490dc3c483d485b39305486cc2471da9359488080b52344dec51fc91ed27bc1fb6426873428883e6d3848585ee3b8ca181b24ccac05e3 SHA512 ea9c1014d72ae5ec5bbf3876eba5ad760a42215fdf0c48b06e18f1013d30edf10efde3ef8fe21ba681b652be469f6518737e784986298dffd529037196600168
 EBUILD numpy-1.15.4.ebuild 3869 BLAKE2B a981651423bbbb775f934a98f45d0d2a73262c6a5e5c5771cec7e7b58bd8bb2f272d608fe95f5d1f3668247b83db755fa10b5110515389d1a3a9112e722ec39e SHA512 a7091bed3e2fe526dbc42ef02340567835fe94c9b8325f123c82de2172364f7ea96931f602ebc72bde01dcb3e5af9f8c9a3fc3cd1b868da8efa38d4a6d6d040e
 EBUILD numpy-1.8.2.ebuild 3945 BLAKE2B dd27488a9771219b8df7c8546067ec710168d39a7675c963846197aac6959907d402269efdee44d9e2a42edcfe6a3f27e9e360604df77d620f8f39f96427201e SHA512 3086b989bd9ac6f8b07839afaabcd8f683888ac5f0b2e1fdeb951ac49c79af4585be7984775af8d3a03b89957792ffeb065b54c624d00050bb389aac67f0fed6
 EBUILD numpy-1.9.2.ebuild 3958 BLAKE2B e05e749e5f0c4b3f0346cf0dc78531421ab081bcea12ecef30219d0504a77c0f99ccacfaf355bbf008c2af07434d7989e4b2c4417e91ad48e70407535a23a1be SHA512 04f442c6a363caad3313418f681e264a7e680c19d235aa132b27f2d0caac8495bcda7c75ea9904ad0096e844beda1ccb15dd2f4562e632a1576918279569cfe4
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 17335bd9732c..dc3d6dfd540a 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 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-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="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index e78d0ecba42a..0d50985f80a9 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,5 +1,5 @@
 DIST numpydoc-0.6.0.tar.gz 32464 BLAKE2B 3296da3630c20eb2b1e0aeac4c5c4c912f9011cdcec0f54145532759d0b3ea7bb68529e5b3f5a1d640f3bf2e574fc03c3e7bc29f6fe1afacdcc92aadc3766fb5 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7
 DIST numpydoc-0.7.0.tar.gz 19047 BLAKE2B 03866005772a2ef1c8896a70985dc36ea9a91507b62536cd5f68e73e9db0aeb8d2f9af7e005b45d3d48ad9163216baace850083d07d81bac57b20e9333e02844 SHA512 1a9bedaa6fe8bcd626b739b458a1647e550ac4489f8ccec2d4b11f93ee5c2a58e5d0e6692330d478a9ba91956da88eabdf020aa04f534e1e445c020903dcf14a
 EBUILD numpydoc-0.6.0.ebuild 728 BLAKE2B 79bef8d9805824cfd935f88cf6727bf918c25872d2817194b278f414ee4287db88a63d4e6436734679c945c9ee8a5ec0fd80ce0d4cb3df6f58a5dfb4390f1949 SHA512 674766ebed4866987de3f71a604681814e5cafc31b323bd70f42804e76b36961fbd7ee8eb388fe42d9a6fd22fd2b0001e30d08fcb4b102c735539f4d01bcef1b
-EBUILD numpydoc-0.7.0.ebuild 739 BLAKE2B c34d03776e05610936ee7feb324bdf3f3ea68aa3e4532a7f929e43d2274f10de29ce0aef85abe5b90a982b25945a3634df33119079504d1f8fa66557507a5b77 SHA512 afa52cd1da4eb9985cb2d4cdf691cd209775f8bc1339e5a56a290f487736b00e874dbe283a8570ffa4f7bd65c266c6ee3b8f91bbcc5b0e767fdd48540b6b59d0
+EBUILD numpydoc-0.7.0.ebuild 738 BLAKE2B 18ec78802630e621e1c569ade5958ef6d2ca6c664d5fb476455e6a3144e7065a63a8844af698916d729dee691de7ebde24d5c6f5af13d3cb99f092933e99e6f5 SHA512 5b6abcab1fcc57d5a91f38b595fc0b5d41c4dd0ba68d66f19fc03e1e9d2f8232175c0ea426f93e4ec667c4c7f73713523925343d2d4d0deb8f1cbae6ac12278c
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.7.0.ebuild b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
index 7a3f961da19a..aaf0a81d8bbc 100644
--- a/dev-python/numpydoc/numpydoc-0.7.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.7.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 6e327cda626c..808bd2467167 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,5 @@
 DIST openstackdocstheme-1.16.1.tar.gz 1179830 BLAKE2B 9f30e0206e0f7cf0e74bed486b6c4c0ee5fd8aaaf8118a4cac2da99f0cf8ffad2c1d14440177d4db232e29abfa38116a8a395b28b3efc883a22803757c0875bd SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
 EBUILD openstackdocstheme-1.16.1.ebuild 594 BLAKE2B bdb509052f8f419b5a12ad99fd8fdab59f4e3985caabccfd00c9713b6e0561c3656ba68f08e1d10606ad355464d68c9a589a074ba5d49c0bc91c61cc92f1c53d SHA512 20e9b5b59e160e98bdcd2dd9dc536a805a37670ce55f81b6413c4de5bb8d0d5ffdab7b213b4f6aef63fe57092f998a9baab1bf8add9c67a034f676f441646feb
-EBUILD openstackdocstheme-1.18.1.ebuild 594 BLAKE2B 35ceb2986c509212aead978b7630ff93dc62d71da7aebbd2592ae1fa75db94b0bcf8526a4b4f1f15b9419d9b53524b8e5d3992ebd1dcda88f519f673bb50c6e2 SHA512 8d0e1a3b64093636ee510f479492cd8ec7aec3989a74482c63e880e678dead7ee8454fdcde49dc7ed18a8b4e72f6ab90ed2b36c722fe9e1afcda76fb1fea0d29
+EBUILD openstackdocstheme-1.18.1.ebuild 600 BLAKE2B fb462b851c634175d346d4d45d29a8364c7618b790520299eeea027a300b00139151bc88a20f31cfee172d0ea9dc4b5fca4fdac44eaeb5860cd46840c86bfd15 SHA512 700d304b070bbd0adbb42d6d6508c7d3a1efd0926f0fdd528353eddf1378b8a5ed9c4489561f712b2e6b208d09ef2785cbf7886932de80d1e3251b2b3eaa89e6
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 4a641e1c516b..b0c7e06faa49 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 8790c29b1896..169ec79abb01 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -2,5 +2,5 @@ AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a018
 DIST os-client-config-1.28.0.tar.gz 64102 BLAKE2B 955f3e4387d38ef99805c9fa53032c974b68d2128c89b9525570f1736f74d4a757e43ec50957bd5fbc7c6c1bf9a9b97577058f44aa9abc77d58e917cb2670151 SHA512 80cea066eeb8dce03afa91a720b2e3449676f019f33c8ab0a3c0ecd5cfd49cd5a061abde1a4f0eb1ff947e505de74d94ba3ce71e763d2e2e4fbd1c72b313d1d9
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
 EBUILD os-client-config-1.28.0.ebuild 2283 BLAKE2B 9ddafe2421558c8d6af8e2ed744603e7cd98c05b7833cd5b81ae4e32f9037bf30f0f648a96d0ee44166be9a9dd381a39478101c0dd295fcbbd419927f8ac8a10 SHA512 ebdab2b24800e9467de664c7384ceb0f7878d3ab85a5f987f7b490638a32e98fae1ac0b4985dd03835c2286f6530660aff9cfa425517368039b8a13d4978d995
-EBUILD os-client-config-1.29.0.ebuild 894 BLAKE2B 8cc9eaa7655743d3fb976c2c0711a269d7ca8cc6b0007ec91b959584fee51a91a8455a030df454277c78f0f37308655488af1b1423ed4cfba4dff89e506f0ed6 SHA512 6a8887eeca4787d5d70d044c0997ebf2e25bf75befb773c929c375ab246362c3dbbc76e4617e2d31b9d654d6188210193f59a1bbf21bc545a4a08bb61aff21e0
+EBUILD os-client-config-1.29.0.ebuild 893 BLAKE2B 55d489e118c1786d67d316d101e25b833d053fc67d4851abe71541541d3d21b1832deffb825a748b96ac9f7e7e5f0bf39de1967b9b0eb0def9836603dd6ed7c9 SHA512 9b8bfd6f50e6c9d27487e59f1394bee9a12b2bb0f54790e32bac2294bb34e82445c66b50b6910a1233e86fd817755a1dfd74cf9d164e6a40e373b8efcac42472
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.29.0.ebuild b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
index e18734049c69..69ad259754a2 100644
--- a/dev-python/os-client-config/os-client-config-1.29.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.29.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 08d7ae2c3be9..33ca2840da78 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,5 +1,5 @@
 DIST os-service-types-1.1.0.tar.gz 20838 BLAKE2B 8fbf5b5bf9d7fefcf88f51f98a6e0326bd42c0f452d614801543b45c79cc5220aeb15d4e3225c83636cb462e03914cd235942f06a367b0a4b67805c503b63d08 SHA512 d6a5e9ce633a92c61c7ca2b44e7c0bb5fb7f28efc3bdb7e240bb8c1d06f02ce1c038e11a709508dcdc4bbb8e1245297b7dafae5b49535b69359af576bb147130
 DIST os-service-types-1.3.0.tar.gz 22961 BLAKE2B 6ad32594c7fd86f61b0e9018901da740c6ce7d30ba10610cb3fac1900cb8188084ed754a36b608dc076582f438a8cdff0f655cef2ee406de4186c12b5b454f1c SHA512 6a90cd4744902dc314ae2af09411947270a06db548016a0d8e424e6dd44520b20a24e061425e7dcebe4c62fad4c0bab4636e9537644d87f66e652ae02025afe1
 EBUILD os-service-types-1.1.0.ebuild 564 BLAKE2B a5791b59b29c762c385436d98acca32edfd16d3ce1b0a26616603e29095e80a41693816e1daa27407f58f5726556561ed8a4323d934471588efab0ee1d719f3a SHA512 d42fa5504bfc576c51846a83ffbcabfc58d650f78cab539d1e5948081d687cbd6dffb1230f27f983a967c227df582a8a95baad0e6392e2a4c90fadfe98f6fdc4
-EBUILD os-service-types-1.3.0.ebuild 564 BLAKE2B a5791b59b29c762c385436d98acca32edfd16d3ce1b0a26616603e29095e80a41693816e1daa27407f58f5726556561ed8a4323d934471588efab0ee1d719f3a SHA512 d42fa5504bfc576c51846a83ffbcabfc58d650f78cab539d1e5948081d687cbd6dffb1230f27f983a967c227df582a8a95baad0e6392e2a4c90fadfe98f6fdc4
+EBUILD os-service-types-1.3.0.ebuild 563 BLAKE2B 9426861ccb5e0d24db74eb6e5843ad2ba8a22192e34565a27a30314d56ef0d389883b2f5db63efa4f275a4ad417943fd9b700a923865e42246b61e9c66ac1ebc SHA512 a3a7c6a6c4679296e0c232e717a3dfec9499524b981a8c88f1582edd2b0d9f6423c6a6d6ca3ff03402878c406d1c3ff478922bdf1499f9ecf4c2d225bdd58179
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.3.0.ebuild b/dev-python/os-service-types/os-service-types-1.3.0.ebuild
index 4e2b9f6d145d..efb3b106b31a 100644
--- a/dev-python/os-service-types/os-service-types-1.3.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.3.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index b2c8d2bd9cd2..5af6b49a4f8e 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
-EBUILD oslo-config-6.4.1.ebuild 2279 BLAKE2B 841e848211d94b18d1075a0143165c419e1322c7ce6bdcee1cd88321e776a6fb7bd5663e761cf14916e6ff3ab92a9541550012124c41f6585dda579839e1d3f6 SHA512 e864c3cd59d922259eea554a6cf0cf691fa23f2e81f1fd31f953377b48556c99177585a92661c139f6d53df33a3ea6a3c72f329645d11fe15efda14af039e29e
+EBUILD oslo-config-6.4.1.ebuild 2281 BLAKE2B 7b0c9ca477bcf771ec4bc749c61e71bccc2a770d9b506641ca6cdb79416446f3d800ce61cfbc7f6afecd95d591227fbd5becc7950679b33681ef30a9c62d498b SHA512 2535ec31e76f795dd031992f71a7d828d751a32836d25a9e6f5b2a48590cc89c5fecb5c95e7003be68a725e2b11ed48fa3f9c7dde8248756c8b097a8c436bd8b
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.4.1.ebuild b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
index 76848c885ed3..826295e12f42 100644
--- a/dev-python/oslo-config/oslo-config-6.4.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.4.1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 13636f291cba..19c3f96f9fa2 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.context-2.20.0.tar.gz 28203 BLAKE2B cbb3cb6f30b1b16011caa6fdec36c19aae571125b88f642bfc52c5a8a63a2b17eb308628d9a5f19b8a0c3bd28fb0db54e5485abd10c90c9495de05263ac25709 SHA512 ce7bd92c7e22e02e91bdc86e9b697f746233a41081b4f3ebb9fe30fec8000c69f732f55de0d333b349b8e01e638ddc835fd3cf0d8f7a11aa3454466a1e87ad08
 DIST oslo.context-2.21.0.tar.gz 27605 BLAKE2B fa2be8819c3b5c46e12eacae12c665e8168c4d8ac88fe7e8b8c3454093ea14d1a5980d1ecc377eb7294d913e117cf5188571be3bf678f270712e09c5230f2f7e SHA512 af25aebd306d0a3d60032778e6e3ca10b976e758c10e5d02302ebfef6a6183c8f9a102e9b4c2c8400914d71976dff284654bbcec63c15192dcfd2605928596eb
 EBUILD oslo-context-2.20.0.ebuild 1210 BLAKE2B 870c16d4fa4236a4e53ba9e9d978d89ca75ab43a4a3486d2d667479e81364d04ed337196df8554527b62ee5f658f3df5b129b217ef8dabd4cebdc82f98a702f3 SHA512 d93cb0fa3a4c273b5ad199ded83c254318fca14d5335bebafca8578340cf6fe0eddc23bf5babb7814ab77f4fb9b2acf4926638095605beb872530cacef209339
-EBUILD oslo-context-2.21.0.ebuild 1210 BLAKE2B 870c16d4fa4236a4e53ba9e9d978d89ca75ab43a4a3486d2d667479e81364d04ed337196df8554527b62ee5f658f3df5b129b217ef8dabd4cebdc82f98a702f3 SHA512 d93cb0fa3a4c273b5ad199ded83c254318fca14d5335bebafca8578340cf6fe0eddc23bf5babb7814ab77f4fb9b2acf4926638095605beb872530cacef209339
+EBUILD oslo-context-2.21.0.ebuild 1209 BLAKE2B e98c472414d21cd8916a74c7008c19c141894087e71a9e643026101699ca5af710e6ca55991ccee573beb4b25359175d1850cffd9f0da6f5835eaa4b8bbb516a SHA512 37579e2b5bdddd3cc27b1e296dfb1050227ca6651e58a611efadb46199efd087432c86b633ccb73e39db3cf0d1caeee62c2dd34d69b78263f995ff2974056cdc
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.21.0.ebuild b/dev-python/oslo-context/oslo-context-2.21.0.ebuild
index 5e4b1fba4338..b31826bc5d03 100644
--- a/dev-python/oslo-context/oslo-context-2.21.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.21.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=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 457acc69e218..d47aa8a12ce5 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-i18n-3.19.0.tar.gz 41888 BLAKE2B 651b6e1ee2d2d6c11bd1b86b78eadf70b33338f5495fb93d58747635961df20fbf74fb2a949ef81b82efce582410f05c88806e678f688bb686b500378c77ff6e SHA512 2c12fc5ec24fbebd2624b3bf9d3043a62da84304e73a995c49b395e792bd9bd7d38a13f5e3086abe59bbb9ef43729a47eaee78ea0701ed05c15f5070af232a69
-EBUILD oslo-i18n-3.19.0.ebuild 1755 BLAKE2B 4f8b1a1c4b99948448456b45bc63e9f6823edd414be0b1d6e065cc178f1d1438c3165be5c2458ddab2da0c55dc48a75891043a1f519fcf993283d1cb281fa060 SHA512 3e6edb9e5fe343cc91b29896fe14f1cd24a2d83e51984b2fee0941bf35b6fd9c4bc5b96d6fa3bc0054a1f68cc6269f53d121248adcc29a664c002ea011aee839
+EBUILD oslo-i18n-3.19.0.ebuild 1754 BLAKE2B 49dbdad35fde85dbb45aa6a120e656f760bc39c4f31951f6d1875a7e1ce1f4046647c7bdab7c3b460e2fbf98a7a08a1e6549527d6a83f1df6b1fa652d6cd5719 SHA512 2014b1b84fe050bf2f0bf64147b26e345c4fb27ff7ed40e1a81b66e94aa64826b3d7e4c767414f42ae75530cb06bdabb65eef7a1a2051f3ee3ea6aa2c2820abb
 MISC metadata.xml 365 BLAKE2B de17547743fb15cc3453fbff770a48a4f7d7222e6a5f437064eef2269ecbc0a8ba3723893d653074364afd320894fda16f4e2f70da3dc6f60bf5e2ac763d61d5 SHA512 c3f2d54fd641ba2c5f423e2d358ccd8001354a7a3dc405af89b781ed167340b8a1dc23b3c15e70d60b72ed2d35ced17f9d4e6c1442ba8b3f919ab1788b33db37
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
index 07468ede85f9..61e91e31fe88 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.19.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index d8c76420d3d4..5e139d5ceb13 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.log-3.36.0.tar.gz 81964 BLAKE2B f08a5cc5160da123e7a0acef96f94a20b4051c415056e639b4eb20a10ca725da2527a5c6c25cbce8e532606ab390bd273be54b691d52e6e93a1a51b59f8ba909 SHA512 47234c4bef09e105709b765fe0d5b297312ac73169a438f2759cbff335f059afdefc323c290a32bb587dbb6d2095de536ae7111a31e6c5b280e760b9b6b971c6
 DIST oslo.log-3.39.2.tar.gz 85121 BLAKE2B 782323490b619d28b1ff5df0d72e752431b01156e4c6fc8c1ff6191e22960398560dfc3c871edf65d33b92a75a3af61c85a5b1b66bf56ed8237a638355ccae35 SHA512 6b5fad426387d65559be2cd014054c123b9db57158969229ce184919f36ea355b181e3c0c06c78d8e1567108bd05af38ec2695354070826933888332699261ed
 EBUILD oslo-log-3.36.0.ebuild 1963 BLAKE2B 426e1a0f1964bcbb050a7b72ef0478ffdb4e8e7bc9c868ec513b251aef6669167074b8e3bd7b00da7e8087df46fccb9811b00c25aa0907bf455630743d7140c8 SHA512 13b992598b34a13cbedc798f3865ffee31cdf291a0c448ebd8d3441f6372eeeda9229707cbfaf2ce3da5bbe1a49f86053f0bba0a3bdc496206fba9f489bab9cc
-EBUILD oslo-log-3.39.2.ebuild 1960 BLAKE2B 12e83ca0de2df0987f2e5f8292bc663a732bf06aff590e148efad26dcbe1cd40f126168f823835ae87ca79296c275e798101f8ee9c074f5f0b9e01de91d11e9d SHA512 f64479df70ddec04e30182f7602dad1030cdbba467297e988b594631a9146ac1c609af2489552d121f605365e33bbc4940ffb49ae91a3fe2b636881345ad8742
+EBUILD oslo-log-3.39.2.ebuild 1962 BLAKE2B 36a435fd92779d37be1c00779605f8465e01c30afb19759fbb9396af8c7a8d4dc1c30e2916cfb03fa1e75a79fb80f5bcfcd62010dd5abc7ed10fd1372740c27d SHA512 ff712a73bda0655f58c048d421d6c992b6780faf94fd853cda2a50ee83291638944caf60aa34eade307794f8fdb72a4176aeb2b520f342fcdde4ce52a0c5d023
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.39.2.ebuild b/dev-python/oslo-log/oslo-log-3.39.2.ebuild
index 15666c13cc3c..e533177709bb 100644
--- a/dev-python/oslo-log/oslo-log-3.39.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.39.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 46a27789bd94..7bca4ccb9623 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-serialization-2.24.0.tar.gz 28948 BLAKE2B 8e57d14b21deefd8058f4dd677493072b0bfdc08bfb18faae2f6a09c4ab4e29ce544e479427a6c6557e0ca78fd7b525aa6a8ab3443a01c3d856ee3556f5f3f5e SHA512 8c2103409d9ec2ebfd45eefb56ed42b1ca52c0f8eaf5deff1020a67f813c8524d1bffd81d97a1ad28c80b4a5afeaebca829c4580e635f514900fd0835782990c
-EBUILD oslo-serialization-2.24.0-r1.ebuild 2027 BLAKE2B b411e051b9cb06e30654ff21da7d18b0656f29c01fde80972e7a2312de9e50b48c479a3abbfcc6a3c1bfc12ef98743411d6eb3f139ffec13f42a919c97665aea SHA512 9d797c32bccd9cf4b68165aae2125b1eb5b0e3004d19403cd261e520b5da9148cc2405aa286c6efbf44d30f210799ab6021a91e3f53d83ee330d01bcb52747a6
+EBUILD oslo-serialization-2.24.0-r1.ebuild 2026 BLAKE2B 8c1c8b025f921edd815ccb79c7777c5579a75ce23f8313acbba85b0e98efa1a0fcd5146b31826b98fe136e3b7ae5183103ad3a779f3e31cc001c73f325732879 SHA512 de936a3d58f3be1059bbce83ca85374a36fb0bd88337c91153cebee4e0ac299d319d8b42ffc2e68b0943df927220888de683b9363fee430b0cd5be79b3b0e450
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
index fe630e7dcf4e..d219b1971ebb 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.24.0-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index 1c25010cbe23..db4813945c7c 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 1045 BLAKE2B 10c3db8b5633107b2b2ee29d82c8acbf5a2a9f941ba52e155544ae3f5d8465624594fb7916c747c7db9ef32e5b2212a80b455569f4cc8b84441ef7ed533c66b0 SHA512 eef9161ad2a0b424dba2d374135ae7c57aaf81bdee5c08809a068c5fb63c9a697daf492778b94e5891149352e41e09947739716b4615e0778ed0de132aceb854
+EBUILD oslo-sphinx-4.18.0.ebuild 1044 BLAKE2B cc85e91b35815de796bea99995347ca0b55a57a0a40d29c02bbbbecc67341a1405f73688250fb62838ec1b52f24f14bce71a14f330a05525488b61256963bd47 SHA512 7f7dd6a17a2f6939e3b05c515ee6fb20806f61795d3be84a726a915f7a20819a190f7a59b239d232cabc3891f7272e491270a43105ee6e4398ddef7e59695ddd
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index a6ad6e8e0e3f..68578676fab5 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.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=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 7ee1c1f86432..287b692f6f94 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-utils-3.35.1.tar.gz 85615 BLAKE2B c2eea32d6844c59425a6e8783c1285dc47f2863401e6739bd7418c23ad1446613f41cbcd2e2d85d260ff8adddb681d9f1b5547ac521c2d9b5e2050324457bf97 SHA512 069fd262cfab3f5756b1135552c19c886fdbf72885f12b2ae84c67af1f50306ccc2c5331b1774fc49fb764107ad1c3e94305cd6fb6a25888ee8fa446facd2cbc
 DIST oslo-utils-3.36.4.tar.gz 87872 BLAKE2B 15f4fe90e5335cdf146ec582a506f2ab2bcae9989feca24caec7c12a4136767e93acb117345ce62013cde64938994eeb0c0809665cd155d5e0aaae7dc6aad879 SHA512 d5a81b68cc00c25eeb2e6d39b8fd4a47cb958c32e50471845b14a06cb5f420ac58986106893a27364adba968adc19f864624d69bae316202bdaf2c156458eac1
 EBUILD oslo-utils-3.35.1.ebuild 2695 BLAKE2B bfa6e720f9e962ef0fb3cca8018ab9e2011fe70b217553e899fe68f7a41e483b8f90aeebb84ee58c0709fc0d595756ea7a878d152a9bbb5877676acfde42bdc3 SHA512 e79ff79d9528448d0df4c560d4da7f6922304da2030f30a50799ff8c7a103654ecd65a4668e2ef4fd7ce875d2a381714d5ee9e4a5ab5ee7257b3c2d203d0863d
-EBUILD oslo-utils-3.36.4.ebuild 2732 BLAKE2B 3db61b8d7b1b58631537204be55a0ce20bf126f52e7071fcdd4747a43e13d77f7a8f070385ef08135b5f04897f970a8b60370be5794e4af0a492a429298e9ea7 SHA512 e7729a4d772414a19925a1e38fb70f022aaae88e723b5a6febe5138b044066322b63d795215416074ad5af3c06c5297112cfb05ea77c9e1b7541de5a87d45559
+EBUILD oslo-utils-3.36.4.ebuild 2731 BLAKE2B 91bb41690f0bc3e0e7f1e7198dceb9c9720fdae7d956d3788e3ed9f0a6a085e22d1db4bd6417001728dd6faea7f3f0e734a8e2a23ce7a069a1bea45e1fa6d729 SHA512 50751604048fdd5fe01b4ac643444764232e444ba4079de955bfcaa6999881ecc67b99b0dfd5a150ce115a68620bb72984afe319a93db15e7f0499d7544ff43d
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild
index 56b0e931ac93..1a625735bd21 100644
--- a/dev-python/oslo-utils/oslo-utils-3.36.4.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.36.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 391cf2f14ee2..e832a4b14249 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-3.2.0.tar.gz 35445 BLAKE2B d33c70e760fc595586c2d7b0ce6ed1f63b73c89ba078f85b70d3b6b1af1c4d115e6eb7b431f9ef52abf50290eb47a1d3adb2d014c2ba5cf7b93ecf0e46401a26 SHA512 4513291e2bec939f9734255cb0fe3f85b9eb8a8cadce58873ad4e85365a0ec27bc2084085f5b95b681b5e811b62458e18fe63aff1e022b2d8ace0ca48bd6a527
-EBUILD oslotest-3.2.0.ebuild 1545 BLAKE2B 3ebc64d4e5e1b48255fdb0af3a1717d33debbfb8801d37ff489a66fe645f77d07efe3f4fc4364f7521656a53045960411ecdca73b19947642dbe1df451335d99 SHA512 b12cd416ff0037207de486be6502570c6b64bc187b85bf577977716b11ef1c103737a24863898192573f9fe3093e920ebb67202e94c09e370713094926650444
+EBUILD oslotest-3.2.0.ebuild 1544 BLAKE2B ed53d417a9646fbabd85d62de012b86fd1787824021ab90d6e30706413bd6f1f081e20452143cf935a2324fe07051466ea04134235da161af297ed39779be5ce SHA512 1540a7b0dc87af512339cd7dad58d2c59122dad666569736fdf4fdfa9b4ed67d796721e126c282176dfaee4e1a5ec98bc963aabb0042b728b9684d17f1c03cf3
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-3.2.0.ebuild b/dev-python/oslotest/oslotest-3.2.0.ebuild
index ead6a997fa61..7bfb790ad183 100644
--- a/dev-python/oslotest/oslotest-3.2.0.ebuild
+++ b/dev-python/oslotest/oslotest-3.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 6bba56c65083..97b7527de8ed 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
-EBUILD pandocfilters-1.4.2-r1.ebuild 428 BLAKE2B 94dcfcda2ea901d562192f73962bdf50429e8db0636ca75a4ab3b6986ab48ff79f127b8bbcfc997908d67cedee09053b78376fba27d15a4204745d010052fd3a SHA512 573c76359a26ae292f34fa9208eb50c0400c525bf5d40c70f806ac2a53c8d10135a6861131131a76cbdaf055ac957b360f19f9235f9fa4fdfb3c27d9ef47dc50
+EBUILD pandocfilters-1.4.2-r1.ebuild 427 BLAKE2B 0b7eba02a90d68e71759f4272d360638461efe9680079eaece17cd39907000c7e814bbca076a2e42b2c352113b467bdb723023ba72956f5cbb05777ab2dd80d3 SHA512 8e5e87fa5fde6df140a568cfb663c77d82300a2091f37d07f53f146c59ef42a4f3e0df34d56574603400b56a2988cf41b265b929bdd5f2c593ad51c78452a1ad
 MISC metadata.xml 398 BLAKE2B 2c08c9bb2d07f4566c9ced1a87888d4482988acb2e4579d243aa776272050a0c8a95de5efd209163dbeb95b33327de59478c978343ce69472c2812cadd6adc41 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
index 394b16557973..9466fd7cb71f 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 10664aa76fea..d797980f7d33 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,4 +1,4 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-EBUILD paramiko-2.4.2.ebuild 1663 BLAKE2B 806a9257b30d9819589133eadad7f7b406a692e0d70a7b1b0cfd11a49191f08aad4c108a883d9df13bcd8d770bcba6b1d3ace1f86bdeb53f5d290c3a9409be7e SHA512 d33ba4ea54b516121dfbd9a0758eb87c7933e95f93f8ab72b12571ab603556672d8c90edf9f769b507455febd9e4ef1ea22215362b99f76d02f98c9d393695d2
+EBUILD paramiko-2.4.2.ebuild 1665 BLAKE2B 9ba757324ab5a555b3167b6887e6f1279de7639da2fac1618c4c473e18e9d1e28e7aac0da8265725db36b4399fde3e0fb78732da1f72af278dc1e6a8a3e9971c SHA512 2db0154aa349ee256b19fb6991c5b2ffa8ea5335801eda632227216daf6023ecb184179610f60f3aea75549d9b38f35b01799c630b9a33868eb8288717c81e64
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index bc1a9f8ab292..f3108e61742a 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 6c9aad215d3b..c4a8d7e8a4ec 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -4,6 +4,6 @@ DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5c
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
 EBUILD pep8-1.5.6.ebuild 908 BLAKE2B eeda92db0bd488f491c9fbe448b65c9ca190dcdfec5c047180cce204bb60f61c4d810dc10fdb4bdb87a13fb204cd049abd7bf122172d77b89b83f2fc9eb5cd67 SHA512 58cd06ce19da3eb1d4aabaf3d464dd50f0f1ad5fabb49ec004d43b66e10f9ea58b7f164e334e0dac6375f73be23474445e23b13f392f9e84c8ea0ffe7e71acd9
 EBUILD pep8-1.5.7.ebuild 918 BLAKE2B 6f5d7b424309bcfae81d4bd38b66ea6a15a98ff83c6d5d48354b90333b535f90c17b38e9735868b72b788a1859b3de859162119920b41e34679ef0125b54222d SHA512 35dedd1331978c86db6ad816b0d2bbfc8aecebab42153bd4c222c9cafdef1ead08e30560003fa9ef70709f3f38294e70c891008bef9b202d80c392d9784ac383
-EBUILD pep8-1.7.0.ebuild 1091 BLAKE2B 2a67e9bd86f9d18e52b1ae76917db1e2626bd9f1473e30f934e29fa08928f6ce218ee7659f362515754ba3d422eb04d4c444658a46b5ea298c3b155492508559 SHA512 356f81210890645d8c2b563b7068f3cf0692e2239ad9676a8d00c484f8fa6735a896e4307b15da9e3d12dd3fe93a42f33f81b08655a7429db4b44622181a6288
-EBUILD pep8-1.7.1.ebuild 1094 BLAKE2B 6ce4be7aee635054a51860ad312163e770fb9819dc441d6f985d684b4ad47ba46c90697ca33f3978bf349e9ec02f2d3bea4f2c69f75166675332ed6b12188298 SHA512 2e9e690e0e4de9087a5adb12321f63ac0c53e86ffab78d4e34b931fb551d7b6afe033d0992de21e626015e7a6135cb388cfa847248b9e58d9aa1a7390b200291
+EBUILD pep8-1.7.0.ebuild 1090 BLAKE2B 48f938a05763e10eeb6755aaceb9ed33a053cfc607e1a3cd5869dcf391870d6ea76b08565c17b54e56494a22953361a3b8e21cef8b745b9adbab5b74013fed9b SHA512 c888ee2fedae429c57c2067edec087df94ea8a25f8fc4f1bfe981687a3bb551168d516a208e9238e2e7f10c10992ddab6976ef51700088ebff4d729a0b232fe0
+EBUILD pep8-1.7.1.ebuild 1093 BLAKE2B dd6e60aec036f9e607cd9109b99e53138ce28bca025b39f0ee915d1779282700b4a725908c8d86b03301bbfacee706f6d45b202635cb1dd9f3bc875e36675350 SHA512 be2b3919b83f337b995aa15c728e704a7e2d572ca8158dc3f6bad01cf9e588c9bb2f31b0a07ccf3e1408b5b8a4921662644e89b46cccc8a52a22609e9c779304
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index 17171746b219..b8c12b905541 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 65635dc47208..6466dc21e306 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index ea9510d88ca5..d0c01686b46b 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,3 +1,5 @@
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
-EBUILD pexpect-4.2.1.ebuild 1162 BLAKE2B 441552088625ea18bbb4944ff66d40e2f29afc05a57d042fbc2526735ee94459522772f3c7b9b6916db56034df71a8f35570396b6d31b515c3ac5ac55a5e339f SHA512 ca44c829566aabf1b45e7a7996733bbb67d6ad71e8b1ffccb3ac040cdb26fda5c5394c2af8c7bd9d5ce17812e9d4457000c8de1846b649667160578605571883
+DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
+EBUILD pexpect-4.2.1.ebuild 1153 BLAKE2B 9ca26fa04abe4635e801d2282756f85c239f751d70a6439b6ed80744fd4b4945596c9b5e06d6139e441da1d1ba4fbdb407c13d09c409c501d725afa02da1ad74 SHA512 1cf058c3f89c008f842d3fa38355c51cb68360adebc29e41559f88fd948b5d3628be75f07befe70caeb1d5974bfb190308222e903cfbf941d80984e213281874
+EBUILD pexpect-4.6.0.ebuild 1163 BLAKE2B ee742e86458817c49cfb16d564b3f5d365d6f9bd6d7920dd1cae1a53fd17bf92069877c73b093da2e236f885e4a49003791aa4d14869a40dcedd0365361aed37 SHA512 e6603b00b42e2aa8dbdfacddd582ef23f32c199e852a7776fdf5e86306b298a9819b787fafda7e9937f79995eb7cbae6ac760ab10eb2380f00b4d854a6c55ca5
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index 4ec6aea19456..f42f3bd52ca8 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -1,14 +1,14 @@
-# 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 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
 HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pexpect/pexpect-4.6.0.ebuild b/dev-python/pexpect/pexpect-4.6.0.ebuild
new file mode 100644
index 000000000000..02f1b078ff97
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.6.0.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=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
+HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	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/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 2979d2ec1f18..bd392e91f493 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 EBUILD pickleshare-0.7.3.ebuild 683 BLAKE2B 7b3b85ef4ac5592ef22b1b6d0ee68eee1fd30aa2d6105dc91fb99af8210029a492019a278d8cd14dc06427d07e8e32e329e5c3c007f062a158b4be29d5b339c4 SHA512 00594dc37d4e41e6fd832212eb2d25750dfbb8bb66a13278901e61e588e6f5789780c59f7a5c70b377eb09ae1420ca7a269c143b1b0a85c28543a442f06c61fa
-EBUILD pickleshare-0.7.4-r1.ebuild 691 BLAKE2B f1f9987b58e72ff606c8d68842dab011cf4026d824329d3b3d228143f4c4e2786973be3c51ad97fc92475f66b1be5c954dafd650a57091b9456989a4203a0251 SHA512 cfdef01aa45650e49d0482e7a2a162f623ffba22aae756b2f1d8358a110ec32a55b5068a6fad7a526ba9954b94bb8e0dcf2a54afc3d0ece1b3752b60fa9b1326
+EBUILD pickleshare-0.7.4-r1.ebuild 690 BLAKE2B 4d7ca9f35d96d68f181a0c71bfdfbbb1b5fa7969f59c6548afa4d6b3e483fd60204b0dcc1f288b265353819686f643011d5e7025c83da9beac87f0af8302127d SHA512 4063a0da8773bdc354888d8ed7196814c463a87c386de4b35b93ce5f455ff212368326e56939a4888f1256c4224a2a56e7c9fa8d97dc80d3f868827ba854d3c6
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 8fcd289b4a4a..74b81b26127b 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index a699f1c31c22..019eefee7adf 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,5 +1,5 @@
 DIST pkginfo-1.2.1.tar.gz 31072 BLAKE2B 57ce5f6147b97af513dfdc6137180e5561822096cdbd21b673c49522384622c58f9eba8c65f24b54bc1e76dc0c6feede5d43e8aac945d94ffe79ea220e830470 SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a
 DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144c0a2b5d7a90236bfc2ce7f94922b0e08e5a08b13ba2025159bd90fecee25d9abdb283e7d52de0d34386aba59 SHA512 536628a2a2472e999695a115449a76f971453aea7ac3a08f10d9b08dfdf4a7b8e67c6010c6f18d300472a6afc8dff33331c955cc2f7bdb357504cd6a36390da3
-EBUILD pkginfo-1.2.1.ebuild 1401 BLAKE2B 7d4c17ca90337f74e1cf9199e79e61201f594062a43a6b5389c772ec103725751e442788a9c483462c02c2c8325b9faf5e9de3cb8bf76dca64f1679da14ada29 SHA512 38d0801cf0398113196817412cc69f95ed0501e40578899e73a35d11fc41aabf996e29ca87eae5472a0bc03ced5f95c2bcd5c9a0c06676b0e86179c9c62855e8
-EBUILD pkginfo-1.4.2.ebuild 1340 BLAKE2B c53e2b234fe852e272317a04651caece625ed8f786980d04a214df4c869aaf61d3df29406774108f88a55bbcd6a401138c5e8de3d16292f37f954e92dece9d3a SHA512 b67723e42bf40fa9ca9689f11591978e0af9f9432a374f0f8dcd9880ba53f8065fc1c3014d6cf8da922b5eb95f230ce101f1da484e3f6738f836b40f61d4bc63
+EBUILD pkginfo-1.2.1.ebuild 1400 BLAKE2B 6f58931e5a59c42f10bc8a8bcf5c9b373d0a7a2b0694dbd3466fa663920af2c722ee1449752d87723437721f08362af45373385a94fcc9ee537b71e50ed72c0e SHA512 ed334f60b5a2b21475366be6f7e30c7bc35d86922b06ce71766060c4eadcd0984b82acfbaaa8dab5bbaeb34044ef332fed13df5542a42691ac800293a86cc100
+EBUILD pkginfo-1.4.2.ebuild 1339 BLAKE2B f275c820953ac16ffa292b320fb1cc0859b4ce631d9f37589e827eb60a0e9b06ab42950f86449765e2c8441b5afda8cce716e6da9458715818adf2ab85f1f027 SHA512 3c5cc45647dff3728a36a481b546bb5a7fc2461d716ef947cf7833a0edfe773440894ecf691df0021c72214667e18b4b5a51bd8d0773ff51f0060dab5a7df870
 MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
index fa3f709090a4..f326c63af959 100644
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
index cabf02ebdad9..356f82f45a11 100644
--- a/dev-python/pkginfo/pkginfo-1.4.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.4.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 613af7e3bbf2..57d5c89f5ca1 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,7 +1,10 @@
+AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
+DIST pluggy-0.8.1.tar.gz 53375 BLAKE2B ca9b3e3930a193de9adc5ac4f755ce2a17e3b166d1ce71502ac744c6c175901f75e910fa51a888b5ae1b16a63b5afe77b77fdd6b5b2a584a08f985d6d34881a6 SHA512 ee7a83f7c62e4366bc7c3c2ad822c788e5cae7ac900c3d41d84ef8b8d9c4cab7c4327df86c134c19f2faaa86a049913984550dd06db9b465ad58a83566cda150
 EBUILD pluggy-0.5.2.ebuild 745 BLAKE2B aa43219d6e90d1705dbdcbd11b7ee7a2a1c186ed08d4832b9f9fc041e74c5bcae34d30c83584e77c020aa50db404788eb1f36c091f24573ecc45eb47ddcff162 SHA512 bd9af6d41e67f3c15204c41b4ec9bdad66a820bd463dfb28cfd6a96d47530f8bd942e31f707b56781e2da61643a9067b3463ef347ed78a1a35f3daa6cd8af651
 EBUILD pluggy-0.6.0.ebuild 764 BLAKE2B 065f0c1910c845e4de6bcf9460002a7472d0c9d5942ed24401f4f598663226a6a9eacabcd9fdec926a1d3ce467885628779acd78bad6c8367db75f7d690125f0 SHA512 c24f563a5ccee000a379c767f4e58e670c2d41ab6c0585eebebfd80cce9f93a2e51fcc2a4e17ddf0c63b3e74d392202996b0516b1c501a653d8afdbfc77a44fb
-EBUILD pluggy-0.7.1.ebuild 852 BLAKE2B 6007995faaf971c727f0eaae8a3416fbcd7e68e513c884a326520d6ec9aef8d702a4dbd036fcc4fe8f570fe7ec508b2fb1e28ab0d379f1eda0e70e4318f72712 SHA512 099886b56cb7cabf9fe13738005bc74d3a88f9497c0c97bbdbf2aa6b25f03e28ab5eae07b576cbef8fccfa4e429ce6d6082a9a70b38fbb43c4a0d00e959b89af
+EBUILD pluggy-0.7.1.ebuild 919 BLAKE2B dd33f30ef3791d197959efb168e954b9be0cae27f146eab4a3dc27152e993cf44e90d7221b0e867ca808feea6fe9eaefe5edd0ff93cdb9ec4050783789768a2b SHA512 2d83873488385e497008ba3cd35be5416aa21ac1aa517f9aadffc43348075e39d29791590cf0805c92aff96db45e30bbbb05b7a69aae351ff615223f7b21aedb
+EBUILD pluggy-0.8.1.ebuild 919 BLAKE2B dd33f30ef3791d197959efb168e954b9be0cae27f146eab4a3dc27152e993cf44e90d7221b0e867ca808feea6fe9eaefe5edd0ff93cdb9ec4050783789768a2b SHA512 2d83873488385e497008ba3cd35be5416aa21ac1aa517f9aadffc43348075e39d29791590cf0805c92aff96db45e30bbbb05b7a69aae351ff615223f7b21aedb
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch b/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch
new file mode 100644
index 000000000000..578b56ce3467
--- /dev/null
+++ b/dev-python/pluggy/files/pluggy-0.7.1-disable-broken-tests.patch
@@ -0,0 +1,19 @@
+diff --git a/testing/test_helpers.py b/testing/test_helpers.py
+index 846b0a1..89a52b1 100644
+--- a/testing/test_helpers.py
++++ b/testing/test_helpers.py
+@@ -1,3 +1,4 @@
++import platform
+ from pluggy.hooks import varnames
+ from pluggy.manager import _formatdef
+ 
+@@ -27,6 +28,9 @@ def test_varnames_default():
+ 
+ 
+ def test_varnames_class():
++    # fails under pypy3
++    if platform.python_implementation() == 'PyPy':
++        return
+     class C(object):
+         def __init__(self, x):
+             pass
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 2ccc546cb187..dd9526ce4e72 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.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
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.1-disable-broken-tests.patch"
+)
+
 python_test() {
 	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/pluggy/pluggy-0.8.1.ebuild b/dev-python/pluggy/pluggy-0.8.1.ebuild
new file mode 100644
index 000000000000..dd9526ce4e72
--- /dev/null
+++ b/dev-python/pluggy/pluggy-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="plugin and hook calling mechanisms for python"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.1-disable-broken-tests.patch"
+)
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index ccbf6e760f91..8c41c286ac15 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 806 BLAKE2B 2e9298ec2cd03ca55e2db18fac3764cb218fff07e1e8d93cd4b743ea8b41ed69728159336fbcbd629bdf2872f24e9f55b11c834be8a816c18ae21a783749ca53 SHA512 324285b7c077aeafa6f751134e5dca5b37f99f1446aae68bbb0fa0dd9e24388202c8a35742274ae1ca457ccb663fb85e863e07f660d6818da66d7fe0c7f8f62a
+EBUILD priority-1.3.0.ebuild 811 BLAKE2B 2f65c2d10527d4e4d697b849370f4d45f56fc0e13fc87d1e17a9947e08a9c87d02e2c2c8e21e36a70516c0524f9c2cc62c5e108ad60ef5a07f4c6b81724569e2 SHA512 15bd1eea90cc2aecee95ee59389be28a3e6b9f49df6eb8febdcdaeee236ac812f3e8dfaba5086d344d32d9b1574807b70d1a24f0cbf110d3feffac0fb9bfb2b8
 MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index a02d979143fb..35871ea58894 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 72aa01b09294..2999839e3d56 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
 DIST prometheus_client-0.4.2.tar.gz 57664 BLAKE2B e98e5c91db13a9f06c2df532e7742545a14cb223e04eba27accc3bdcaf2df949eed2a778194b38e1b4b93908de1636a3cc92a18950db54b5b8f0aceda2d4d2cf SHA512 5e0fee9f9fb4376dcf2959e8285b57a9156d3cf8b9d9118c7b95d2ff63f4dd925bc8cea817bf2fc1ba660e6f5c6dd8f4cf494125cf2a3673443abe0f3a4657c4
 DIST prometheus_client-0.5.0.tar.gz 60184 BLAKE2B cc44537b051c053860520d412664d57aaa6d35dd491409de0da72b9859743cc355d67eb260c2381347ad3313df9efa498535ff130df317b103d8c815f34f28eb SHA512 6e6e6c0f859b7b9d593e1059b71fde8eed15ccd95e54c245b4e0e8edb748a4761f0929f2d6c06f1c4656eb81f26959c5cec6a58f4d725a587b433ffbb4582127
-EBUILD prometheus_client-0.4.2.ebuild 724 BLAKE2B e7339701fee2567e11e3522ee028161f7f3269c74f163a0c3454a615120b1ea1f5f11f0aac1fdfdc155ceb59d63cf67b899db26c0af9c3c26fe72211932f9c2c SHA512 47866b4d3111ee4207683d0558f0e1b904e8e579df9709f97c5d0adec02c933313bbf022007723b15b4363ca3284eaf4152899a8240f8b614c70e93f2194abfa
-EBUILD prometheus_client-0.5.0.ebuild 725 BLAKE2B 29305836b8eea06402d0c329c52c3937ba893716f3b64051a6ffad93c5cc9fdaff2ba1233afb6b7a8f5eebaf23f965d0df6e98ce9fca028fb5f6582b5f171367 SHA512 b2fb021ac64e31548c243125392a433a7c0957b406172bc906c5c552172530d848a09ae747f52b8a710035824dd4fb8196214f859e8f94ea0813108c7d7bc525
+EBUILD prometheus_client-0.4.2.ebuild 728 BLAKE2B 649159476744cb1d435a816301fd430ae7cb5d4264b5ca19510f9b1c91c260fed55fe53dba4e77b529ceedad6450cb94ef878ffecd474759f3ecb8d3eb2c6e9f SHA512 6364a9e014f377d895cbbbf32abf01eead9657f93ca128bb457d55d4cc3f853924891ba27f48c31fbe328254cb6ba678b3ae28b5ed573cad439d3dba74e2c20a
+EBUILD prometheus_client-0.5.0.ebuild 729 BLAKE2B 41ee638b5d85c164acc5f9d76a4430a286acfa3cb5848ea2e96045e415086790a77ecc61c6eaaf572bf339b1a024ab1da0990f7d7b86db311da7a3e4c1c90e37 SHA512 43d6b6845993d02bc7fc8767e2e10f39c77a5c6c4acb20e0e3f34daf4e7ec7845935531c66bee8a03c7408b85c42ab498e7179b8307ea5b200c207bd59a8bb5d
 MISC metadata.xml 451 BLAKE2B 1596b7eb0ca176a5a00d44356c15f35268c3170f90bd13ffaceae39f56511c33f78724ab2cf3748efc1b3b10c71a1d1361ced3192c4c71a6dab5f616fea3051f SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f
diff --git a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild b/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
index 4cf107dceed0..852bd88e42af 100644
--- a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.4.2.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
index b11eea0b1bae..9e70c4e5396d 100644
--- a/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.5.0.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index efbd72812603..9cc100864007 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,7 +1,7 @@
 DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcacf2355da0540b21af35cc40cb0f0115d0a3b027236235a89a95c1ec1fa947bf5b88b236b737fab5de78e7bd5fc798aa764 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5
 DIST prompt_toolkit-2.0.6.tar.gz 339714 BLAKE2B f969edef98d25930e4d61c1500bb9c8d731dea29e8d154e6baa2ab4045ceaf9d577d46024734a255cc15a4c13685582309e9d2fe7ae3320257f6fd1f9981ada6 SHA512 37082011ee5b8d6fd9febef95c92494ed6108b9ad8c64ac580b69c3464781a2f0dcef5b1c4d06fe309a3036932f7c622042e6b2293acf2ab6f9f2aa3c48d9322
 DIST prompt_toolkit-2.0.7.tar.gz 343267 BLAKE2B eed36fb951bcf8b0663a87eb4e77267246bbc7a6b773ed76d730c04b4dd012434fd0e71e5f558c231fd5ba1e8b3403878106bf3c60f44b7aa3e492a99a622b65 SHA512 4ea8102a50290878248ccc2119eb2b5ae50ad58f466510f8328bc172942f5417abde24393958c910ae0ab2ea4a8caff049b6e7acd8d94e9dbeb97b36c6e2191e
-EBUILD prompt_toolkit-1.0.15.ebuild 754 BLAKE2B a363862593748865fdd8c312cd5e2eb654bc04f8e73e0149a21b1752a2506d5f4ce07c9529971c7ffaf583bfa58d6aef45a8ad8d4186cdc1e0683b5df5ec2f93 SHA512 3f735e57d8893a89765e62aa1818bed08ea1b9a50efdf4f761bac5d43cc399ae0481627e53c8f4ac3b00aa90195a933f354bfa017ea69a36ef8e2f96dafee486
+EBUILD prompt_toolkit-1.0.15.ebuild 753 BLAKE2B ec10ed6b388a11b41ee2d2a2bd354c25b2f916ab8627542d6c444ad6bff03966e64f54d7fd94eca450bd2e8f494726134fdf73f4a982d33b7775996e78ebdb4f SHA512 df29def83865cc955e25d9003449d2eb2ee75c826da74b80e4d81deb777758e5c7e3328712bbb98ae6578d4562308263777ca3a21d2177fb78f6021aaa4b341b
 EBUILD prompt_toolkit-2.0.6.ebuild 758 BLAKE2B 09e4f9d91eb9b8e252a7d665c156e903e35267bc83b35c85cd279eb05cef5c05c7bc3cf2426909afcfa42f7382fd6ff33893f20d314cacffa3848710c9885935 SHA512 fd33b49d741dd2282e31894f9e09348aa9fae700dc7cf7e91e76d5d6b6af175916a175b75df39e080c9f949ca6093f00365d8bfc5240756f57499e80f681f918
 EBUILD prompt_toolkit-2.0.7.ebuild 760 BLAKE2B c6d8ccf5754e821889a7e9ae65be8760eb48d67bcb36da6327b4dcb30dd0e0ab2a721ae17cebefd63104c081fad7e0d1add7eb5052607c3075020b5267287971 SHA512 6e3584f33f8d2d0673570b8089efc3fd734ff888fdd4675d53e443ba581e613228a53301fe5e9dc2c2e94fdd472b77d48e23d965cddc92521645ed74350a4394
 MISC metadata.xml 407 BLAKE2B a53543e0383cf16a19405b6722f7c5b430c69b0ac1a0863681ca700c56dba8e630f04e27fe682ecfaa905d6fb8ac4b4fbc78cbdc3e2575647071c2662ad5fe5a SHA512 7322ba928408db64bb54edf92fd385bd2fc41dea2a857bd2034d3b3e3bfe23b7fc82fd8048a41bb65f0aa103153e9f99f64c5f6abc76cc01a3d2db139b0a98ff
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index b2bea2fd9067..f6675ef7f49e 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 4cdb96657fa4..24a944ad9bc7 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,8 +2,10 @@ DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc58
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a
+DIST psutil-5.5.0.tar.gz 425058 BLAKE2B 0a13149b060d1a99faa600470fdbd592ee520b247f916313bef428feaa652bc4e9152f09ceeea5378769d4cdcd9876ccdc96dc4378d74136bcbcadf4a9266b90 SHA512 e614d41162087e236779738b50ec9e83403082f20492e152605fe80da23a11a4bd667db82a234f00815f68139d53b19368c2118ab27d52144341c2250091c570
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
 EBUILD psutil-5.4.3.ebuild 810 BLAKE2B add86bcbe158a1c9b272198c7639b870060c19e1359072cc64d286ed92182f4990d25dda21be9595c4d487624eaecbea074d89aae27f5f97e7edecfd844b3c05 SHA512 20c85ada79b763349f26c277fb157413a35b56bd5d85fcf4c2f1995ddaa463c29bed24e04bdf2353dc85e9afc7a39e874e2a244b25d217b539e227fdb383db02
-EBUILD psutil-5.4.7.ebuild 912 BLAKE2B be8379bec2e2984efbc9d5e0a40eea1209a89aa60802c070336c59c6f4f5d3f6c2f53ce9df54a730848d394797152600288a582e017924fe9f2c0f9e3c67b890 SHA512 14457bc0841f227f69740a26f0530b2e3e26bc7224a91739264d634fe6c5eaa80798a399fc42c32f7f733fe1b122707b15099bb0f1b4b7360ec78c008281164c
-EBUILD psutil-5.4.8.ebuild 926 BLAKE2B af378e9bd77a89c73c86c6620909d1d5e979bd319f9b10c5ee92cbe3236d6b44088d42824853f3191660a948a5772e0e5b60d61deb027fa44b9da82df5ea10c8 SHA512 9d9aed52731abc80df66cd4e4b4e77646f1e77659e3894af998b0210764da3971262032508b4ab9d3dee5e7f6d8fd15f3a161b462379d1bd1ff5410ffca8220b
+EBUILD psutil-5.4.7.ebuild 918 BLAKE2B 099a4f9a6a2fd33e986f5b57f50847379c5ea2e1e964fef90efb5134d803c4977807784b986fe1a753b3062e2f1c21db2bdf54f574b86d814f79a28c4eb4295d SHA512 7b3d0b83a96eaf4efbf271c47fa7a4b3981ea2e72b252871daa0058a5b6018a2f244ac8d1df3ef95207b3fbb7f649762cf144e77308e4fb274b318397325f208
+EBUILD psutil-5.4.8.ebuild 932 BLAKE2B 2d7fc8e190f50371887422c918ec8e8d24fe4fb7bf73c89440aa0fb77aa4f4d8c0b0e87f5fe50c120a08f841daa41cde393fdad4c37e280f61fc6bc12794564e SHA512 8b6a3f6e55276400aa03a39ba4853582dbae7b099ef4b956ab734b44fd974ac271ac0ccd00c2a88321e102fcd53ec89b77a3999a6e5fd00ac650ff63964aef83
+EBUILD psutil-5.5.0.ebuild 932 BLAKE2B 2d7fc8e190f50371887422c918ec8e8d24fe4fb7bf73c89440aa0fb77aa4f4d8c0b0e87f5fe50c120a08f841daa41cde393fdad4c37e280f61fc6bc12794564e SHA512 8b6a3f6e55276400aa03a39ba4853582dbae7b099ef4b956ab734b44fd974ac271ac0ccd00c2a88321e102fcd53ec89b77a3999a6e5fd00ac650ff63964aef83
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.7.ebuild b/dev-python/psutil/psutil-5.4.7.ebuild
index 039f78170ff9..54d07b7cc4cc 100644
--- a/dev-python/psutil/psutil-5.4.7.ebuild
+++ b/dev-python/psutil/psutil-5.4.7.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,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psutil/psutil-5.4.8.ebuild b/dev-python/psutil/psutil-5.4.8.ebuild
index 3eb377238a7b..c2018817a3c7 100644
--- a/dev-python/psutil/psutil-5.4.8.ebuild
+++ b/dev-python/psutil/psutil-5.4.8.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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
new file mode 100644
index 000000000000..c2018817a3c7
--- /dev/null
+++ b/dev-python/psutil/psutil-5.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	)
+"
+
+# Many tests fail, even on a regular tox run on a upstream clone
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/__main__.py || die
+}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 21fba5cb356e..e35b0d0d0190 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
 EBUILD ptyprocess-0.5.1.ebuild 603 BLAKE2B 9b9682827cd7e00e02972492a5f6ccddf57365d9a6f8f594b35a3d4ab24ac51fc856f405663c51f4c0515e62963910aa60d65dbcb0449d81f66ccf1aeffc2044 SHA512 6a90703efad77361383da5566b2b29fb3a596856e20c836a94c8bf0d1b98d1ac211f61437734e008ebabbf925c95a389684310b5910815f1c224a7864711490d
-EBUILD ptyprocess-0.5.2.ebuild 628 BLAKE2B dbf6c17c96e40d6d00072a0997a134324d1431aff007ea45da19a3445078284c3f6dad4de42e3caa354d7da1c494f7e968fda021aa9bf5d7e89cfb38ac70a8ff SHA512 10325f39029c41113f1bd0670b0a2c8a539fbc70e40083aa7599b7da78c649824c2eb163c5d09f8f233abde03db10e0b32fe81f01145e909c0789c514f6ae71c
+EBUILD ptyprocess-0.5.2.ebuild 627 BLAKE2B aaa8663c7a20150f8fb79b8ac843e8a15bad877358bb81dbe4545bb25d20dc047dc507ae9566fde2d257a17b386b4dce132d98a9f634a242f153996fdd4e3313 SHA512 049066d135efaa59833a4162c8d75df50afa91cbcf804c2031e43feee0c70800a6cfd64e45406b0f3950410cb297eac1ed0f37f88cea21ba6b440c0039c7f0f9
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
index e56ab2e7f0c9..acec27d42d05 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 8492ef33de62..4a04d25fac9e 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -9,5 +9,5 @@ EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b6
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
 EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
-EBUILD py-1.5.4.ebuild 1451 BLAKE2B df02c93c7088f79410687220994b03923b2be08e472d637912940dd3dffede3d2a46c0a861bc0cf763304115aa5b8c3ed4a6ae86fe2952f0357c0c59b704db51 SHA512 1268dcb1f9aa6dffce1f8dbaeb986ba18361723dd953253a45d30a2c12eb02ccac91709db70ab5ca3501a5cb23b4a234ef95debd2f50a1d1b37b5d3a9b2de741
+EBUILD py-1.5.4.ebuild 1450 BLAKE2B 1355ca2a32c248e2db30d4ba4b309943f69c68837d7a142525da5244a580f938b5770e0944a2f435378006b5bdb0993242c6cffbda9629b7366b3f66ecd6e7bc SHA512 c1a528ef85c984352b187005c5227b12afb92c5cc90e7b76ff438ba81d0fa3fa627b26877b9e40eb1c4da482195a7f3d25328c8d0675f8ff69a8c50c128586cb
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index a3b00c0005e3..b458a2744665 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 test"
 
 RDEPEND=""
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index 7da559dcebd3..07ba2f6d2b58 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -1,5 +1,3 @@
-DIST pyClamd-0.3.17.tar.gz 10737 BLAKE2B a190809b8f652fdff6c55c73a9431fa509219b9a8d8728ac63844ab1d88e9169df8eeef96892695a8c8a60c48c7fbf938d347603676a186746c4be202b37ef34 SHA512 52eda3f5b6612d47b803e6df8a49890167805dc39a30004f979dcd828b2717ebf7fe753ad0305ab3aad00aaaf750e9e862d43a504ccdb8f7df6faceae18da4a8
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
-EBUILD pyClamd-0.3.17.ebuild 559 BLAKE2B 75f4e36fd9cd1a2fa48ec3562608f67926bd145a28cc3f16cf19ebd9ff6507597ed94b3ca32fc136a1788f45b1d29af13f90356e7623c94689fff194ecccfc9d SHA512 0b2ecb5064241fd07bc3b1e823fee447fe9b6a149129772843d3c7c7ae3a4bf5d22e0d0e29d4427d2d99569873d3f30096382e1f30b41ae960648aa625e28fac
 EBUILD pyClamd-0.4.0.ebuild 567 BLAKE2B 1dc635779338a0a9944f660a2a57424ceac209b9f1931e255366a1aecddd0293221d251d193b6fec8fc31465c87a6c67b0e1d76d1819d230c0941437ee001d8a SHA512 57cc8e1bfc193effe94335de13a39323596c9d901db4df7aa0ce3215ff1795b91d05aac8ce1c234e93d0b25673c206828d85345ff5fdb38919415b5bd3e26d20
 MISC metadata.xml 242 BLAKE2B 82b0c4b81d4877679e44b5aefee7502536dfc2f09c11b90ee94b332413ea15acc368e0294b0893139a0d25b74526cd4e279fb85029d0a3724fc4b227ddfd08a1 SHA512 871f2d7617caa792bb0f60c4a4c1fcf9a70b6853d3add35ac1d67f260068ce6429a9ff8039230b26c4de20b8f5df80d66a807999130f38701f723e227f19d7a4
diff --git a/dev-python/pyClamd/pyClamd-0.3.17.ebuild b/dev-python/pyClamd/pyClamd-0.3.17.ebuild
deleted file mode 100644
index cc6551617c33..000000000000
--- a/dev-python/pyClamd/pyClamd-0.3.17.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="python interface to Clamd (Clamav daemon)"
-HOMEPAGE="https://xael.org/norman/python/pyclamd/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
-		-i pyclamd/pyclamd.py || die
-}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index f4826b437172..fd524029e099 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,3 +1,3 @@
 DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
-EBUILD pyclipper-1.1.0.ebuild 696 BLAKE2B 743ad9c21a3bfb972f968f7ae226d3724ffa3d86a9e1afd4e2b2ed286ce726ae76d9121b104233254cd073647dbcfe6a42b9fdf76fa4081e1084cf941bfc3439 SHA512 5b6d3bbbd2e62f6c9f734f2638020634ca5dbc56673d59b1514a9a880423fca709b2844216c9bbab044865281232eb677dd7efd4e4bdb84d967760213d40d83c
+EBUILD pyclipper-1.1.0.ebuild 695 BLAKE2B e9246fb3660176b09a32c406e77a611295338e2dbfcc860267f6e57c38927315879b42fef7cdb6431989551fa4218bf05248387f5d0334461c68811c3dbf39ab SHA512 394905c618e5c975c8ad984b03a327946b882dd62d6f2c96e354d03a8d2a29b2b3b506343323dd99b6bd6de70368cf2d12bdb494082852a1b5120ee41d4f3f6e
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.1.0.ebuild b/dev-python/pyclipper/pyclipper-1.1.0.ebuild
index e639fa0cf58e..1b5ae95083e4 100644
--- a/dev-python/pyclipper/pyclipper-1.1.0.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 074d7a6a6280..a17402632100 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -2,6 +2,6 @@ AUX pydot-1.0.23-setup.patch 623 BLAKE2B e0403d397baed897de27782fc6bf5223f0c0c01
 AUX pydot-1.0.28-pyparsing2fix.patch 836 BLAKE2B f6b629e47032087241e239d3a7515711739a4a4566fb0291b2e612f9ef498ecf6e64da0f2ae8effea647d24f726c8f265548e5aca6f2f3d7483e7a7e77a4e91e SHA512 c50f6a21609acd177cdc954d5adc967d4cb99177467df4c76cad379050968f86375f61d1a17d0377c9dfe4f23ec1b1647cf85d9c3fd1d6c409387d15de81eeb0
 DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef60edd9d0515ebfc9c685aba09dc42f89849c1eb609e469a4036062d3f0b83b364d89557f73414143c2c78d59 SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055
 DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
-EBUILD pydot-1.0.28-r2.ebuild 741 BLAKE2B 85ad002f01f5b5bffea1c6e33a6a18b5669bd50c8716d925ef3f619976e26fe6c34b03078bac1c8a4b7f32d2d92c82b5b2114dd8854bac60a807e8fd256ff020 SHA512 f799da04096a862642cd27f1b31de006fe71fe47c80ee0d9cc12d7139982047c029af4fe62aaf25752d6d73fe2505a0c6597e3878ecb83938c34ebef96d64511
-EBUILD pydot-1.2.3.ebuild 922 BLAKE2B 9f1130a63de99d9a2f0d5b741319130e686ae7cbeec4a1e9236e614fec676b6d98c8ccf76ba2a738549b3eb1b0a8d6fde5df6da7d812b0bf8dbd703a127ff056 SHA512 ff4854f56395bfb372c6ddac42a557b72bf72c41b882cacf5ebe5417829e5455918ee67226b3ffa1570214d16e8f2517e2e520b0dabf1698afd71a0fc7258ecb
+EBUILD pydot-1.0.28-r2.ebuild 737 BLAKE2B f74b13acedb35d34e8c99f9c26c0544594e054200efe842f43acb35cdeb164c1eb4721c3187ab6a53d10bdafb3d3fb73f9f8b69e70cbcf1d6d268ff23cf7c519 SHA512 9267631c4e58b2a25c3836243d1ef80c7d67df2cf5fccf5c90782dacfe44d8533ad487e0411b2fe5daa28d297335feb54f1b2c48a9c1d769585d2b2a115cb158
+EBUILD pydot-1.2.3.ebuild 918 BLAKE2B c7cc6edd6631fc9d76a60442e2627dffea6244e42f2d31af4e7f8f910295fdd5a2c7d81f5097c05533e31571f2d1ef70520bec5df25e2db4c5814aabad8a451a SHA512 9d04d24e45db6321caf6a1cdcb93b3092579e3cf6b69af9dbed2101679a219a566c7f866f62a28c2e681a8e18e52c61f0d95af48316a2437fe167384fa035a25
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
index da31180ccee8..acc255d3ba73 100644
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ b/dev-python/pydot/pydot-1.0.28-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 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
index d830cd777110..054706ccbec6 100644
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ b/dev-python/pydot/pydot-1.2.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyface/Manifest b/dev-python/pyface/Manifest
index 43f33773a1a8..42bc816e8864 100644
--- a/dev-python/pyface/Manifest
+++ b/dev-python/pyface/Manifest
@@ -3,5 +3,5 @@ DIST pyface-4.5.2.tar.gz 5089390 BLAKE2B 6615f9dd66dd8359df27ccc7ecab0678e0bf837
 DIST pyface-6.0.0.tar.gz 5238590 BLAKE2B df96cf46e54f540d8dde7c8c3c4844655e30275e4ce93563c2e1aab5aecf766db65c0f098aba532adb27f824d81a7b51e5d9e0635057d81e12870773f1a8c41c SHA512 df411f737555b016e7801d4cb870d8553834150829a9c3fc5f4d3993633c4aee83dd4b41c14f254373d0334f3eba6e9e0f05b3276de5fd99290e3128949def00
 EBUILD pyface-4.4.0-r1.ebuild 1036 BLAKE2B 8d304c10587d85c61d2139e0a371f8675143dcbda8fcda296f6cbc88fc7501c65918878a289a3bea715be43a575144155b705d67e234dc124fa37d9f4c36248a SHA512 0a8237921aa5ea2363b31caf31e1be441470ff014f309d496eae685932084f2e4c32efa0153774326e8b09d6dcd47e8d28f0bf6fafb2272c07c279a9c66b94a9
 EBUILD pyface-4.5.2-r1.ebuild 1149 BLAKE2B 2f7082052508510a77e22ac5750a3889eb37cb1eaab8573c44273a93ef9b0adf69bc7bd76a98a882b0c1a67223ba53bdae5d98f21431921f752a739f0d42e253 SHA512 1fe79fe8562275b99313b31f28e514e0cfdff65c3dbafcf224422557135725ee7a1dfdb137bbb32dae90c892d6111d4e057d8ebd00c5abdea8ebe6bac3e73c0b
-EBUILD pyface-6.0.0.ebuild 1040 BLAKE2B 0d22055bbe1c35ef6e791b0a5e9b8cc92e9821b44bc5ac824993a2403f2b1eb9bbd2f43ea5c8bbbc2f405a56768d9c37cba3239948f7ddf3391fb6f823b907cc SHA512 bb1da876235b9db21236797739041ddce5b179c7e87d3984dd5195ce6ca311ff1d5b950f4913b6fe4918a556c28d45f9f6efcceb68e18972d2fe90cf0c5beca7
+EBUILD pyface-6.0.0.ebuild 1084 BLAKE2B 5d93884b0446899ff220a690f40ed6b6e8c32c40debc23f5825ec0c4afb1d00c6bbe978e517ce465cee8a26d489370a67ef574934c82a9558fbb9cd2f677c7c5 SHA512 8e069aaa755b51ac873596723cafac8e13a57774d568483dc9bca8e6040b82f276994413c2fd011b5450f5aaadbd23749dab1b7daa575b3cf226a6918b6cf1e3
 MISC metadata.xml 773 BLAKE2B 5dfb734568ba000200d7e57a5259ef570296d783d45b93cabdba2037a8195701a086ca68f4e09b0ad9728eaef10c6d958e5e1d52bb6dd0800249b9453e0c5982 SHA512 6afb2eb5092995aedd528882a93f891b308ddcea9017743e1da89c0887ffa2575428170f969a62d6fb68e0acbfaf20a61817d67006cbf98fedfe4c4f4ed27631
diff --git a/dev-python/pyface/pyface-6.0.0.ebuild b/dev-python/pyface/pyface-6.0.0.ebuild
index 584a3c09130c..fc9f3de78859 100644
--- a/dev-python/pyface/pyface-6.0.0.ebuild
+++ b/dev-python/pyface/pyface-6.0.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,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index d8b7689b9311..e8ec8e3c9802 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -4,8 +4,8 @@ DIST pyflakes-1.0.0.tar.gz 35365 BLAKE2B 7b0f676fcb1f77f85a4fa85f02dd26f181f7d80
 DIST pyflakes-1.2.3.tar.gz 44776 BLAKE2B 9effec80b58ebac140a6a8b2f5f31a32c4fdf9e842d3fbd2858a3e74f33920925f10b6377300d962d1e2b1931efe8bb5318b97ef51c99aeb003a3434d08810db SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2
 DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
 DIST pyflakes-2.0.0.tar.gz 49002 BLAKE2B 146d1108b7cf9aca3316d33ad2ac3a0d1627af525b5def8c6140787fb4d1f47bb45c3c9ec9cb755e51e7ca4e947346e5e9de9b4a1b461389ff1bc4521371a684 SHA512 4961ebb8372f51783416681e79342d6be94318ecd007190e5c27f46c48f8f163c7a5f49cbe3025789ff1d9cd37c465b2f3baa219059779163545f9828a766f71
-EBUILD pyflakes-0.8.1.ebuild 728 BLAKE2B cd02673e4ae8840a37e1e4f86589c9b35f91e824aac06c436156c299903cc18fa599705df67e19807b05e16f0968919c4ce5032dee819d10cbc1670245aa487e SHA512 1a115511cd749ce6573f2de39772e7eb8a03bf9832f1c26c4bcc8d4f31833e1e4d448a65b7022e53907567b001b7ea699521bc4daff45eee0d074e46bf85138f
-EBUILD pyflakes-1.0.0.ebuild 759 BLAKE2B 01b5a58532558826439ad5b0c2f8fd7b4572538a320146ff3359d6376b6a342c4f817ffbd6240ce2ba3add85815993ce586ed1ab37d3bb4299cfdd96cbee8ec1 SHA512 32950429a25c31ce38bc0800d7ce49fa9d3c16d950f117978449c6b56181835b7e15ae3ce53ba9b05f61c5842c1f9141d84905e86930af06cde9b51f4dca6d76
+EBUILD pyflakes-0.8.1.ebuild 727 BLAKE2B 91c3cd4be275a95ac24070f6f452a96013d1e281384308df82914f6f68415b26d1a982c68c99dd7ad93c8c991ac6f2f568d4cc767e9f34334b7ddf8e581e0603 SHA512 44fa9ab78e91212578012600773f8eb7c87de519ba317435d2fabdbbca304721554a3be26abbc641b67af3421b5562efc06111950f5f94235bb5037964a8bf17
+EBUILD pyflakes-1.0.0.ebuild 758 BLAKE2B 35e56a059004daed14616efa77ce2fb69ec7b7fdcece85c29e545a7c605e9748d73e55f22446cd7a772132d4ced1558fc3f839920d0286eefa17a0d8fb000d57 SHA512 cd4f8a25229a90d1a73def9a7ea7e074ff1ea30ed8df45f0193ecf040d7ae4a15067014a5be2c76b2d1ca517789ed8e0c3ea1c80addb834ecf556b72594fb22d
 EBUILD pyflakes-1.2.3.ebuild 701 BLAKE2B 1e338d7f3e4fde3d798df14000754ad1aaf6a86bdb7c399b95b8da51f1b4fe177c212ba2661a4259ee5f87960583f46e4a49641c4d79de2b6b413bb286460389 SHA512 26766216f12cf21381339ff1c91648011e66a78130c96a91efab7f01e9e49bf919be2ca96ed76a4d564468aa20ef27e887b9d9cfca1d1d74ddc9845f2a3a9f46
 EBUILD pyflakes-1.6.0.ebuild 707 BLAKE2B bebb1739107fa975ec677fc33285aa5d7de3a84d118be1d3e41579e72e83e28fb8a0342752fbdfac3b7acc271650bba9dd223668a5b05b69a8fd583668cc975e SHA512 c712dfdeff9db715b82b2fd6a714e8b23143f49881de718735be8d4b098a621cc1a212d2ebcfa734c4cf9306993f4dbd97e7340cdaa8bec5b972532933d8334e
 EBUILD pyflakes-2.0.0.ebuild 718 BLAKE2B 26bc9c5ae4ab741d1051f1173f3b017a682ce16148a071fd432d1b5cd55b22bbbc4b2199e8e9343e3d4d5aedd94ed46f2115fcc9ba823d638e1344fb51ae2433 SHA512 f1418dbeb463c5f1b57afc0e2c51dcc16af4ea2422e240f365af3e4ecea1663a849d935edd03aa129824c50bc58dabcadb873dcf2c3b2f7dcbb9193df2cf36af
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index 9beb5e180e38..0a267152d63d 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.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=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
index 4eb377ed87c5..06c87fc6335e 100644
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.0.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index f3650fc1b0bb..414562cdce42 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,5 @@
 AUX fltk_wrap.patch 247 BLAKE2B c6f16fb2c87265c7b1b9d869d9b92454eeab50f6cc8830b3946a2cc2949a3a17a9a160ffaff66f60f875674dca51e1a4aa905f15047607e64b2f4791ae027f61 SHA512 4097f9a657f0cb96e37620b939edb35f4cfcb28b2be643b87f85e5dde8ff9a4f316052cbd5403396698de3e2034bafd164c7111c890a5b6d6bcf818185342bcb
 AUX ignore-func.patch 250 BLAKE2B 3d2a979b2580881ee1fa1a6e30b2afd639974d00ec7475c005d8ca967a599ef6858d158d2de95501d7397c1cf8c5e68c0bd0a72da5fbf037bf1fdfd0e8e04600 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419
 DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
-EBUILD pyfltk-1.3.3.ebuild 1093 BLAKE2B f507df4ff27f6c5402916cf3a7049a1a5c41db105ba36abdb8cca59dd2e8bad256a871760ff12e3a2baacaa7485a00ebc30b344c43180abb8bfa1b8bab7f9265 SHA512 a7c5436323ca5720e87f13311777e99c9fcb6b9445301f308214cf91dba8d86ed12e6c2d82c49111e3b4606f1d999662b8b7a23c261cd58eae23d1408aabbfb9
+EBUILD pyfltk-1.3.3.ebuild 1092 BLAKE2B e54257efd109f957d4ea79b641f4fba4d6456f3e5729f736205c89e6347920c156110272a4fc517d595f233c04d1754f2a73b4bd46a0498de6c111f7d522553b SHA512 29f86f4ea30642277337ff9f0b27db9acf98f619527ca1cb61262733867c1f0752781d66f979ac3e807d9d8a079728e0e9e24e96a419021f99504afa555b776c
 MISC metadata.xml 473 BLAKE2B 0e5625017dc5f5196012da6388fd6f7ef598c005cdf6dcb358a230f7b15014f6e77666772bb351862f2e2ac8690d77132b269e9988ea63662855a85a720b321c SHA512 b6f4d80dd9e608ec2b4b1a8d799c5cf0d238a7d908de0b79d30da2d9b60f6745aa1595256e59867774814114ac0abd5dbaf8456c9f0a17f7fbcddb6d8354b4a6
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c668e2245748..2dcdb3eae9e4 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.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
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index bfcb27893c02..bb88d34e5e33 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
-EBUILD pyglet-1.2.4.ebuild 983 BLAKE2B 8dd7849e691bc6ae58d8c4270454d833d71dafd56e87ea9163345d436ae371d3d81266f8ff1577a33c88a379f9dd754a018d6380d02217283138e84fb6a2084c SHA512 a9028893702ccd3c8d549f764b0fe05a8617e5b881c6403bf03b5ab22a166281b1e8d6f3d78573635bd1618f83380e6efab9b6666f3f2a71a4b18b0c196c2c9c
+EBUILD pyglet-1.2.4.ebuild 982 BLAKE2B 732dc710c8829150f7b92e391d37699d4750c9a33f76959e2af7a49eb12197b9768f59325a3c0f3c3f24e21f72807060cace0a73d92256c57a6054d3c13a5da8 SHA512 d27c5463ecf70578e951c51e726efce7bc677746d5224971ec646706df9a1a47f150d8d0449407ecc036c546ecda880fd7ed34e8432c0a538a0d2b932abbf8ea
 MISC metadata.xml 893 BLAKE2B b2c9d0381d98ba205738e1fee69cb1a8952060c5d0095d134d84136af35fd38da8f81cca964a1ad748e615cb9c443b18f53a31f436a8356c83725423e16e8b64 SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
index ef62a91fc9fa..45e67798e4f7 100644
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 82c3f3eedc97..2eed0a2ee6f6 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,9 +1,5 @@
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
-DIST PyICU-2.0.3.tar.gz 201076 BLAKE2B cb388e4e6d6df2417312820cbe8482a8b02c5cfd639950b32d5ab5e1b1815f85e8fc870a2808042f085bee6ec93c6cb6dbea4466e745e93166714421d7d4ef25 SHA512 a08a34772fc8205660320d7ea1bea52cd9c21ff9edf0aef1059c9439406d4b69ab434b35347dce8928cff8051600d55cb71bcc74eb89f203037be629d83e044e
-DIST PyICU-2.1.tar.gz 203402 BLAKE2B 47541bd2f59553cc577b726b41585df6a639deff79c0c48d9ec2388bc8c9d69b9eef2cad642418961c255a36c7b43e255c5487a9dcac2a695267f29a790bb630 SHA512 35477cd960828d6ce853286e2de8e14a3b4cdc8d6975fd7eaf7e262f252c298f235d569d02a3844432e19dccffed13395c80074623ad196fab6c87f55f3d560d
 DIST PyICU-2.2.tar.gz 211135 BLAKE2B f56e590ec4aefb61b6d3b37c807a018698ee97a632ccdd08f5f879cdccc576a6da1d31bb0ede54813be640ebdf600fe522a5c35ff417ac8e157c516a1b3bd7cc SHA512 30cce676fa502040e20fd4303baeebf0d83730abfedf79fdf3b69c1a3b52032a3337168b6e8902286dd4b46dda5bf894795995c6f1ef2a237fdabc374bb5ffcf
 EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
-EBUILD pyicu-2.0.3.ebuild 959 BLAKE2B 5422bd0c7b7dc745d04ce2f4c0a8e0f2aa71bbd9a8d51b7668059f06c0f42b63d40a5c49703b476e74b0b353e828968847dc2508a0b9a58cf62d82875d20fa28 SHA512 2da88e36f83fc4189805a3289343af886736fbb68373da0a3f2979c33b61e13176c2b75c39d00a9d8dc5cac1d46ce67096886c10b674dcdee3f408f88b588a0e
-EBUILD pyicu-2.1.ebuild 959 BLAKE2B 5422bd0c7b7dc745d04ce2f4c0a8e0f2aa71bbd9a8d51b7668059f06c0f42b63d40a5c49703b476e74b0b353e828968847dc2508a0b9a58cf62d82875d20fa28 SHA512 2da88e36f83fc4189805a3289343af886736fbb68373da0a3f2979c33b61e13176c2b75c39d00a9d8dc5cac1d46ce67096886c10b674dcdee3f408f88b588a0e
-EBUILD pyicu-2.2.ebuild 817 BLAKE2B 19e8d15f8ee1b972416b523bbdfdcf95802585c6fb60f7f01b491be3103d2328a1fac9f06db3c92381806930d6dc2d78162e36bc60b86ce248b7e916a12e37c5 SHA512 9e8f9e57318b4b4035f1dd1f4c299dd3beaeb79dbead2429dfe5dd7fd6204fd7a326f3662b04f47726b5872042260405972ad3b4de7f22496c1f2fadb375f04b
+EBUILD pyicu-2.2.ebuild 819 BLAKE2B b5f2141b408b90cfda0b0620f1b9c81e29c6878f865aa9b04627b9d8fdb1128170b8041f4ebd228fc2927bc134a4f95934e6b13e94a0a2da3f50b3556c7880c1 SHA512 d54a5ca5403b3051ca3ff1da0f1f40c58344b2be592b910e3efe47698fdc63db1ca43a94e7b6b3916f3fdfc23ade743fb66053169939cd0d9d2db13b4daaa3d4
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.0.3.ebuild b/dev-python/pyicu/pyicu-2.0.3.ebuild
deleted file mode 100644
index 381c93d7b92c..000000000000
--- a/dev-python/pyicu/pyicu-2.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic
-
-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 )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_prepare_all() {
-	# bug 651748
-	# due to ICU 59 requiring C++11 now
-	append-cxxflags -std=c++11
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		# See Bug #644226
-		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyicu/pyicu-2.1.ebuild b/dev-python/pyicu/pyicu-2.1.ebuild
deleted file mode 100644
index 381c93d7b92c..000000000000
--- a/dev-python/pyicu/pyicu-2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic
-
-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 )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_prepare_all() {
-	# bug 651748
-	# due to ICU 59 requiring C++11 now
-	append-cxxflags -std=c++11
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python2* ]]; then
-		# See Bug #644226
-		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
-	else
-		esetup.py test
-	fi
-}
diff --git a/dev-python/pyicu/pyicu-2.2.ebuild b/dev-python/pyicu/pyicu-2.2.ebuild
index 87d2e2a78e39..8a6c78ecb663 100644
--- a/dev-python/pyicu/pyicu-2.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu"
+	dev-libs/icu:="
 DEPEND="${RDEPEND}
 	test? ( dev-python/pytest
 		dev-python/six )"
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 4b142249d9ed..5ce3af274367 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 781 BLAKE2B 354ec3639a21de1f43343ed0329aa437a983a770fa61cbafcef3a0cc198ad8a40fa7600b40e94eec7dfbe00733a2c8f9e22f953093e7c5e916f57d56aa85e756 SHA512 b1559f337afdf7e9832abf1ba55e2656772205fb45612fa5212b59424a51aca12a970cf5becad06fdd5ccdf88909e2d65dfa8326c993ad63875e3261a46631a1
+EBUILD pyinotify-0.9.6.ebuild 780 BLAKE2B 3e7df38d69e663aa3a1442638a969cf9f2bad81ee22ba505ca31717f9d704451bea700fa94b71902a1a31f690b7cfe19b13c95d21b69fb20512b1555b5483336 SHA512 78b5c6dc360bfa9dcad3b2c140e30ac2a8fa722def3ea381b07751e714c606bc475c30c84a9deae09fce273bdeb8b78a5bc1180903d35cf6f05b35d19e61c6f9
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index d5ee18702d13..bcebb55cbf8d 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.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
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 01c57abaebe9..0016facc3096 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -7,5 +7,5 @@ EBUILD pylint-1.6.5-r1.ebuild 1804 BLAKE2B d88b604448f1326055a1b4b4fa3fce7723b8c
 EBUILD pylint-1.7.2.ebuild 1871 BLAKE2B 0a3c637d049bff7127d7c3c6efb8dd85ab06513abcbac7e2fe392d70c5acf55347c8a40b9df6d8f0edbd920cf0e8d6642e475b89a350d61342f431e1191ef285 SHA512 1a8f0831d979ba19880a285a6d1aafde6f5c113f4baa3aa412acc877c5ddde320e82302277fc7598c0890abfeb9852725a3c17f2ae3b506f96583810f3ac149b
 EBUILD pylint-1.7.5.ebuild 1876 BLAKE2B 1709c6b955bb02763514445ede2a8787763501009ecc5e729b93584084c69ff80d4d92b02e1dd86bba8e3e619dd4af077983fc96d405bfb52f8ba41eee6a0864 SHA512 d6248aec88f1eee54d58a438cc8229c5ee0f9a677e4090b542c225ac81a31d526d58d649e4774e7a3738f89af6708706aecd661b6d5d215f5227b48bd0a7a2cb
 EBUILD pylint-1.8.2.ebuild 1876 BLAKE2B bebf7523c2b74fc44847c4da0b5632a63920e1b30f20aec6b394bf9793d7d5e06afea0a63d82f8950d95b488f5582735d1012cd45bed8b125feef83068b682f0 SHA512 b917b1dbd59e1c73aba4d941317c784e6bbc46ebcef6f57ba6665b4976732d1a4c79686cfe4cf9fb03010e4bcc1101b4b6389ba971c88f4a4d391635917ad7df
-EBUILD pylint-1.8.4.ebuild 2452 BLAKE2B dca6596cd592961eebfcca36445bc4d20b9bd84465a5b859173c937da3c26c2304715d992b20da34e504f96c35410621f7ddcf611dd9da2bd10e14f02346f18f SHA512 bdc1fde62500de419acac17bb1a4d6851aaa25207e55930c3d59e9ac3ac4119a92a61ad82c5ec66bb9b78d96815b665ff543df63385c070f50858b1422195684
+EBUILD pylint-1.8.4.ebuild 2451 BLAKE2B a76323ce66bbd966c0e10cd70aeffd6454b5c6ed87a8861500466f4e342ebdf21d56176465e5b6502c8010d832895f0cf73c86c259ab63274336b4f3b98b9fdb SHA512 0a2660423ec69a7dda3c1e12f6abd51164baaffac294fa4e30d43bf08e7187d60e513e5b4c6de685b9de934c0e1b81927e527bb4c025122dded0f282183ef5cd
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.8.4.ebuild b/dev-python/pylint/pylint-1.8.4.ebuild
index b7148eae0d7e..eb31276ead1d 100644
--- a/dev-python/pylint/pylint-1.8.4.ebuild
+++ b/dev-python/pylint/pylint-1.8.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 496c64c119fa..fd86a9bc66f4 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 2a910ae88b47dc07ae005ab37f57b76ac102a84db9397c4bd8035bed3bce9c71c7944db0651f46b170c1be4a64e6aed381a7bb07bd233ba09427acd9ca0aa284 SHA512 896ff776353d7212454d3b31402f2288ff12fd6c6c86ec3b12dda2b741bb431599d3e7a36de11b3bb0090b2f6af7607d8bf56a99eca3e591cfb63478be7ebfbf
+EBUILD pynacl-1.2.1.ebuild 1004 BLAKE2B d29f7d4b70f422a4c18f88fec0fc50346b079275f53a81f5c59dbde726d97bd3f3a8590c42bdb864cd46586976914afa7c0fa1c950dbaeb91a11bfcac6a49fbb SHA512 4bf79617088db20c46777396b6da792d312511ef581d1e3ed897fa8c68b215e24a1a1b2bbf05b138276bd3b15f0ebbe375571367e021739eb223571abef9ebcc
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 2dd9543d87d9..09296558e16f 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7})
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 08ca8337ce0d..0034dd40c168 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 842 BLAKE2B 1725abf13bc11e2490d0838b3512d3b379b6f2d591b3d75ad4732977991687afa16abfd745334f3c51c489722e18cd6633bb759bc274e6e4a63d2030e6935e53 SHA512 488023a8b9ec910cd741970d0d0a0361c7a26a8391145a700039e115d36a126581456cb44cdda82592be71ba93df2c87c66895bb460a8781b80e1d883e122460
+EBUILD pyopengl-3.1.0.ebuild 843 BLAKE2B f38e74e2572a11a7cc731a6577c61287d05cc06f9396a47dd06f97c7194c56f8423c7a18eec9e80756ec4daa7aa49d0f600980d493d77b0340f8964ec359ed2a SHA512 29fde4ba687bb9f33eb76fb3353d5df576702d485dcd9400d90b4e995496b2b611605f50cc91b2f1e224d1f06a6a9f9347581918b91fc99108df62893709bf94
 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 578784737d6a..463471c5d150 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -1,9 +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
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index cf5ff9c6aa36..aece08dd1812 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,8 +1,8 @@
 DIST elfix-0.9.2.tar.gz 398758 BLAKE2B 22f8d9e85be2ae9bd906dfa6a1d8b7614f017686b4563ef7e97898a112a56cff59a8cb906ec957b7a111a5c9251a3de6b13dfb66ef9f732099ac610928d5321e SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9
 DIST elfix-0.9.3.tar.gz 399533 BLAKE2B 7ff2099218de3352079564971cd2e3851a95820552b9057387b78945fb1a23d7b670591b174dc974ca2b0dcf3948546578a210687cbb16625dc5d638abf83169 SHA512 3395ce2e6d5e9fc9bdd93b58751cea33b5fb8e25e0a390e6261de6804cc54d4e1f91b4b5843fc45c9178d86d23e9932bf9d0f133a6d086607bf52ce16c65fd0d
 DIST elfix-0.9.4.tar.gz 399606 BLAKE2B 51b8b2f1c3cce306c7bc0716ad351bbf446a369a353bcd1b5faa41984dec37e08dbeeea87fa2425820af9f76d36209554b8e602338d01d0ad50e6d95e6079529 SHA512 f705f63b0ca57077f56e519a22ccaeb2e07f57c5269a6e498571a1799286f12098ccc9a92d2126b51b498447a098b0ce22d54c0d97c8c98d25426fe1e00c6e07
-EBUILD pypax-0.9.2.ebuild 1096 BLAKE2B 3f378b21f4904575718268ee1336a5e269d48271c56a8cf3fae220ef53f7cc4231f0cdec6d6de3843637c91bc5e2a2de70d0653cd932ed768dadde43743bbef1 SHA512 487e76b4882e97c3417be3262b85f962c1dbb98ca69bc16bc834dd8385b6c5d387fc3c8ef4f12eef6387559ddd340f05b2bc7ba736f9a8dc98621ec0e475b29b
-EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B ea723d95468421f152fe436789ea38600ec69a9d146a62c75a318f137da956d226f3b82c7c704eae1a9ff65ee36559edd0f7dc9302e39c24b51ecdec8cb11c89 SHA512 c373be1aba00f0c3e4e4936ff7a4543458a61244fbaa6c1653a0a2173c430e9697c6c872aeb4a73a0cbf0cf296b080060374fd55f9193f429c5311d27ca9231c
-EBUILD pypax-0.9.4.ebuild 1093 BLAKE2B ac8d574e4c1a28b4c1d36c45131348feb6d474725b6e10e2f31e45f9485f0be8060ea35b5db4a0b2a7363e0af0f14610fe71d951e05958e9cc680a0c4f484b55 SHA512 4f25f7ac1b783577acaf442a5ac4afe0aa293da386fce0acdccd46a7b8151390363938aa12dcbc27dc4e703290ce94342169b9e7f49c6d89eaac2f24f5229ab6
-EBUILD pypax-9999.ebuild 1105 BLAKE2B 753a9202476893a19f00da53816499a9912e5bce24fad99f02bd89edafcc0df241b5f1836aa5aff3005194a74d99782df099facbc0717f6839219bfdbb5ba49f SHA512 08070f4304df5b8b1e90b4d95c3a9870e084cb88488d39ebe58aaff725ccf7ac5c1d8914803a44a8386a3fab1008138ab1a8bfab9f2e519360a54a4c388b5881
+EBUILD pypax-0.9.2.ebuild 1097 BLAKE2B 578c8e3ecf26f8cc04ec82fbd08f94ea636f6b6a18709a775b628cd643180a2b893b314d0b2fc203ab40d618947e6a6ca6b8f68c319ccb56bae85a5a6809917b SHA512 e4176a62c4ddd39ae523124d15c16fff36db2e960ae47f774142e8919baa8636eb1c6bd069362164c9567886bbaa58ef6121e1bea2f35a3f3b90545527b2f923
+EBUILD pypax-0.9.3.ebuild 1101 BLAKE2B e7d6d45023fdea44fc9792a407553363451367baa03ccc5cdbacf634309bfb0720393b4df23e9a0056a43233aeaf74677c3bd72b910fbb6b24da50a864b0712a SHA512 163f1f76fb61673cbfb20b466f9ec48c01594601078ed5388440de0e39f41a7d5720719b1b567038f908819bf48428a94b39c3f8d8d276effe12796d44ca994b
+EBUILD pypax-0.9.4.ebuild 1097 BLAKE2B 578c8e3ecf26f8cc04ec82fbd08f94ea636f6b6a18709a775b628cd643180a2b893b314d0b2fc203ab40d618947e6a6ca6b8f68c319ccb56bae85a5a6809917b SHA512 e4176a62c4ddd39ae523124d15c16fff36db2e960ae47f774142e8919baa8636eb1c6bd069362164c9567886bbaa58ef6121e1bea2f35a3f3b90545527b2f923
+EBUILD pypax-9999.ebuild 1106 BLAKE2B 02f5d2784992568fa372d9a5c848d70dec02eff3811ad286bc109349b8ebd995533ea9eb60f991e3e68d33bc2b930359bfab6de5e1545278a4f879ea060f5a67 SHA512 4000965839ba46c2b4c852f10cd85dda294878a41c38e22d3bb61079916c9a971b09ddae00c4af50571f940fe5db3deff35c7375fc4e3600c2015355e0b7fe73
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.2.ebuild b/dev-python/pypax/pypax-0.9.2.ebuild
index 322214eba633..fe86fc29cdc9 100644
--- a/dev-python/pypax/pypax-0.9.2.ebuild
+++ b/dev-python/pypax/pypax-0.9.2.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-0.9.3.ebuild b/dev-python/pypax/pypax-0.9.3.ebuild
index 1c9cc20d064f..89e7b5ec9bce 100644
--- a/dev-python/pypax/pypax-0.9.3.ebuild
+++ b/dev-python/pypax/pypax-0.9.3.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-0.9.4.ebuild b/dev-python/pypax/pypax-0.9.4.ebuild
index e0682223fc59..fe86fc29cdc9 100644
--- a/dev-python/pypax/pypax-0.9.4.ebuild
+++ b/dev-python/pypax/pypax-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index 39846769a8c1..21adeefc4ed4 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index cfd718540ee8..cd1cd474ba9d 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,7 +1,7 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.6.0.tar.gz 14273 BLAKE2B e91f198d23eb0791dc610e4b9af940694f0857243fbf5caf46d485882a588e3ab537e2a190a1b40e0d9ff4821c8bf977da19559a5b33694d106a68f1001f61a9 SHA512 faf1cd8568a911b263c167fedace8f5f6756e108e3a2484dffa8d3da441311fb3277fd703d5eaea662181250d7b2cc975e9f8ca484dfa2d1cd4470171bbb972d
 DIST pyperclip-1.6.4.tar.gz 15687 BLAKE2B e3520e228bfe2f2de1d307e927f15cee7e5327acfe07071432605d0c0c021ff6bb702e20a743da8120db58fd12a05fca19f5881e80851f41d2cc1034e310f6fd SHA512 4a07476b96fc704551248eb4eb2d69a910f75c266ef0adf4bf804f8694645d910089cfef831569e1d819570873ee75c4339024a89c56fe3eabc5529d07b8a540
-EBUILD pyperclip-1.5.27.ebuild 479 BLAKE2B dcce284a3e189dd337b58455d51e0061d673444f95ffdd7ba0a738e2f8fe6d8532a1297c97cc957ee50d0c2322baa36bed2a4eb479759e2f1eef45a759884bbd SHA512 13184cc9df4c59d81cf4c94b44f91ff61ceb615bf1bcf88e50be10f8b9b9c01d0d6dcfe5c9f444c5f1b712944d8fd5a26e5b46c23d5c4f866492e1eca0b68feb
+EBUILD pyperclip-1.5.27.ebuild 486 BLAKE2B 6c637d20212334ed13855224108bb156f6ebeca6c1e462061c93b39fbb1319715549eb199503048899dd1fbe3434523976ae88ae14d479e8eaaf6ecf5ba4e212 SHA512 681d3512447be970cf4768d7bd85022c54436b09d22e17a5f127e5721302a2e29e5e8f2c0a02d6be915052bd0221b7e50d549ab50c1fa24e849c1415440c8a49
 EBUILD pyperclip-1.6.0.ebuild 485 BLAKE2B 06c92bdac6bd1616b938717d29972ba5031e1dda7d48b81aeb46249a6d51646f572f7f70f0f79c7358b69d76c1ce1dbd4c5a1276bb382778e9238f8ca52d78a8 SHA512 ba3ccac1e5ee186b9c4bc45a36e2b432aaff44815da6db11de2a99b458572e4faf5a4a1734054f3e6e4b63b7953d3f506f0350d7669c26f30e9038eebde21c1b
-EBUILD pyperclip-1.6.4.ebuild 466 BLAKE2B eec22f3db2ee34ec58f7ddf518c591c114de615527db11efedf79fcf80ad3839eb7b91a0bf4ec1b11799a8cc3aed57e1637178ec8ff0f40e39ce2cc996217c07 SHA512 88e9a5904ffde8403f50a53db7db29fc04b88f10816ad35b4d7486491de451c55dafa9809fdd8e5eec645bc5578b8732cb591a257d964ad4eff24dc856d26196
+EBUILD pyperclip-1.6.4.ebuild 473 BLAKE2B d1284578c236eddd7345622673bc9ee80b72ef6f0286c01adf49f270fe1b605616ca84621f7c7f6fd6f072657dd28609042ba649c45b5eefcbf609a69153c3a2 SHA512 5ed5d5d6facb00e9f34c57ea2f8ea58c06d78571f745cb9b9043e52e38bd05afccfe8c58a3502a6ce0b17ba5a94fac2180079ee8a9c64929fa99bc362ee604af
 MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
index f57bea1973fa..d42e162a4f0f 100644
--- a/dev-python/pyperclip/pyperclip-1.5.27.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.5.27.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
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy)
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 pypy)
 inherit distutils-r1
 
 DESCRIPTION="A cross-platform clipboard module for Python."
diff --git a/dev-python/pyperclip/pyperclip-1.6.4.ebuild b/dev-python/pyperclip/pyperclip-1.6.4.ebuild
index 32cb49e01f95..46c573cd992d 100644
--- a/dev-python/pyperclip/pyperclip-1.6.4.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.6.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
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy)
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 pypy)
 inherit distutils-r1
 
 DESCRIPTION="A cross-platform clipboard module for Python."
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 35cbe4a3c479..4fc9de245a5f 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 592 BLAKE2B b0d05af459b4fcafbc41868b19f709df8934191b4e26689669f446c2035a3aa5c316d6f53a0d7bfaa44ffe18260b60eba01ce4247c3f064294e1529e26cb45cf SHA512 40df0045746fe5671631ae47da43e849068daa5cdf83aa4e2e5a590f9a822cdc428cba202041d5a9c2f1a2cf31e794e604c13adebf50b4dc9eafae202707e31b
+EBUILD pysendfile-2.0.1-r1.ebuild 595 BLAKE2B 76b186cc4c3f0c221fff5da5fdf4bb7fdb494aa723e9a07afe420b75401ce0a85d9516ad86e8095965a0cc4355e5c0809449d0994da0462a5ce64062124103ef SHA512 9489a87a01fac4fcd8473908aef83d513f255fb07f924eb7189a78567c6e874987bd4aa150d8a51015ca34827c48d8cc0232b89a2d100cb977778cc8cb386df0
 EBUILD pysendfile-2.0.1.ebuild 580 BLAKE2B 4b46ab0ccf42caac14fc71959e5f03cfedf6f3b4e1c948801149f3c94716d4e531d593809bb04731368bc4160641e2f783491528f8a17ce1e2110b428a1ef6c8 SHA512 0f4ee50255013f0777e5d74a296576f228c2f1c640e616d67cc8184437141c54ab5852704396d25075616e527857d08bf8ef21870e26adfecc3916d292095581
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index da9e8e132bdd..b12594163014 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.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=7
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
index af8fc5ceb853..ed83ef4e8d55 100644
--- a/dev-python/pyswisseph/Manifest
+++ b/dev-python/pyswisseph/Manifest
@@ -1,5 +1,3 @@
-DIST pyswisseph-2.00.00-2.tar.bz2 458443 BLAKE2B 4fa6cfebe46bf0d73bf9f086acf9189a6354762fac604f4dfd3fa6f5d36a6cbb8b024e9b8257d7f84cc74db1a5e63e6d495a33970d0c83ed95675914539d9217 SHA512 009542d370248989489e4d2a557b5f5cac27923bc06b9a9088b282f3f9cc8b31bfc43bba9cff3a44f8a77e20356b8a9ced60ec200b26815780af5588efbc9e4b
 DIST pyswisseph-2.05.01_pre20160529.tar.gz 488382 BLAKE2B 3bcea971448b13c40f440473ce2da13ca18796ab645265ae813fed517ca7062342170e0526b48a19b8686ac82526a16654b7c8e4b7d2dcd8e854c116d1fbf911 SHA512 afec6ce93a34ee116ed5247ff0004cf7c3adce33b4e0f95aa251b6b533a8925340d6f6d847ab80dfb2cf75933939d282455e7dc1f812c28ad45a42f21ce1e611
-EBUILD pyswisseph-2.00.00_p2.ebuild 646 BLAKE2B 18798311c7d453908aed1473e27f8d75ac4ea44f621340871c4d777befcc79dcfb48f079e31c2f9c02ebc783143d16e0f0c624edc4eeaa5d6206aee58058d97d SHA512 7f0cd349401692f044d4a7829627d848f6c90dc9ae2c4b45ad6686ea4a1386d7248d53e97d0c7df1d8503586841d4ed646cf4100657a51dc42e60ce1da75b083
 EBUILD pyswisseph-2.05.01_pre20160529.ebuild 665 BLAKE2B 755ce7cce89be3bac672a9ba11d5dca6e9e6250d8f0bf47e24e6da495083b355fb2c91e0b0bd520bd62e0df724741fa12de11e998af27aff5af29135e5596ef8 SHA512 0a321a8ea2b497e29a062454511997a8da8c6862c280641cf830e49c8f15b6a7ff07a63c38267557e8899e98ead0222d2e072eca5e261ecc887ca8bf6149bbfe
 MISC metadata.xml 511 BLAKE2B d88458ce79785b22bd75c3b39e845dc0a91cfb30aaaee7780e15b422edf1dd8fa0decf325238bbf34c469756fa31cba346a3cf8b9dcd7659a4a39bc967519f88 SHA512 b81b9b0110b7460c3a308a4a914ad59ccf21e1d5b003c898167b803b57720cb66e29d070d6998a6747d61039be9a364d907e517cee2ad31f7ad533e687d756ad
diff --git a/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild b/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
deleted file mode 100644
index 0f594661e4af..000000000000
--- a/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV}-${PLEVEL}
-
-DESCRIPTION="Python extension to the AstroDienst Swiss Ephemeris"
-HOMEPAGE="https://github.com/astrorigin/pyswisseph"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/astrorigin/pyswisseph.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 3f571788aa50..487470699e3c 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -2,5 +2,5 @@ AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136a
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
 DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
 EBUILD pytest-relaxed-1.1.0.ebuild 907 BLAKE2B c599c1b1a8e1f18f7fe0280ed7d5337e201d7fd61839ce151522c2b0316de7b48a048c16424dbea8817afbd3d9cd3ad11b1bedfe1b6942c6582446e259431f13 SHA512 4b9f17644496b1408960f76041ef96c1d311d0c86bb69324465985ea7ca53a5753687716cb7eea65918ff7273b038fd1d64e7aec5b34fd343f5e91479dc32140
-EBUILD pytest-relaxed-1.1.4.ebuild 1390 BLAKE2B df98a21a19a1a7978533d71bc924035bce386097a6a1d1029c26a0ee67a32480862d85a92671e98c847f9c8c67f4be04eea4640e9d7cf8b5753419cb7cf1ab4b SHA512 e6de854d1747375b8f718a2de132a2fb3ec1462ad8cf904e6c882a17374107d0894213d9bc1703d506fa1fd33e7f32670960535fdab5f64242a856d415f89da5
+EBUILD pytest-relaxed-1.1.4.ebuild 1394 BLAKE2B 3cad675734954bbcc16c542c1f52781179a99cc2eff0251fa8498257dadb8b09b1a9a0d5ddc954bd78568cf2e34fcf9027e44f06536370d826fb81907f7471cd SHA512 518c946f95c8ca35496e623d4bae1f6fd716ccbe422b231685b4541116733b9c40560ad4f91e33b8e0d767b53c67cca6694eb72ff680aa97337140008e0c39cd
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
index 5d49d5872621..a8d878aa700e 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Because of its <pytest-3.3 constraint, python3_7 can't be added
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 3966029ce7c3..4066666771d1 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,7 +4,7 @@ DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e7
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-4.1.1.tar.gz 903912 BLAKE2B 6466f8620ddf509ad17c9fddd8d9afd8cd53b67673bf12c603a563daa30decd6ca067ec829bece49505650536c02854493ed27d5dd350f2bd5cbd4c71c85721a SHA512 e93b742b61fdba7518d833bdc312282347853abb1fe76920f14e791ede2af57513b521b967303483dfc2e308ec83c9c9e1f8d81489ee5610808e3b33b42b8452
 EBUILD pytest-3.10.1.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
-EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
-EBUILD pytest-3.4.2.ebuild 2503 BLAKE2B b1b8a3f91525681813116bf7d8923785d2159adc0f732ed3ebd8082af0d1d2af8de07b64d06b952141801c765b3756bf55bcd646b50812a8b043b851153ff60c SHA512 e4d5459e203944d7e00324287cab06454ea78f2a0d54b4bfbb88facccd7ebe4401f2d9b3cfab950af1937c8a09faa5a33c6efa5aa908e7896454f8e25c7fb873
+EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
+EBUILD pytest-3.4.2.ebuild 2526 BLAKE2B 36db6c9d56c65ee6a43b0581bd780108f9efaae100817432d1b7a91b4b665b45435732aa954394046ee2c96cfe73b350186ac7eeab8ea83121c381c076c2ec01 SHA512 526a34d56e1baf2bd979ff03103671f84b28252ec5bfe47e44f78ecab9eefa5f0d02e0a7e691d0a805ed29c8d3a6e25ede0a9ba09fe297e17df86442ac37be5a
 EBUILD pytest-4.1.1.ebuild 2109 BLAKE2B 6a4775271bf420377c5f70aacb40b633e71fd02f42a43d782a8156ba92f815422b7e88ae2453ec28250613a18d371940ffc0859d22a7117c64463695a76c116f SHA512 2e9efbbf954c0910e974457e5f8e9dc9cb915e76954154dd6e62f35a9319918507753741fd874a75737511f2470a55726af5d0c8578753d118cd9be83389b8d3
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
index 430e295aaf5e..66539b1e8c2f 100644
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ b/dev-python/pytest/pytest-3.2.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 7dd289446947..48893ea784de 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
@@ -21,6 +21,7 @@ PY_VER="1.5.0"
 COMMON_DEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
+	<dev-python/pluggy-0.7
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index d5a079a7ec74..030d60fcc4b9 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,5 +1,3 @@
-DIST python-evdev-0.7.0.tar.gz 80508 BLAKE2B 9c3048d649d41b7fc0dfa1af14239a0bfbb5b85c577a8de0323cf35eff79324703987b0a5ec27c06fd277f6ddf76bdd1c7b0b2e589d03ec205c8a7eb0afcad70 SHA512 9757ce392d08f9de0446963cf5351a66dbc2373426bef26e63d71623df1f7c47d90f6e454649076ded214878e67f321380646da3f76bc0fb57f7eb9bbecd3e7a
 DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
-EBUILD python-evdev-0.7.0-r1.ebuild 645 BLAKE2B e63ee394c6c0728625f05c9d790de54fa3562d8ae7c278fbf9ce3dffbf50a9d845673e383debdd00655e5416aaf34ad609e71686b78ff7c4e971b866e89539a7 SHA512 60ec8e3d83f4be8fd85980177745e606fe5c4c2dd19a9ea7ee56c815a9b44e633ac20bba09a8b390efe58b8690ede1e25af21830138287e37b54e0aeb75e6294
 EBUILD python-evdev-1.1.2.ebuild 642 BLAKE2B 67b7f8265d7f1707926ff711b89e005667376e79bccc3e0f80a811c89abca41be7c6f6d6955e500f1ccabdc39373fc9b918dfa1ed2070290facc1d1e37b47869 SHA512 a74bf46bfe085d1fb41891aa196e17b1788e89ad9464ec11cb5bdc784e8e9844d3e12b39d5d31a9b3c0a729971b8dbafe5fa980f3bb12cc557681939c4561b16
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild b/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
deleted file mode 100644
index 8f45fd510f8f..000000000000
--- a/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for evdev bindings"
-HOMEPAGE="https://python-evdev.readthedocs.org/"
-SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_compile() {
-	distutils-r1_python_compile build_ecodes \
-		--evdev-headers \
-		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
-}
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 373f674af70c..d4aa51f783f1 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,6 @@
 AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
-EBUILD pyzmq-16.0.2.ebuild 1747 BLAKE2B eec022024457a0c35163b38327c56f24e28f9959f7002cdf142cb66f8099ea41886386a26dd49d2b6c81b4e229c93922fb1deb0be75c2617ebe97b892089b401 SHA512 451e934945195529585163c98e84fb968acf3bbcf90ba98871292aab19aa01fd3405adff253988447505ce20a6d2ca54c0c87d1321175dc0acb88d9437a8f6a8
-EBUILD pyzmq-17.1.0.ebuild 1821 BLAKE2B fbd061f1652a94f0aeb8cde87e67e7206d7fe11e3785af0d5310f203a2f903ba1ac070de826dd94e3670f6dd5573e6f4dc0f21ee9a3733a2fe1e75826eae0e4b SHA512 395b83a1d2a029b129ababfbb15b6f06db7e3ac1a4333d89311d8b340c5863605d9efe04d996ad3fcf95f83e8358ac7d138db29fbd45b645a128dff56199b645
+EBUILD pyzmq-16.0.2.ebuild 1746 BLAKE2B 5aaa761bd1187d85444375234d1a2648734a8c52b371561e5ed8d0c6b6b3ac4375e35e545ccf6df472a7ad1a025ebceb8227a284a95383f6358daae267118cbb SHA512 e4d38d80d10b85218fa47e1284ad985fb704d8044fcfdd7b6122a89de978c01be5b0b1d74d8fea38db7caac8a84225d05699a5c5f0006a33cda3b5c353e1842b
+EBUILD pyzmq-17.1.0.ebuild 1820 BLAKE2B 40d91128a899ced913255a709e931f06986ca48e4cbcd6e06a0c8298a3a9f33cf006eff9c0e94442674c52447ecb008324389ed076850a9e2c1e075a7006a11c SHA512 bc8ed94f0d1708a88ffd262fa1d042122bf0da33bac7480dc4798f90ff29c97d75572afc76fb108e1cd0316f84b5fbb6fc4bb912e7c22a9b13fa02f6182d8b0f
 MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 6f7275ec29f2..422e2e3cb9d4 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index cfedc1d359c8..38a40849afca 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index e005f44cc2cc..0fdbfd8fda23 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,3 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
-EBUILD qtconsole-4.3.1.ebuild 1707 BLAKE2B 4ee6aebff46ca0c98ad9c8c5f9721c0711a88523d279ee1f0209dec4d151b4a6a55d8934e2043f651fb0100ffaeea582fe7e6769833896cdc09ab277f247e49d SHA512 13a39c14b6d43b3baa5d565750583a4bd03e48376e3ea795ecf15b88ed3d1fd425d09db16e291d017af7adc7a9415bb8ac6ab044d742eacddae755d846449fc9
+EBUILD qtconsole-4.3.1.ebuild 1706 BLAKE2B bc316912f7cd8506029f24c3924568e27b1851d7d6470d86e22b948f61919e3727a078301886e78f7477d03a76b939daec7b238c6d0516454a8000a418ab6ae2 SHA512 50b9bf691588d100276dddf1f881bfa68d688889439c95e8dfe39b70f4eca3155f3c5c8c03c0f428425e7067811bdad5cc2ec3a6963db81c930b65adf41def96
 MISC metadata.xml 557 BLAKE2B 09988fd98b75ef9c7847cc1035f6d8726375ec61638dc9ff01c0ac9556ce16afe987a66e0ecd674a376fb9af39ec2c721e04abd829f1153652d8eeee82c089ff SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index 28b1ec5879c9..0b879d52f50a 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
index 5af986d49add..1596e06da5b0 100644
--- a/dev-python/raven/Manifest
+++ b/dev-python/raven/Manifest
@@ -1,9 +1,3 @@
-DIST raven-5.2.0.tar.gz 225471 BLAKE2B 9ceb05f33cb10718af39cbb30aac0e76a4d7c79fa0fa89ab150506985de80bc364490766e974ef7711fd45cd4a73ecaee9609b6a2f585398a7b91af4590c2906 SHA512 a7e82d9060f466500e429c119a184da1f437632dae76dfd3b24b2101e3fcf0e7fcf8b7371c299e5174c15516c127a3e437269d62d908c59f02c587f3ab528b21
-DIST raven-5.3.0.tar.gz 319160 BLAKE2B 5e4b3c817e077210381354e990b9676925ef46b31afe29e615342b63659d5a434a672105ee8b0aa5319bd9e21eae75521be74b78e9ba16aa5d39d032c989ea3f SHA512 805a0910aea0eed73704dc57a32482a5b01501c27c788c105b84d12241480e70d1454ab54d924e6c8e5ef03764ed5759fc79482ee24417e801e9634353160df2
-DIST raven-5.31.0.tar.gz 275545 BLAKE2B f7b93a21884d7d0de3af5b7562aa96962babc081d292ec1e0edb8f06bf572c73c5862eb2829faa06c75d990815912cf52f789ee19cdf73e0835642e758bb1e20 SHA512 9299f980640dc5aa4d4ddccfcab4b6b514eeba389aab084e267221c0966aebbe56836b07668e74b5362d51928ac4b708913f081b73a439dde8b74a37c159b7de
 DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
-EBUILD raven-5.2.0.ebuild 481 BLAKE2B 8ccad623ffd262e5091cfed5f0a6ee97260dbb65e1db5628b9bbf8c2ad37f79a9efc7cd02b300551fa2c745cce22fb78c39419f2ea43c0aed01bea67d9fb3f6b SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7
-EBUILD raven-5.3.0.ebuild 481 BLAKE2B 8ccad623ffd262e5091cfed5f0a6ee97260dbb65e1db5628b9bbf8c2ad37f79a9efc7cd02b300551fa2c745cce22fb78c39419f2ea43c0aed01bea67d9fb3f6b SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7
-EBUILD raven-5.31.0.ebuild 543 BLAKE2B 985dc16abcb34ff4fb46e8afe11d4ece2e6f32c91333aab46ad2785b6b7ba3766b9731998ebb0ab7693fa64c7d469040e27b9a655ab007209587b9e221977406 SHA512 71df717aedd8a2f09661961c7ce50e03ecebf3821b4294c7740479a9c1f87c03631f64adf2335ea15adec34d0763dbbcf4be64eb246b140204c8af85dfa49b53
 EBUILD raven-5.33.0.ebuild 547 BLAKE2B b264e24a33d426d5c5ff071de9b34a720ae83d7b2d895ac17beb782862670250418d65d95f57d8d2c356ef66fca529fcd6a31d5d94cef4e3e210d7bdb13f4a5f SHA512 8c58ad85d156d748493038e0144f93a6c1e153f3a2c205efcd93f3f15bdf62e24a4598c5d597c90c66f2378ecb544e672e11b7d863b2020f5d6238f2ca057288
 MISC metadata.xml 302 BLAKE2B 2948facec48fbb66ddb7c0acc7ddc49e671c9fc8d0dd82114971e1382aec4615aff364a954f9e3b2ed23285405a0e047ad0a6aaf33f4166c0253c0aac1d34a79 SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8
diff --git a/dev-python/raven/raven-5.2.0.ebuild b/dev-python/raven/raven-5.2.0.ebuild
deleted file mode 100644
index c41df2dc2ebe..000000000000
--- a/dev-python/raven/raven-5.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Raven is a client for Sentry"
-HOMEPAGE="https://github.com/getsentry/raven-python"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/raven/raven-5.3.0.ebuild b/dev-python/raven/raven-5.3.0.ebuild
deleted file mode 100644
index c41df2dc2ebe..000000000000
--- a/dev-python/raven/raven-5.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Raven is a client for Sentry"
-HOMEPAGE="https://github.com/getsentry/raven-python"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/raven/raven-5.31.0.ebuild b/dev-python/raven/raven-5.31.0.ebuild
deleted file mode 100644
index c77e0b776b36..000000000000
--- a/dev-python/raven/raven-5.31.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Raven is a client for Sentry"
-HOMEPAGE="https://github.com/getsentry/raven-python"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/contextlib2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
new file mode 100644
index 000000000000..6529367e6bf9
--- /dev/null
+++ b/dev-python/reflink/Manifest
@@ -0,0 +1,4 @@
+AUX 0.2.1-correct-test-deps.patch 325 BLAKE2B 33600ee1ffe704b26ba310dcdf4bd75850a6c8805e184f0aa90194600cf1bc6bf3005978ad957dcf2b8f14ea5de31e35f902c6304974f644c755013e4c6451fe SHA512 bafdd031a205891dc171a0ec0f8f62085c15ab7909e405444e88c6fede2f8640bcacc3e9c7f5e99244320770fcbcbf9009fc9da06d838905f7a388f7af124894
+DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
+EBUILD reflink-0.2.1.ebuild 1020 BLAKE2B a4d18f27b94032a9e2266ce0e7e0283542ce9d392d592f440980f213463fecc424ca076acc25886aabd85e205c5806539c1e06e7c35f1e24e45e44a4a287bc6f SHA512 822c2e0494959cfdbaba5420170e2c596e0f8125c270501363f95c4c76b445f5e01f14072909289bd18e3f6ae93f1e9892f8f97af47443c61c8dcb1ea22cd1db
+MISC metadata.xml 493 BLAKE2B d7e0d0236537a68ada8c267aa6a2d6803a4f88e82938a73a7bcd0cf9cb5567177745f5fc2c1d81e92f17501672a430439845be6c63b7853cdf927302259bbec5 SHA512 8a4c8db0dc28f8ee0d6bd855554e8cf1f7661f5625f37ee04483fa918ac78d238487f1246dca1c96f647ccb6e9a35bd22b171d659ff06cd616c369d01bfba221
diff --git a/dev-python/reflink/files/0.2.1-correct-test-deps.patch b/dev-python/reflink/files/0.2.1-correct-test-deps.patch
new file mode 100644
index 000000000000..78b1ef8fd94e
--- /dev/null
+++ b/dev-python/reflink/files/0.2.1-correct-test-deps.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index 234c92b..3ef3237 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,11 +20,11 @@ requirements = [
+ 
+ setup_requirements = [
+     'cffi',
+-    'pytest-runner',
+ ]
+ 
+ test_requirements = [
+     'pytest',
++    'pytest-runner',
+ ]
+ 
+ if sys.platform not in ['linux', 'linux2', 'win32', 'darwin']:
diff --git a/dev-python/reflink/metadata.xml b/dev-python/reflink/metadata.xml
new file mode 100644
index 000000000000..e3b3aabe2dda
--- /dev/null
+++ b/dev-python/reflink/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python wrapper around the reflink system calls.
+		Btrfs, XFS, OCFS2 reflink support, Apple macOS APFS clonefile support.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">reflink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/reflink/reflink-0.2.1.ebuild b/dev-python/reflink/reflink-0.2.1.ebuild
new file mode 100644
index 000000000000..59c051cb1949
--- /dev/null
+++ b/dev-python/reflink/reflink-0.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# goes places, like writing to /dev or creating btrfs volumes
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PV}-correct-test-deps.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index d562bb6d7337..315ff274c5c3 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,9 +1,5 @@
 DIST reno-2.11.2.tar.gz 74623 BLAKE2B 5c985a81fb6ef7926eadfd1b096f1a1358cb814100b75c6175b6507c2d9ce64f5a06799164a7593cc40f00695cf538c9a49bee1a4d0f78c115519d660681b315 SHA512 b2ef0d9112e327d3a581bfe9b4d6e47b7b4edaa3fe463716772438aab0dcee445d94aaa93bfc7036ead297206353ade73a34d148521ef5d25abe9ca5e655a13f
-DIST reno-2.2.1.tar.gz 56013 BLAKE2B db1966cf542e74e6842be64ee6a1a13cefcedab261bab951c9e39082ab0c0bf278e0b88bf3e876250f141c627a3625fb8038d190a6d58ee8d87054a86da38172 SHA512 278a7a43168f9467342f25c3eb8692e119cac285940b5d3f5a13f8f45acaffde962d2eeac720f2e5d824d085446fe5d660ef7082f95dd3c0360d594de5a65fb1
-DIST reno-2.5.0.tar.gz 62819 BLAKE2B 1446d1289749df74d09c123af69dc6cacedb539b8387c73a1b0f0425651679e1332427afc482ba352e5176a76fcd6bfb65b31f731e0cfb2d137e23b739110b56 SHA512 ee7c44235dd1c3c253b426abbafd490658d642d56ebac5688dd1e3fca45451f26855f421b252c64f9e143bd67c8b08a9e4c6b79edc9c7341b26150a576458570
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
-EBUILD reno-2.11.2.ebuild 704 BLAKE2B 648f03b9740ff41dceca1f7b477d1ea834337ffb83023da46fac1069cc02bdf8337eb94c13f6533b80d907795b683eb0683de3c5c1308a147f0a639bcda4dccc SHA512 e9f1280c3f1ca7278aeecc6d3514f6586c849a6882cf3ed2f85e12a2d0200a7d0f6413c3c7d07b2f2d41ed369b11bf17523f56749e86d4344817bad6b2077a8c
-EBUILD reno-2.2.1.ebuild 746 BLAKE2B d8f052f0953095a994f5a1dd01e31a33721eaa10d9df68484ec9d3dc754c11da7b849e4f14dfbdb46cf8b845ec94adbc2c59b254882f0080056d65103655a1f3 SHA512 5e0ac22ca3fc3f57e2456ecac66e43854d27dd0c96e44628829943f57cfe4e9eb979aa586c209663a77b87466c449322706e69a87a744cde2f9d0cdd77e2cb3c
-EBUILD reno-2.5.0.ebuild 704 BLAKE2B 2efff3f0bf056af60c0148fa8ff624483c5d999fb82204a7a89155e5c583b8bf0ae9a3ffd79ee46c4da898841e76e4c0817e0c2383c00a8eb42b8903184ac065 SHA512 4f21170c8340f9625c9cf36f2907bfa89022437614c2e0b456730d343fe176a80e0ff739db99a966d36aeb0eda1d853857e70ced3ac03aa4b5246df522d577d2
-EBUILD reno-2.7.0.ebuild 704 BLAKE2B 6b6c4c23cf6061a51f185e31802dd73da48aa6728fb4e9805a340ff44232cf29b63498b64f38d708a39dcb7927335b09834643cd52e1457c7847df84611b670d SHA512 3623c0eac688e7225c21cca2aeb4707b5427fe55c64eeb7ecd1c5563ee3b5f647d52f3b0b2b8fe1109be1071974b885eeae884b14546ee7e9c9371a30ccf0edd
+EBUILD reno-2.11.2.ebuild 713 BLAKE2B b5df56d1a88d374322f2b13c6f99bd3161c79a8812c87a93b71c4b66139b93717f06dab60c3b8f4e732c72300a1cfd427a00fa0d2192ec1d3373689f89e93994 SHA512 e8075d3793cae31fffee5f3fb983ef9c61e20b923576b5799538a7694b27c996af043bcf3956fa3c3e4c68bee587198260a3a17dc3e32fa9ff79d9864c536fe8
+EBUILD reno-2.7.0.ebuild 710 BLAKE2B 64316665d5805010496c2dca07560605d0b97a1e95049f3d39c54aa7450418bcc94c7faa4f26618877084de4c84d9fe4c48c86533e8a2d44f0b91481ce6bec99 SHA512 26e48b01afadef27b17e7b25f17ffa82a55480111cac424f27ac0dfbbfbe56513c45b3be72e1553b6189a5a42a5c828ee05ff9819c5d568f402b277a01baa73f
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.2.ebuild b/dev-python/reno/reno-2.11.2.ebuild
index 699a74dcfdda..6c2893665fe8 100644
--- a/dev-python/reno/reno-2.11.2.ebuild
+++ b/dev-python/reno/reno-2.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-2.2.1.ebuild b/dev-python/reno/reno-2.2.1.ebuild
deleted file mode 100644
index ffde3f5bd9ff..000000000000
--- a/dev-python/reno/reno-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-2.5.0.ebuild b/dev-python/reno/reno-2.5.0.ebuild
deleted file mode 100644
index edb09f9a72d3..000000000000
--- a/dev-python/reno/reno-2.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index 867b9627b70d..3740aaf3589a 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 450c419cf69a..12de20e8b0c5 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,7 +1,10 @@
+AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
 AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da73706201da9c14018b7a1789621ae53317ae8d170fc50fecf860b7b0c84c1016b24a505eef778ae6fc964fcf01 SHA512 1a5f4bced7be3c706b57c262dfd84fb539af42ae49541cf68d01963c8c79c96ad0a8389f36f486a485d258e9aa860c195e061c3c34070cfca3e64b52b6c89cd1
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.4.0.tar.gz 1995779 BLAKE2B e1111e784ead913f803ba8151bf3585fdba9fb5e0c1d568c839d5ac08f5e6757b608c8049644264dd1f0bee5b4bb0c1750640a70feef34eff8e276d9929377e9 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
+DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1666 BLAKE2B feaa5cab8351bcdd953ca8eee04bfe94da9d6b46d76818e3f45f9dabd7a4505ee774a0d4e7a2bf0dcd9e2cef49278340c8f51f7372c866ac9f8109dd6a841a06 SHA512 368eb6c3688f99ec757ca3c5d7ce2230ff642e8248b6be9bf312b7d985ccc9c2acc0e4eea773419c5eb9ca944a0cbcac0cccfa4455ac39858d74873303ed91d9
 EBUILD reportlab-3.4.0-r1.ebuild 1704 BLAKE2B 72af91f7ea47a07597afc491bdc8dcfadf8d7fbd0c24008b728513d4245a753574e0ccc18c43715863cf31835c693cc1dc2be100c23dd6a816e0913b138effec SHA512 1ff7009e8a4edd92d9d9ac3a43ab7c26e04efa5fcc36792f70669a82225274dce2b574fc0001d952922753c510cfb689d3fb3440b5d780866260b5279fb4e0e1
+EBUILD reportlab-3.5.13.ebuild 1486 BLAKE2B 5784528904cfbceba23f355f1297efc1fd4a1824e75112a866d4392c2ec7b257b71d73e0669e70b907d79c66a4640f73d658f7abdd094e79fcd7baca0e275d54 SHA512 386d2a982163272b2f8962794993668556f81b5a4fb4296b6aad440c72b4415b7b44f28d53985a861cf1da1957920359a5dbf2d5278735d801b598bcb7f49cb4
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
new file mode 100644
index 000000000000..e1a760d4d464
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
@@ -0,0 +1,23 @@
+diff -r f52d1198146d tests/test_lib_utils.py
+--- a/tests/test_lib_utils.py	Tue Jan 15 16:06:40 2019 +0000
++++ b/tests/test_lib_utils.py	Sun Jan 27 10:21:29 2019 -0500
+@@ -112,7 +112,7 @@
+         "test open and read of a relative file: URL"
+         b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
+ 
+-    def test9(self):
++    def xtest9(self):
+         "test open and read of an http: URL"
+         from reportlab.lib.utils import open_and_read
+         b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
+diff -r f52d1198146d tests/test_platypus_general.py
+--- a/tests/test_platypus_general.py	Tue Jan 15 16:06:40 2019 +0000
++++ b/tests/test_platypus_general.py	Sun Jan 27 10:21:29 2019 -0500
+@@ -587,7 +587,7 @@
+ 
+ class PlatypusTestCase(unittest.TestCase):
+ 
+-    def test0(self):
++    def xtest0(self):
+         "Make a platypus document"
+         run()
diff --git a/dev-python/reportlab/reportlab-3.5.13.ebuild b/dev-python/reportlab/reportlab-3.5.13.ebuild
new file mode 100644
index 000000000000..31366f726b1b
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.13.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+	media-libs/libart_lgpl
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5.13-disable-network-tests.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd tests > /dev/null || die
+	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples ; then
+		docinto examples
+		dosod -r demos/. tools/pythonpoint/demos
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 4e740bc8c1e7..4123e8e07e2e 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,19 +1,5 @@
-AUX requests-2.12.1-system-packages.patch 492 BLAKE2B 8b094ceae19926bce6dc83ac9e9faf6d853c3e7989e9fcdfdebe72cc7c520a33d393216974e5a7702c3139b6bbdd9b287929546894412a4e97a5ee510c4e0bfc SHA512 0f85689cfc0f100052de77af818b1e897ba3f199514dd769247d1a58a12bdb6afea12fb7a01199414eca02a4eaa5446f47e1ac7206a47580aa8880121edc7a30
-AUX requests-2.14.2-system-packages.patch 665 BLAKE2B 119604df7f3499536f6788c8e841ee23a23c72228bbc53f166c9136a1d167ec003b620ffd1c89ca4fba1e53aa7670ec903f4887c6539ab1a99b03f316c3a2a1d SHA512 0452537662eaadd8336dce1679ef2839ace898a129ce9c10ad4b35558e809fa8705ae29cddfbc8a22ec147c7c57bcf7a742c25e1189fe1f10c091b242f74867d
-AUX requests-2.5.0-system-cacerts.patch 694 BLAKE2B 68294e60112520472f7c776283a3bda8fee99aa7039134a1afb3965a5e44ce225b3961b7ddb26496da4514ff3a5a5867d00edf4ebfd9c117b8c7524939baf009 SHA512 804a2e2d46b6377c3f2a675ab367a1410e1f333dc6d087535f7eff73a78da06cef5ef66c3ad947bc1830aa373b963bfd30b4598eb6ca203a0f7e532cf971d145
-AUX requests-2.9.1-system-packages.patch 527 BLAKE2B 1e07bf34117b1dfdff562b604d7d96fba074ea90f9fbdcdae0ea6f45867fc88933ad658f9399b69e5048de5990466e08294cf6b1c80c1b5ec2c54f490c8b52cb SHA512 f7f77fe81f2d98cf2777c3388aec82ff0bd0188dffd047b46fdf514e19859f23263780e7e9dc828fdfe7f08a8e9ee63602f22208d2927a65fa45b8361444169c
-DIST requests-2.11.1.tar.gz 485936 BLAKE2B a6396da4beca66a0b546b92cebebb33352dc0855f50bba046bd40d7c65e71cdaab0b36496060dd4ee9c88b851f1f6e0faa4a2be5a596b475a08bd5359da43a0d SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5
-DIST requests-2.12.5.tar.gz 548336 BLAKE2B edb163b945289fe6d75365da523505d25eab47c5686f5e44a3eacd2a70adf1a45320e0bc8d5b91f10fae065117435682523117b4d338179c2a01352910be1d14 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9
-DIST requests-2.14.2.tar.gz 521027 BLAKE2B c8f691b126876e069556542dbfc86a6aa645233b3539ca7fc0e02f42dec22bdcbb78863e3a9cf30a976af89cd8c1403c3c379737a5e1b07c54f19b217dbec529 SHA512 f6531ada6d854a261cad874044daa9e7f79d55c8f8fcfec1b25862563127318fbf717ed640644ddf0dbe4d7fe1298d478fcd76825a3604e06cefae5990fa9dd4
-DIST requests-2.18.2.tar.gz 125381 BLAKE2B f55bee7558424662ff5d577eefc89cdbdec3a209667bd174a3ec73554bab20582867139ce69ed5b996ecfb297cc251d41294188e21bd24d2241a0ad0432582f2 SHA512 b78660e5370f9acc458159edda385fbcbbb33b0703fa2c83400f3c08fe05253f357175e2ad76c5bff4bd942ab18da5df344473e9b5a924d7457596c0ff9bfbc6
 DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
-DIST requests-2.19.1.tar.gz 131068 BLAKE2B 54ffdfd7b2c6f504071c8b55d9672dcffafd31de90cb85d354bc17d7fa19807927b46977b22a407654cdb48d7293e1b0222771d4369e148e4d6410719ba820e3 SHA512 deef2662227497b472f6e7eb7f0ee468c772069fc66552f71d80e5a12af62a187f8bc6a8a78531915e824c7f277d0db61c1534c89d13d473f68504f0bd6edf47
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
-EBUILD requests-2.11.1.ebuild 1426 BLAKE2B 77495db00c84d561f8977682cd76dc8aa47d46d3c7f30e5da10152cedaf70818570f5b54ab8d19d7390eeebaf6a00a59dbd0613d9a07d8afce8228f0a5d803ca SHA512 9ac00c3ac17f0d732584d4ddf935d61994715984456e7ec7ffcc0f5be16d7245871676cc5d2fa703dc831fab9194ff8c7bbeaa75ba32c6fd517f9c183231d70c
-EBUILD requests-2.12.5.ebuild 1475 BLAKE2B 5617a514692bd66533127dbfd47d37e5fc209d69d4429ca7557b5a3a49b4be63e36384d83c4daef2e4890d9ddbe2b11fad58e70b4ad095b2b3f95b6a0a6f8204 SHA512 8228a5867b5bf1588b84786c54d5319fed8c18be4b42e4d4a2c9a3466acc77d9fcbd4555c570c78c340d27d91ca2915c750d0bf8c25ae41d670955eb60508d83
-EBUILD requests-2.14.2.ebuild 1448 BLAKE2B 0dc3294238a801d2dd7d46abecc6a75983bbfcd60773615c61230b95e4e451d518bf2fff0d65b91cf0585588169524138e1e5b88239d68b33e4a8836dfb7bd9b SHA512 60cd358cd4be16b2e4a05c8bb29ed3f744832c783f864dab82ec83e2f44dd06d78db0b4af47d9da50b9b5ed5d3ac4b828d8f423fb007131dd7994f943f0f46b0
-EBUILD requests-2.18.2-r2.ebuild 1350 BLAKE2B 4ad48f663937b14e616ce3925c9d088b8c5666da8c977f6ac134d701029d7682bf4cb009f4da8c2f6d0d52bc34db0e3d85d21a3e3dd233b3e1d3a637d4501927 SHA512 8519166f7c084749fefd781612992847dbc0cb727b85167b1e745bfd5ee39e41c33a2a30c79bb22f57ca465895ecb5284add682aa0a268fbe4fe136f089088fd
 EBUILD requests-2.18.4-r1.ebuild 1410 BLAKE2B fcb5b635943e9a458e75a7fbb67c20eaf25eb2b26b5ab184b5d9ef928e5ee4b99b1e968fbcd6cc1597b0ca5ba9153e75ca0e1e42560ea42251b10e223ee10273 SHA512 87896952b23e4c151a00f5e636a1260dce944b1a67b00a7cf8bc285869608e399eb3a4aad842a79f44ceb5aa095f3cab26679dfec66efca99963a78347dba1e4
-EBUILD requests-2.19.1-r1.ebuild 1425 BLAKE2B 04be7607fd99a9ba3e7597432ae81fb67cce32567706edd2abd7995ce45b2677b8c054e9fb466782052c05418938ce8419b2ceb751aba880322907363bb8d44b SHA512 48d9e316bb6ac62ac98e047bf896e577dcb90bd66db48b0aa9aee0e5bd30873aa0589a29732ea1e9a462b5a6d705ffaf1c74e32b198ffbffa1e37aeab13bc665
 EBUILD requests-2.21.0-r1.ebuild 1465 BLAKE2B 5e8fcc3e5634a0e9f60358f8cbce3d887d7a55707cdc9c5be87adc4d47ee1d813b167c41b652fae56312612330e71eac8cb71c8fdbf30523906aee39e2a916ce SHA512 34f6edb1e629b279f7b9847ea199b5212418a8139f21ccd1a45bf92d0f3b2aa6a32ed44458166bb9b2214cf07a7d60a3c2057cb7abd5d95a39732be06d7d070e
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/files/requests-2.12.1-system-packages.patch b/dev-python/requests/files/requests-2.12.1-system-packages.patch
deleted file mode 100644
index 62fecf9cc7a7..000000000000
--- a/dev-python/requests/files/requests-2.12.1-system-packages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- requests-2.12.1/setup.py
-+++ requests-2.12.1/setup.py
-@@ -36,14 +36,6 @@
- packages = [
-     'requests',
-     'requests.packages',
--    'requests.packages.chardet',
--    'requests.packages.idna',
--    'requests.packages.urllib3',
--    'requests.packages.urllib3.packages',
--    'requests.packages.urllib3.contrib',
--    'requests.packages.urllib3.util',
--    'requests.packages.urllib3.packages.ssl_match_hostname',
--    'requests.packages.urllib3.packages.backports',
- ]
- 
- requires = []
diff --git a/dev-python/requests/files/requests-2.14.2-system-packages.patch b/dev-python/requests/files/requests-2.14.2-system-packages.patch
deleted file mode 100644
index 67627d150fe6..000000000000
--- a/dev-python/requests/files/requests-2.14.2-system-packages.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- requests-2.14.2/setup.py.old	2017-05-15 17:38:45.942532911 +0200
-+++ requests-2.14.2/setup.py	2017-05-15 17:39:03.629533611 +0200
-@@ -36,16 +36,6 @@
- packages = [
-     'requests',
-     'requests.packages',
--    'requests.packages.chardet',
--    'requests.packages.chardet.cli',
--    'requests.packages.idna',
--    'requests.packages.urllib3',
--    'requests.packages.urllib3.packages',
--    'requests.packages.urllib3.contrib',
--    'requests.packages.urllib3.util',
--    'requests.packages.urllib3.packages.ssl_match_hostname',
--    'requests.packages.urllib3.packages.backports',
--    'requests.packages.urllib3.contrib._securetransport',
- ]
- 
- requires = []
diff --git a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
deleted file mode 100644
index f0d9e943e90b..000000000000
--- a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- requests-2.5.0/requests/certs.py
-+++ requests-2.5.0/requests/certs.py
-@@ -13,13 +13,14 @@
- """
- import os.path
- 
--try:
--    from certifi import where
--except ImportError:
--    def where():
--        """Return the preferred certificate bundle."""
--        # vendored bundle inside Requests
--        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-+def where():
-+    """Return the preferred certificate bundle."""
-+    cacerts = '/etc/ssl/certs/ca-certificates.crt'
-+    if os.path.exists(cacerts):
-+        return cacerts
-+
-+    # vendored bundle inside Requests
-+    return os.path.join(os.path.dirname(__file__), 'cacert.pem')
- 
- if __name__ == '__main__':
-     print(where())
diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch
deleted file mode 100644
index f511d0d6524d..000000000000
--- a/dev-python/requests/files/requests-2.9.1-system-packages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- setup.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index b7ed12b..1d5abe4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
- packages = [
-     'requests',
-     'requests.packages',
--    'requests.packages.chardet',
--    'requests.packages.urllib3',
--    'requests.packages.urllib3.packages',
--    'requests.packages.urllib3.contrib',
--    'requests.packages.urllib3.util',
--    'requests.packages.urllib3.packages.ssl_match_hostname',
- ]
- 
- requires = []
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
deleted file mode 100644
index d4d0a9ff54b2..000000000000
--- a/dev-python/requests/requests-2.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)]
-	>=dev-python/urllib3-1.14[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.1-system-packages.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet & urllib3
-	rm -r requests/packages/{chardet,urllib3} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
deleted file mode 100644
index c528fbc166da..000000000000
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	>=dev-python/urllib3-1.14[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12.1-system-packages.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet & urllib3
-	rm -r requests/packages/{chardet,urllib3} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/requests/requests-2.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
deleted file mode 100644
index f344c8e9fa8a..000000000000
--- a/dev-python/requests/requests-2.14.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
-	app-misc/ca-certificates
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	)
-	"
-#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-packages.patch
-	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
-	# use system chardet & urllib3
-	rm -r requests/packages/{chardet,urllib3} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/requests/requests-2.18.2-r2.ebuild b/dev-python/requests/requests-2.18.2-r2.ebuild
deleted file mode 100644
index f445f7e031f1..000000000000
--- a/dev-python/requests/requests-2.18.2-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl test"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-2.6[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-# tests connect to various remote sites
-RESTRICT="test"
-#	test? (
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-#		dev-python/pytest-mock[${PYTHON_USEDEP}]
-#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-#	)
-
-python_test() {
-	py.test -v --boxed || die
-}
diff --git a/dev-python/requests/requests-2.19.1-r1.ebuild b/dev-python/requests/requests-2.19.1-r1.ebuild
deleted file mode 100644
index 0d6c239ab99a..000000000000
--- a/dev-python/requests/requests-2.19.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-2.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.24[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-#DEPEND+="
-#	test? (
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-#		dev-python/pytest-mock[${PYTHON_USEDEP}]
-#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-#		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-#	)
-#"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 0809594992dd..8343e3e0f8ed 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
 EBUILD requestsexceptions-1.1.3.ebuild 571 BLAKE2B d510b5432921c280df576dab2938c677e4e8a2cab2761ec500bd8711eb1e208cd4c6d5078e20a9dd64ca365f6c068555298dbac2f2513aa107e5e6852c8643b0 SHA512 c64495bf3a1f3f344b5d436e18b65449177db3ed08f417ac5328e4018c7b57474d981783e0ce53c509999cb98b4e0cef3607ee94f46b1aeed7f70308e2e1d164
-EBUILD requestsexceptions-1.4.0.ebuild 572 BLAKE2B f68644bbc51e78bce7fdc007d3c5880cc3c3e6126d71e4e75bade33ce763ad4e49cdf1f33947b83e1d07b5b8cfd0631f2ae4c7c4d5f53161f13d326c961b5053 SHA512 ef4362f8373337c7472384e4c7e0052240f6d42975b0ce91fc1cbc83122384904a31c68ea38655f0ae1d0dff3d67e1b61bd7d57363a9f71b46e3d6763456d25a
+EBUILD requestsexceptions-1.4.0.ebuild 571 BLAKE2B 4b15ee8c4e2ae79c7752336ada3a5ed66faa70b4aefda8e0b762d624db24675c7cdc1fb1921675bce26823452471b1aad561b551c5857affe264c8a47b3e7b2a SHA512 d867673462776450f83bee82dffbc9828bc95849b73fc4b9e767387b103b3cb69d08433a7ca78b2f73f7dcfbf0399ce2765e824e85239217e8cbd0de96b07740
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index f7744c4af4a3..1edf99a6d49a 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-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=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 7ff8d9d7d7f3..51d986a82d9f 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,5 +1,5 @@
 DIST restructuredtext_lint-0.12.2.tar.gz 19141 BLAKE2B 69e0cf57540d5ccce8572a8c619506e3b76fd08e88019bb66c7a18a3ca2c2b91e72797c70428156e570143d6352d529088c324b18e2a08b67a8acddda7378352 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870
 DIST restructuredtext_lint-1.1.2.tar.gz 25061 BLAKE2B 5be51fb40ac3eb0ba58c053d5b54d79e0d1c0687786a877cc37d2e617dec788782e3d4aade62828a267c139b7e311405552cb61eefdbaed458c2c1206245a422 SHA512 f44eff61df3581ba345fb953a09d9bf6977003e05078bacbeea27287b0b14a6f16298db0bde5be4ebfd0843eac33de623db1e47ce6475b30dce47cdd3e9ea5d7
-EBUILD restructuredtext-lint-0.12.2.ebuild 680 BLAKE2B 634b8e29679179bb664124fe927b09ff0d96924897268f0f84ea06bb5d98a682af663681c549a4ab23517f28a9fc8631d4fc4fb385c2e51f2a4a2da4db54beab SHA512 c7a1d91c611f55b68feedd0dc8766c5e796bb28a67c30388801e6a3681c34542be02139746a4559d49ce5ee630f362cd07513321ee1cbf46e3dc012975b5aa39
-EBUILD restructuredtext-lint-1.1.2.ebuild 816 BLAKE2B f42584b191c55fb738a4ad0f52f437838c3608e02fe54a981460216cb25e7314ee341cf98ded2cf7330dbf7e0a1bd34c0b531f23e6e2c457099679ff33fc95cf SHA512 e83f0267d906be24966fc9d42d698b316a78d771e3124b7294abc2e2d1fb6d7b5690b16654bd0e4961af6aca60cff435c151ed90e6128b9463c1e6826689d1f3
+EBUILD restructuredtext-lint-0.12.2.ebuild 679 BLAKE2B 39d69baca615563efdee7584ca0878e5ae48dbe30007bc2f374bba74980c7bd6bb7053e86d712d7bfb6855134d95379ee03c078891d9a7eb66226d2ddfa94568 SHA512 557c9b118ab103660a79255b1d8a325e835d5dd98b377ec2bc33510bc8233e86f632c61022c4657d576dd721c889ac11a671df4dd9574622e08b2bd11c9ea703
+EBUILD restructuredtext-lint-1.1.2.ebuild 815 BLAKE2B 3cdca59c708a79aebf1c0f16ea2803769f52f44857b113d3baab4275e33799b83c8f5961537b1c678356187d0ec28abb0d0c12bcf9b1ae90519026d4b3d468e6 SHA512 a3504dcc4e6a543232b26238ead057391be72e07439d1299d04141291f2379a3b38615f1b1df17cc9e431307d3fa85f853a44e73636719b7f86344ad9ce1c036
 MISC metadata.xml 338 BLAKE2B c30f38fd31f802cfdb9dfd57839acc4269c793aedde4a2c17e937f62da0f04e94ccf2cd309b528f9c5753fdc747951ace9fd27a403d32907751ca1640955a3e9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index 4eb519e9d892..6de5df7ec8aa 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index 333e56934ec1..a2bbfa8b273a 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.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=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 5137e04b860e..dfebc1b54a87 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -3,5 +3,5 @@ DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 EBUILD rfc3986-0.3.1.ebuild 691 BLAKE2B 8a16ab5c1b02a0936b3575de56cf9eec9f042886a7b436c6869a8ba621f4948d184b8ce2d61e861893e3397326f0b62567aac122571d30d02cfc6e63edadd321 SHA512 f8e7eab867f5dc53c636c86f71716a8ab34b4a80caab292d170ac7f022bc6352a611311e299415e6f07483d869c88fb66ddd6313b28605677d5cbd67ce9cea50
 EBUILD rfc3986-0.4.1.ebuild 695 BLAKE2B 47703d2f0ce1f12c65ab92849d204276352069fd180e00ff7d8e98091eb8cad0b780af7ea6ee24768104773e71020e97845b53ecaa3397c4f235ec956fb26c95 SHA512 48fce5247a98bc8531007e16b2fa882eed7bed53328e6f2d191ad1f36b1249f7442ec752596587133a91e6c19156a466671ba5311ef9785e9318b26c8c6d1dd6
-EBUILD rfc3986-1.1.0.ebuild 691 BLAKE2B 454fec2ba95ec14cabbe7aacde784477733ce3fb964fe35faea6b8839bc5be93324dd6a83fbfadb40e1410b03eab0ab2674d09af264f5b1db5c2ad761deaee59 SHA512 b1dba414a5a78acb41bbc4a7d61f55b5f55e01e4ab9d1207cb67fe0afe4a75dbc819f47ae28d772fdb10ae424bf2abe8acb4ce9c5d22667b061009445c97e468
+EBUILD rfc3986-1.1.0.ebuild 690 BLAKE2B 772ef04d000cd3a7a484f0c315e0b5f7b71ccdebc80d92404581719b949a68dea0ced367592a4707a5462656e24921e1c65ead329f09afe06d17939287317fdb SHA512 1629e90b2222bdb7ee2538ec956ff914b230258e392314b2eb0d2325ccc4f3b667538cb825293019a02751384751462fac0cc51e47f040b68ffc08575b0a646b
 MISC metadata.xml 601 BLAKE2B 0cd1efd0eab6850689b22d3012463b24fe77156d81ab4cef046f2bedf7c8d1bc9b82707bb8e493243fe6d1b0958f8e7936f749c1e90a66c3b7052d13d7655b4d SHA512 2a535235ea1111e30083c9e7799fa584e624aa39fbbb715b49aefb0ddb8b96135da1533f8bad3e4190b6eada990da906f1bbba66fa9b5a29baf4963161c52426
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
index 636645481adb..9266bb1bd4c4 100644
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index c33e5d0fbaed..9388f3a531cc 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
-EBUILD ruamel-std-pathlib-0.6.3.ebuild 936 BLAKE2B bba95c0314a3a948c776fb3ce24e245c7638333eebcf790fb2f081344c406b14d893565b7492d5a0eb9ed0e34fce3f445cc24d92086f1b86dcd04861f3681f7d SHA512 272315ba4289427f158c4420db21b8f75ab7f2a176dd8d413de366cb4f58de4416aabcc05b819b2fbb39743889fdb3e1412e3acc80b51ba9a47b4ce2e16fbe24
+EBUILD ruamel-std-pathlib-0.6.3.ebuild 941 BLAKE2B be773f3e50ff6c1e6f9f31349fc1bb4f0246cfcd2f8842cbe370550ae8c39c2daadd09b329790ddecc9eaa046ae01c1a5ee56407e7b8cb00c388e4835a025d50 SHA512 8790ed096ab8febf7fdcd763eef44ad9753d7f157b54f71eb2bd96b3280b4992ba82afc47bb0a52e33924db82212ba6c86c8f0b58e372a91b5b4adf886d92e15
 MISC metadata.xml 501 BLAKE2B 88f269dd28386ed5c49fa217cf58c68148fb67a8b33c630ca497e8c8ca328a3d66e9a04fc4d5a18c2ac0133ca99ca2903a22d05106f024034480dc72a2fe30b1 SHA512 cd00a071d94fa16a83e00864ceda1d2c15d6d3d0b581cac9dc3a2f35c794c1edc4d6049fc074a5ff1695555b7a398059d267df9cb0e9eab84595095eecb34d2b
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 742c3574f6e2..c9e2b1556ab8 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index a97663ea14a0..125d9d318104 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
-EBUILD ruamel-yaml-0.15.35.ebuild 1086 BLAKE2B 875b8fc3a7c9a573ce23a1577edd3dbdc700fc641bb875a1595e2c32db2ba71188559e33310c8c0c965011cb001d60e0cc667ccab17d775cad0f75e1372cba4f SHA512 0c1867ea6d69d54ab68d98d075ccb3edcd5786edd7d30a403b3f6fdf689d776443daec973b7699924d80405e0c87abc2aac4783ec86037b319b1a7d219240ec1
+EBUILD ruamel-yaml-0.15.35.ebuild 1091 BLAKE2B f2f33dc1d9d8f3dd5d562cd509c360799b19f8676219331c18cdc5d512b5eb11c584c4cf068524b0fe95b222bb1070e900d221ff782fe0ffcbad2b63b5e3401c SHA512 de128023de1735ae86bc50cdebbfb3dca2ddf22194f9e57f20948f6bb033e280e46930cc575f26ae4a309daa4b9c82ae50479ee87ae137f4bd061122fb9cc12f
 MISC metadata.xml 487 BLAKE2B 3564fcb4d8426e84f8e597771f9d5c8fb89a770ff6324f1af2112ca4e589cadd4f83503c9b9151ba5fb983b3afd837403fae0b0144da9ed3fb9677c0b5cdbd86 SHA512 d0db6519618ae2dc134a7ed8840a7c1dbf1e49c43fe781ccabf8ff8508ac6dcc7fab92e61b8e6cc6179f30aa5bff2c772721ca09fad15d57734a16d372c6f0fb
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index 3d2552d1e803..3f6c6bd5f58a 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 193caf4091f3..72001bcd219d 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,6 +1,6 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624a8bda8d5723087a918217041bbf6a2b20976b0b4ba71d4a1e08d9ce645b8d5d7fb022ec8e5ed72786496e1ee90 SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.3.0.ebuild 619 BLAKE2B b9fdbfacbf69f7ad0437b173a3f53e20fa9679f8be6ac43d27f244b52d69feab928f1915edec1083f0cc1457b2ac9738e9e0875d8b0ca6b787daf2f07f699e1d SHA512 d4fbeb53d17bc10091d73f00566900afa438ebcfc301437dfa401a855fe389e06fc58d97ea7cad899b81372d8816294d33c0dfcfb210a275f2fe8a8fc5e1aa72
+EBUILD send2trash-1.3.0.ebuild 618 BLAKE2B 5a7b093aefeb55f07b2572da43cab1523246f94e60a9e20137bdb7cddf62688e3b2874345e17493956ff9a9d85d75041773a1ceae91119b44e3ed01fff206c5f SHA512 30285280269210a211e082f908cbe3dfa231dadb9fe6eebb9ff7ae7a223b0cf4239084c760b9c716d6540d613e060fc77e8dea43af88d807ab57eb748791a789
 EBUILD send2trash-1.5.0.ebuild 690 BLAKE2B 741f79918094127a8b83b7cf342bfaf27245c37d7bdacc4244cd9ffb8315f6915684830e393d8d9ea65753ad25adc4d1f0dfdf19d863dd0af6da72ac08acc5f5 SHA512 ab84e22b16a150c079b0d97c08118c7e652434ead58300af98b3ff58afe2f1d8857fca283f82a67928bdb307bf0e167aec53f2bdbd8dfc7589d523f2b4c4f865
 MISC metadata.xml 495 BLAKE2B ae16e355c25ecd42a185794076c1c16315e311a59165c3ca76b4452374d1347d075b626fb0c450557c3ac3e7dd200854ef06b1d45213ee80fc7c6ece4f34b357 SHA512 1c8d9152257865cf74594076405912a922cf3c564d56b6e660cce4615995a4d2809ce4e4b3edc30e35fdb5ac71ad4da2534bf5e242dc3f74cee7704c84ad5328
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
index 8359172d151c..d4d2d87837c2 100644
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 44b064ba110f..8203679573a4 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -3,7 +3,7 @@ DIST service_identity-16.0.0.tar.gz 30270 BLAKE2B ced67dc2be04db57d79c60f4fa0e33
 DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d8caf59ad2d5d8734b7a8c65100fdeca81a0261e8c88d21b7c91bbd42fc1e271bd4440826254003eaedac17f66c09312a9f15b SHA512 3824cb473420a5ce6779fd35ff931189ed68286ad1f7f2936e3253a785cd76a77bbb95210a4a5fde1b1ef0c8d9c762b8e89ab44dce60ee43e34b2553ab78b5aa
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 EBUILD service_identity-14.0.0.ebuild 1164 BLAKE2B ce97b9cde0e64e37df5cb5b1c8ee2489e4b00c5de3fa758e8833c0b26933aea5aa8fd35a104a99e2764017e7eea9f0d7a6d18bf007f564643aa87f409db12cdf SHA512 9735ba2957261e86dee390d68a85c5c6d37eecdf156de79917120c52640d0ed2776ee2c1ac92bd92cda3d69ea84b2d2e6740b497c7064f201e47e923aab32874
-EBUILD service_identity-16.0.0.ebuild 1157 BLAKE2B 32ef676006c92ca615a9322347fd64f3110d91061766d6e7f707fc1f86cf08ac0d3286549ec26cf96d3881702a68368d5dbeea0adf4ca6772212e7775266680d SHA512 06697914c452714a91711325e8d84cf47331a9b460db5b1728e733556047244292b99cbd5d075cb73662f261842871d731341a684c381d8bee7fcb123ec14b5b
+EBUILD service_identity-16.0.0.ebuild 1153 BLAKE2B c1b9ef2c93b836dfb46453258445606c6f2cdcbed1d21e2be626bd250496da07113b4c663ca5280f98e21ca1404ae0e56ac84213bd5ca2ba5e4fdc5a3705f163 SHA512 3ec1b6c8a042b447f7d945b2e54347a127921c75d7288b3673ac05b28cae0928ca160f0daac17b150277118ddf49d34f26af984e0e50716b39a5b3fb4b2a9d31
 EBUILD service_identity-17.0.0-r1.ebuild 1238 BLAKE2B bf6ba94988f9bc65ece69a78cdb3dfad67e47c16808a1f63c292f6e9d7915e94ae4530c08a0da79111bff7548c21bc4936d2676d249b9ff629d6135313b8017e SHA512 7ffb97a701af65fff5757920fbb1ca44e731b988d73d5340627a42af41bc63d285333ee5e292fd7b0c3f21b1780035eeeb79bf0a39afe866ac5152c6c55e87d0
 EBUILD service_identity-17.0.0.ebuild 1234 BLAKE2B 0a2bc5d9c0339d4b74edde232bf2a6ced0dcb202d8c64a7c91565175590f55aa49e4e223c3c77281dda8c1256813e54f1019c474f4e6fa270da5a9006fa75570 SHA512 320ac5f0e16c46d10d1951336df79667830214d176cb22f8474b008593a453885cca4e26d54f85912b9e1703688c1c9b777397d4e13862804768079f6b6ffb93
 MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
index 6c936c387ec3..309488498508 100644
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-16.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d8902fda5feb..90e9c68b9b0a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,8 @@
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-DIST setuptools-40.6.2.zip 839184 BLAKE2B bc17aeaf7710742b70735f4bd0df2f4d8546eebaae000270b21ce605c83966998a2f51658d243838286f3101d7497c761535a9ffed003ae5e00c81bca8b70ad9 SHA512 3f1aa20e905deb22dda366f479f87cd772238d07e869fdc4f65a7926373414a77b7ddbfd78fd9825154409b3c01d787830354d206a45cdfca879bf35d3b83e03
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
+DIST setuptools-40.7.1.zip 842768 BLAKE2B 1065487540517c1cac6332c0c089b572e04b22dff5308676be2e97a949ff2a85251ecf862284d09718dc69ad611cf1cca6b70c425f210f870a5d1ec1c583fe75 SHA512 384d38afa56409f828cf26443271514feaf82b1d9d99a4a0bb4a9004f9b7a262a0d5ae48905e808381074e948988417e3f7e81a84dcd09359f9185a2305f8cac
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
-EBUILD setuptools-40.6.2.ebuild 1950 BLAKE2B fcf2e368e93d1b07ea3fad99cafb3a609b4ff866b7db92ca875bf94e27cf74153245285ac67265f2e31d8c9295eb0c5f95b94414e88e4bfd34ed6f77b9af162d SHA512 6f1e2d72e9fab011dae6d9a5c75286d56252438be1f3e6dc9d09d57e4c7c447ec21551a71cecf3483d29afebf7e130c7afb725b408cb8499bbd92bc232918649
-EBUILD setuptools-40.6.3.ebuild 2019 BLAKE2B 1cf19a12e8329c592184400b2c27535ec7e889a5ac41f7d303effc2964e0869f58fabf7111f20dbb82dd13bd726eee3db94bb26f358c263a038bf76a63647d5f SHA512 b0c4855cda6cbd4b00e171166031431a03c3475af9c40254172b54453d6ba587ab3cd6bf03d476614c3c605fc2ff0b45cbaeb77a671a78e1964c16f72acca8d4
+EBUILD setuptools-40.6.3.ebuild 2061 BLAKE2B bb970e9160aebe36933092ff6d85e9b1376efc64fff87d8b6dc879fec179390bc775c34e1adbba2c77dd6b45d6d8f7a3855cd0cd48025ba9ce3ec26b1c824caf SHA512 d6c7311869306aabdc4da8094227affdad35bb5b94269f72bc99d730279d6dac3a219fdacf73954e4994b9f5b10c852a586915b0371b10dfcd13668a1de8b8c6
+EBUILD setuptools-40.7.1.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-9999.ebuild 1827 BLAKE2B 7b9ecf3287c8896addeaa7b6dce9843ad7ef4df490cb152457213fe82c82955bc7048c32618490ba0532f8d5ca1229444cf333216bc5284c4229aabc93a7a7a5 SHA512 cd1d8b0c15dbea82e728fefd7cf75bc604fd8201e1874c0ddfb8b4e144ca670c86a2ccbef8c455a40faffbb4809179791038af289eacb0cd4823e25d6ce030ea
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.6.2.ebuild b/dev-python/setuptools/setuptools-40.6.2.ebuild
deleted file mode 100644
index 0f231c9d846b..000000000000
--- a/dev-python/setuptools/setuptools-40.6.2.ebuild
+++ /dev/null
@@ -1,70 +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_{4,5,6,7} pypy{,3} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index cad68a78dc42..35d6a14f98c8 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.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
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
diff --git a/dev-python/setuptools/setuptools-40.7.1.ebuild b/dev-python/setuptools/setuptools-40.7.1.ebuild
new file mode 100644
index 000000000000..d67bd927712b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-40.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-4
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 5147947c9299..4c0198c6cb27 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
-EBUILD setuptools_scm_git_archive-1.0.ebuild 694 BLAKE2B 803bfaec25f7a4faea9e83a10b6b1946e82d69b4bfa52a28523068c77f6559028c1d4c9a05e2ed7062e7e6434a375f2ce914fc692be20d3a5d036e8f7cd9982f SHA512 f110359330f2d953ae4a66da6e43543a019719cad5646b679641127afbfde525fc330ac4d29ac22db7f89abff9b0560a074a640b78331685d124861cda1fb6eb
+EBUILD setuptools_scm_git_archive-1.0.ebuild 697 BLAKE2B ec043ffa91dcbdf41b93f792af4f20f189ebe4f6135608a990e4ab1b5280c8f833af837ad361268e7c6557cae8109ba8026c3a2ef91905287aa4bbe05e196556 SHA512 c2ec9fad3edb0509264679c6114e12733e5b277fd38c662b2e6b168a932017f7b514e8ec9aa2472617cecfb0c42c215a60bcc69c8b2e5b3163256a7452971e92
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
index 350a0c13b3ef..a1f1f9afc733 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A setuptools_scm plugin for git archives"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 26c3ddbe1a5e..9522f5c27971 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 618 BLAKE2B c5959ba6bfe76a687d17048705f7c407babd3a0db7a03b8efcc825eac0f29c5171d5892c67fa0ea122c6580eb0825c80fae4b2c11692910a476081113b28e5ab SHA512 72000aeb85dccfa60c492166426f8ede3bdebd71ce221ca667e94859739926102fc65689bf1288328fad00b7193f2a356d098e65931c0008791a0eb2084dbe73
+EBUILD simplegeneric-0.8.1-r1.ebuild 617 BLAKE2B fd96845f311d13145335460035f2d49f5140a454d875ec26bc6c36d42685cedecc693d80392549ad26dd3d897d9bb9401a461ce4f75c47693b9f1bd0a86f9a89 SHA512 254794aee1c905012d0473ff30bc60866873726043da8f3d64475c0e3d8ef3e3aea13dcd0c6a5106970b8977c932f7c12ba9cd50b8e9b6cb98dd8cd5d00c55ba
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 44f8201b6974..2eaf060ee490 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d433418f35b6..d7757d990d95 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,7 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.13.ebuild 2857 BLAKE2B 29f8ccf65d249299ea58b5e61a01aa2f53255ca62b005d1726cd4308f94c6d9011fade27e14771f09ffc665555959b3287b3b50876d8c10d6dcec024ea2508c6 SHA512 054f478a056e17726615e0711a2256107f6b18460862a75da3b3f765ed5d172bd077da7cc21f34459de40808f9574f90e60a99cd2bafbd46df07ff6b61185d69
+EBUILD sip-4.19.13.ebuild 2856 BLAKE2B 992b5ea525fd276db4ddeda3b067bafcedd4a603b869c5a847951d6c70050015f78371c66bd60589f5d13411ae35b62cc9cc90d5d82f69a25fb9f5479a76ac71 SHA512 4e75fd5bdad8200a6ffe53de8163cd03cb66a72a22c517dffcaff160b371af8cebdfdd81acb6451c7b0e1697c060adaa6488689f82a6364a97110eddbdd18951
 EBUILD sip-4.19.14_pre1812231555.ebuild 2428 BLAKE2B 4c90ed65cda608b72309fa750ed40b9caef6be7e1fd45dc015f1c141491b962dd2c3d03c62be727bd49adddc2787a1ba4a09cacabb8e84c9f10aed1d3a3fc84c SHA512 97f55007a9bb8b11271a836a0267a24f906e0a87af0b4a2515d6726e6c0270e5ebf996c4a4ee7b2023a8cf1b61d19de67dd2e548fe209835cee725e781a6dfd6
 EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index 71c1d16da312..62c11778a164 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/smmap2/Manifest b/dev-python/smmap2/Manifest
index ea4d36e64304..ad7fbf4ac900 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 696 BLAKE2B e78e4cff3d09c597c3caffcb1ca72744952b24c9c2eb2465dc006c910ff00a04015909c1e1d1e507abd9b9edc3bd8470d5c53d7497b846815c0aa917ac9480c9 SHA512 02dfae3441124d73910a38b7d919297f6ca6334eaf2419bd4e6dc9cf74fcb6cbabcefbb46d57a1939ec48ee761b637e092a423e3cda2c6fb7e4ca61cf6fefb5c
+EBUILD smmap2-2.0.3.ebuild 695 BLAKE2B aa51f0928a09eb53cf96164d1888b804fb5613aeed1e4886e4c8fd8467d44dd4e97520645536d34e1ccdb7535498abd4ce13d0a81f25adcdd8e49523cd32db0c SHA512 c11b25f0258b93de4f96f14ba073e488f3568ea4e9b6bbc50801fb1b00337e84be4babc7d883679c234be856cfa3d808bb1d74177893945e01269be7573ec1db
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 8b7821abb4b0..ec95f76fed87 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index e4c181c088da..775e46c31be1 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,5 @@
 DIST snowballstemmer-1.2.0.tar.gz 49639 BLAKE2B d53682e63ee1ab2776ca6869e109f364e4651be182908968c72db143a739fa43bfe387147cb9381b68057d9870eaaaad46720954458938ae83d15d544e820d84 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02
 DIST snowballstemmer-1.2.1.tar.gz 49626 BLAKE2B c9967c45b008808bf9f5a12a4dbfcfc970c5878d9b10b37b4e5f1a4bca56ed6efd72ae4395b6a4d1a19d642786b6ccd1d01ec6e99b104a8237935ec8e64c1ee3 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9
-EBUILD snowballstemmer-1.2.0.ebuild 525 BLAKE2B 34f659dc5978356ea7c5cffcca0f2d24a8141adbd69a54631c2f72077af1ef671ebab81d7a2e6bc96539bb1cc88ea9aa666d7e1ef1045ce9e2fb490f75bf2291 SHA512 4715ee71ae558d4d336a41577b88171ec2a550ca23a10ec07f135866f876f9191f9a29eb3fc60bfc5d8d5edf91cd18a5b61adc26a627ba0a1e8bc1b762518d99
-EBUILD snowballstemmer-1.2.1.ebuild 552 BLAKE2B c514abe1ea7da3f147a21a3fecb53eff52033c2cc4d8a57e782e94f62a72440d301985aeec5565b9c0ef90210ea5105bf44c1fafcb46a20bb3d25221f282e57d SHA512 f2fa0b6137cd34c084abfdae8e6965ce81565d1ec8399c269788ad35db0e671f73faec2654e6b3704dd99e8ac557163ef0b270d7371b9457b06c28d76a5913dd
+EBUILD snowballstemmer-1.2.0.ebuild 521 BLAKE2B 9e3957f959266146f2c736f613060a861744eb1d242b95db41f3a6616ff89ced0589910ba9f2ca7151d31c3ee44f6ae94b8582053fdb66e8706b273e91d0cdc9 SHA512 203a604acc12c75649f76464bbd46d731d6412baecdb1c0f9bd0399a93b7a3db53713f4d19cc35431d445636e3c5d6d6d9ec232c900aa1da67178ef9ba227051
+EBUILD snowballstemmer-1.2.1.ebuild 548 BLAKE2B 1ad8ed7d7ab8837da829c05c38c24ef4c0c256fcf5ec5ec444f794035cc8186c2d1fdb1f92b83910c3b7a38528cee612c1116b2be50b2766f1224f6a25ff34fc SHA512 701c7fd3e76e3e050accdddf636b32fe700682f3e701f2df33bfb7bebc60dbdbd9f0a626ce34b9709070b7bfb1c041ef76e65437dfaa272c057a6176c21230eb
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index cb20dc1189df..fa9c9194790d 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.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
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index cb4f6dbe2179..e9db925805a4 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-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=5
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 IUSE=""
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
index 6d51884503fe..d5c7c2fa8c86 100644
--- a/dev-python/soya/Manifest
+++ b/dev-python/soya/Manifest
@@ -1,9 +1,5 @@
-AUX soya-0.14-glu.patch 501 BLAKE2B 6180ff433f02ce58f1258dc6786bae766aa4b31587be97a65b90d75607425bc44a296fd98bd4c7c325927582ed4705944d94589f646cd9487805c0e5d0c8b5fc SHA512 aa834bceba523b387104cb7717701b841fb4c54be4fdd97867031ccad7303f79b99cc42cd855c81d5fcf626e6687205d8c52069da1354b9ad59c7fa7caf3c6b7
 AUX soya-0.15_rc1-glu.patch 515 BLAKE2B 5d95fb91d1d3593d616bfed11c49bc80964f734e7d2bdc33a1424283e77326a3bd743ba2817ec2b1f5d28f84d43b437df2655fa05523a3fd6ffee69823d25125 SHA512 b9316c5e1514f7dff1c25a7c3864e02b29c4e8d84bde920186a53fd938680e487484af2c6541d285a595abab5a87e7547949f4eb7f6aee03988105e29fb09a07
-AUX soya-pillow.patch 607 BLAKE2B b38c09a904873280ee0a93425a94508be4931ae08a22a8111b7ab671b6c9f94169d17e92844b5406ce73ee5615259c4bc76e15475004d209bf7b0326623d3b2a SHA512 2c3bc0626a7c03dcfd9085434c372a06a68fd03bec9293a314c1f4c3a42f99aaedba8d56ca04983ddea9c94acf85c116e1a6e2cc4da7df4fa8e5a6247eb76676
-DIST Soya-0.14.tar.bz2 905659 BLAKE2B bf759b7c599ee338a39388a15e95c0007aaef5d8f45aaee01e7c20671789454701383e89fb20b6c809bc3e7f3f0826fbb3c18ed27aa0c4e41c0eb8493f15c26c SHA512 3a6d8d0523cd13d1e9e8e2260612f23dfd2d33526b40d11ea1568a3b3c3eb7172ab94b8c8e9490203128c1fbe0b840d29a04d1c7b9d93bd273eb318ad286b711
 DIST Soya-0.15rc1.tar.bz2 910576 BLAKE2B 2ec129869cdabcdb974dbfea24a3eebda1b55f4696f978335dd7e34a813c361eec9d27aa5b395a3ced0693335b34eb8f533f049e0240f443a8f1859fff5686cb SHA512 698ad3ebb446b49dc6fb70f53cfa6b1d9f35fc854d6f5fd1dafcb1478fce01c8de694a86af02580bb2b149f086122450f1bd6fe002f87d45a5c7555911c23fc6
 DIST SoyaTutorial-0.14.tar.bz2 5223674 BLAKE2B 2cc3927a058936aa497846a300e9093f169898cf1bb13f3df88c6f75d344b689d95ea386ce50a3d93c6b14b3675211855d4515b3bcc3e297411b081007eb6784 SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623
-EBUILD soya-0.14-r1.ebuild 1408 BLAKE2B 8e4c729c9daa880113218c5508988ad89824a87530df247c36e14d612531d8b069e1576d1eda5bd8ededf4c2c3e66d9ae4ff9122fdf948e10ece637615170815 SHA512 c768eb73e0ad6c5f0468301947efe2bfec5b73364a8d6081586a30a1afd1126ed4d0cb6c8248686f3715c97b274847e30f7eadd17e52f52c6a3b726544198b9a
 EBUILD soya-0.15_rc1-r1.ebuild 1395 BLAKE2B 4c2e708958a26da1afcb9f5bbe27caa91884e61f4008c747cbdb8b2efe7c1aff1f1863f47f9e5cdac94943e3ae8be3b0e2a1d09247aa340e02c52330e1287739 SHA512 05d9bfc400bbbd70810831a1fe41241b4966546b60fc95900f38c6a3cc85fcc83f221bf71470a5af70a629b6bbf5eba756ba589223077b38a936e49fdcf81c19
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/soya/files/soya-0.14-glu.patch b/dev-python/soya/files/soya-0.14-glu.patch
deleted file mode 100644
index 606114a22fb7..000000000000
--- a/dev-python/soya/files/soya-0.14-glu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: setup.py
-===================================================================
---- setup.py	(revision 550)
-+++ setup.py	(working copy)
-@@ -130,7 +130,7 @@
- if sys.platform[:3] == "win":
- 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
- else:
--	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
-+	LIBS = ["m", "GLEW", "GLU" , "SDL", "freetype", "cal3d", "stdc++","ode"]
- 	FRAMEWORKS=[]
- 
- SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/files/soya-pillow.patch b/dev-python/soya/files/soya-pillow.patch
deleted file mode 100644
index 4f8df982ccf2..000000000000
--- a/dev-python/soya/files/soya-pillow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471510
---- a/editor/__init__.py
-+++ b/editor/__init__.py
-@@ -52,7 +52,7 @@
- 		
- 		if obj.face.material and obj.face.material.texture:
- 			try:
--				import Image, ImageTk
-+				from PIL import Image, ImageTk
- 
- 				self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename))
- 				
-@@ -71,7 +71,7 @@
- 		self.cancel = self.master.cancel
- 		
- 	def label_conf(self, event = None):
--		import Image, ImageTk
-+		from PIL import Image, ImageTk
- 		
- 		if self.image_width != self.label.winfo_width():
- 			self.image_width  = self.label.winfo_width()
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
deleted file mode 100644
index edbd531a388f..000000000000
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV="${PV/_}"
-MY_P="Soya-${MY_PV}"
-TUT_P="SoyaTutorial-${MY_PV}"
-
-DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
-HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
-SRC_URI="
-	http://download.gna.org/soya/${MY_P}.tar.bz2
-	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
-	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="
-	=dev-games/ode-0.11.1
-	dev-python/editobj
-	>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
-	media-fonts/freefonts
-	media-libs/freetype:2
-	>=media-libs/cal3d-0.10
-	media-libs/freeglut
-	>=media-libs/freetype-2.5
-	>=media-libs/glew-1.3.3:*
-	>=media-libs/libsdl-1.2.8[opengl]
-	media-libs/openal
-	virtual/opengl
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glu.patch"
-	"${FILESDIR}/${PN}-pillow.patch"
-)
-
-python_compile() {
-	local CFLAGS=${CFLAGS}
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
-	use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 9e69387e5f29..eee7b4e095df 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-gallery-0.1.12.tar.gz 68976 BLAKE2B c9f8f12f775df8cac0f0ad7d70b0dd099dacb3b005584d1bbc878437443144d7e2613ceecd25cd4b0c8941818c5596f6435c1fa223b1e5c5d5196827a69163fb SHA512 57e8fc3746c2f5c941ddc3e00c749a6bfa63fb5741b3e5551df02f798858c417acee05a6b35512506aa0c4866b14a093cb4269284501672c3bbbf2edfc1edc1d
-EBUILD sphinx-gallery-0.1.12.ebuild 736 BLAKE2B 1921cfbc6e885f79d6f3939b90160e0c01e7cdfdf4a6402efbe29c5f7413a3c7969bb113e3938f81690691708c423c99184e2b7f96bf33547b8e52840ba73d6b SHA512 18609541c551644a6c2caa161b1e262a2353658ab94f66ad216344738afc822f600b0abe2565069cf0e3cfdf3480a3debc69e08b4ff8f673977e857de1ace249
+EBUILD sphinx-gallery-0.1.12.ebuild 735 BLAKE2B b5ce1ed882f757f6d5b03ff6a0d06ae8e9a7a177040c7a7a489ab48c7198e4cd4eb17bdc688e4e5ae747b817a0ebeb36ba751c6ae31ccdf65d819ac55bccebe1 SHA512 175e26a62873b8b0607d021cf0b401b936e126fb18307219490b14e204e74e38dd9d54dcbc98a67950ebcac899fc449f60eba48d5609ffc5c71dd30ae098c613
 MISC metadata.xml 398 BLAKE2B 9ba3eb9dc8d9d9e16cb83963ab758bdcd11c6f7c8ff5ee6a9244b8c0e9c9db2162a22b855bdcd43148c0d23ef8c31c075e36bd4afdffa1a2eb5f30d08ce00747 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
index 6844bd841637..109f20646269 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 1bcc19cc5506..8a506b9fb8c7 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,5 +1,5 @@
 AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
 AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d1d3e13b98a5e21f6e1b1775c2bf99abbbdc2b6a68a1ca301e2d3a237a8ff45a53f1ee54c5788367a69844381c043c635f3106d3fc663 SHA512 0159cfa1a416e6d9b150eb0245dcec65e8e69cf2c1d4e69808128f4046d3ea13952feb60ef8b3b628e6e678ef03bcf04789c30a45c829e9d6ebe2014833376b7
 DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
-EBUILD sphinxcontrib-github-alt-1.0.ebuild 919 BLAKE2B d62875932b6a17e66e38582695d57b1bd1e8ba94f0443b2f33aeaf872df1851a63b5544ff8f2c7fd08cfb56844d1053d2b9ada1b70fae2543e5e4fe0fb195ee6 SHA512 f3ef9b5daf75bbf41ca9b962df4d39eb5eaa12de9f4c7b1b040913b6475fcfbf64da7fbaf2a261007d39ada70b5bc8f78eb1f174223e3b48e670b3b6f265afd8
+EBUILD sphinxcontrib-github-alt-1.0.ebuild 918 BLAKE2B c5057c826ab0ec29246a761f95a359504cce58ee31106219c2e922fe444453fd485c2219a0472a01cbddf31fa92ec0f8793d3047f850efd5f6e0fb8963b70a1d SHA512 28a6596c0eefb264588c7752c45be2462daef6e8719431d316128bf6efeb6f0cc0d7bf2645e6601174f1011f876a3aeea495ac12263faf47ef37fed2acf32fbc
 MISC metadata.xml 659 BLAKE2B 60579ae24985d8227bdde8c0fd62b1deee92cc7e20875c1e20b54815e0f4c987040cff79c8bc5dd0ad8e0413d70bb4401b696c70626f217c0f637886855f1745 SHA512 4daa112e2ff34c558e96bf4bb6684df4a49ef670d6fffb9176ee2a9370ad878a75041aea9eaf8222794e53bdca7f16201c9c68623c53a43af5f4e80c8426cf3b
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
index 3b4abe48a54a..66a032911b43 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6}  )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7}  )
 
 inherit distutils-r1
 
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 572e0f9a21e3..9d95b2313d13 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0.ebuild 1080 BLAKE2B 561db9625e4cd6d699c039f68788f958bb3c600c8cd17321016a09a1762d54c4042071f4e073d5740c0e470663fc5cb2b87abd54dd0fc9f7dacabd3053d3ec7f SHA512 ed36bb4dc3e282e482d37b7b06e192a916f7927a7d403f7b50a7e258bba45d6a01213d0d43ac0e247a36fd94997e2160ead4e0a6b9afff9d0ff596aa8e8abfc0
+EBUILD stestr-2.1.0.ebuild 1097 BLAKE2B 69de6ff6355827fe756a90aa61b20296b7037d4f7955d044ed901fdcbc6921d83f69f1c20d1e60e3674d05cdae00491b4e0d056f4e52d20f5730aed3d6fb81b3 SHA512 a1edc63515177c2ba6257091f97ff28bc35987876d9d3e37957fd65e47b46584f95b6aca0d9e2de9cb8318575e7ef70bdffc2ab82228f4d8cb3837be4dc625a7
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0.ebuild b/dev-python/stestr/stestr-2.1.0.ebuild
index 9792758ac2a0..ddd8047ae285 100644
--- a/dev-python/stestr/stestr-2.1.0.ebuild
+++ b/dev-python/stestr/stestr-2.1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A parallel Python test runner built around subunit"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 96cc64a07746..2ca6c6e901e4 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,5 @@
 DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
 DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
 EBUILD stevedore-1.25.1.ebuild 1636 BLAKE2B 685c396c184637dacf2ab5f13bb1234a9347ab6df0b1093fa2f185a3eba594f44190283efb8de7b1d291780a11a6893187b0934c9595e416bb00893080a64a18 SHA512 b92428ada4d52e67b464c912f142cef264d1317769301efb3e74290ec8c5c1e72a023b775cc112fb5a1d2333d7b687f875173fe8dc053441628ac7edf0ecc49e
-EBUILD stevedore-1.28.0.ebuild 1636 BLAKE2B 7534f735a9867f56412f3bd012661418fdaf49cf64cf6dbc4ec4bc9b8f6d162ae09e6b760b505ac766b480425556679ad521f37f3e865d97db1558ea029fe978 SHA512 c03e845de5a1b7466019d7964c8b839a3aa735c40bb57d30885bdcae4a789d0acdeb6fec7b4a10c158f9e644bfb9d9efbcb8c33d95426c7906f42c3ed5120e3b
+EBUILD stevedore-1.28.0.ebuild 1635 BLAKE2B cd109fee825b40b25967ed56950971af6961ca5a08e30686cd9025cbda455ca2f9452613b0476704efbdfa045c3f5fb778a46ca33819465af7afa99f5bfa13e6 SHA512 66a2a8e7fcb78369d9604894f835a0a36ed2e7e277dfc8f473c55ba2921f0cf6ed83eea0105818c3f2178e8623c54eb5491a30ef1d11a5e0ebac0973ae68779f
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
index fc1840e40a1b..36616c0c768a 100644
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.28.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 46996ebbe138..843a2be87ab0 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,3 @@
 DIST symengine.py-0.3.0.tar.gz 90877 BLAKE2B 8e1bf5741eb0c6ff6fd954b9f8b1827afcde61e55f0c5d6ada96bdc16d164003b21a51c2b485bc635d1f87e449c422f50e6bc8fca7371996dba7fdc096b0798b SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6
-EBUILD symengine-0.3.0.ebuild 944 BLAKE2B f3eca9913bdc764ddc79ec91115bd67b9114d12f67f558783c95d642044319bb9da6b6aad9c0081eb43e6a646be5e308745f492df51c41ffa160efb29e8036e6 SHA512 59fbebfb889bb965d6e1cae20874579cf4899c2e77eacb116990d6ec48ce082533523cdac76fb87d531536776b0d2f1454850ac3e4bb304573267cedd6da8e64
+EBUILD symengine-0.3.0.ebuild 945 BLAKE2B dc569756427f95752e9b3484387a53da6739b22be746076a610a09e66b817cb4e91eb9aeb52f38d3e7680e32ba272961a39fd2cefc672de612e533d3c0ebecd5 SHA512 bdf3de93c035ab100f2b16a9cc78af35e1c27fbdd1ea434050ea164a774ab38aded1b6cab29511877fbddfdd50244b76114ed7a492f0ccd0332fc1b0c4364ed0
 MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.3.0.ebuild
index b972a264b220..a94f7b8f82d5 100644
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ b/dev-python/symengine/symengine-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index c954cdd0622e..044cd180daa6 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -5,7 +5,7 @@ AUX sympy-1.3-eta.patch 650 BLAKE2B ad61ef317f4f2c13cc6473be2a6a5a6d922a287c8152
 DIST sympy-1.0.tar.gz 4281528 BLAKE2B b222be6ec486a01ac73e9778a7423aab45e368386003de965308cfa4e08fef07b64046f62ef707b6fa124ee6367fb051b9722e138bfe2eae4661f9e2a66c2365 SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39
 DIST sympy-1.1.1.tar.gz 4580952 BLAKE2B 81e5c7d0f80916ced5532f8e5ed3bd04f919b8acb17037237faf9d59cdf73a3a8f741086213fd2aa5a610caf88ae0781c83a0345b71945d69149075b23f09a85 SHA512 ff8857fd5810795554ca4f636b2d8e633057d7ea7df76461003d823ecbaddc98cde0561eb79a1058741c5ece233c13bfcb5e30d5bfb8ac6dbab3d05d8226f92b
 DIST sympy-1.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
-EBUILD sympy-1.0-r1.ebuild 2688 BLAKE2B 34bbb64b7a3bf3c9ee5c58c76773a31d332e7306407f61b1c5025f26dfada6814e3cb997d0621d187a5d86d8734c7f9bb9563c295fa9afd1cf9bcf47ef768fa4 SHA512 ddfe42e105ee7664303bfb6c690035d843cf007ed1530df8a7f326c473b2ff78f160e8ee8107303d51f083aa4b42559aeab18ab67a3731bbc0c7b6d11b3261d2
+EBUILD sympy-1.0-r1.ebuild 2689 BLAKE2B 14e38fb728165909236a83b0ffa18591f8f4447436a34c2966d33b3774155d6d4f95ee4e7a78e654227d1c2c564df94c11b9ed5e6db5d3f440cb26cf3154610a SHA512 7132ac472d509c2802560ba7ba9f1fb8234a22e13a73fa03870a0139545b082089566a289f70289efd129cb729ee3fbc0efc38bbc045cd850605cab99fc69f61
 EBUILD sympy-1.1.1.ebuild 2503 BLAKE2B 567310fbdc142065e3e6fa5e32e43dede33c5fe27463340f1190cb608d69dee415978681fe3a13776756189cee21ffe419b069b4165acae55621dcf65b8ce1ae SHA512 51b0e3a0e628ed0e98cf41f4e9ef9daf723c488038bd3f6c54576491bcb5f3b90a29d25d8d9c41fb73a8e5b7cf6c5853640a8f95773ea31c74dbeea9d600b0c2
-EBUILD sympy-1.3.ebuild 2620 BLAKE2B 3ed1392f63aafac6c95a5ced979d3c0f1ddc9b83dba78e8a2b3f72f4b68464c9af874aa9565c713e1f9e249fff53ce075a3e049a4ba7e53f1257b9ac5bbeb558 SHA512 16250133482a7147c8ad79b41c2eaf6865351944cd04536a106b419e843248830746afa13d60aa70842506a3c269f5bd41ba98c82bede87801794e422a994992
+EBUILD sympy-1.3.ebuild 2621 BLAKE2B 5d727db31fb3ddc8742f775009385fa6d97f0c7f3fce1f12566b201adc6195283bcfc7661b46ca6fbfc3133eec3a01d61991407b5e08d2cb22f1223ebf45f75f SHA512 9d9b7079382dc4da2c57918a48fad23b6a32bf06f73aaaf668cbe40493c42a643277ea855792f5d37282570c6ac85e7e1c3df402f759ce85726a566357d29f71
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
index 5b5ce197fba5..4dec1366b005 100644
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/dev-python/sympy/sympy-1.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild
index ae474151446f..87883c0e7917 100644
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ b/dev-python/sympy/sympy-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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 eutils virtualx
 
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index e9940b050b5e..43541a26c303 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1037 BLAKE2B 8a5c874542957c44eae64a7ce9a9528ddc7f2acc996384dd04aa16f991caff7b2474069eec2696c19d362fad7e96aab1c6a217c8c4924eba6647fb5811e47f54 SHA512 be5690b8f67b23a050122969292b43f978aa6eef6e102b5ae6558dc6785be9c55524babdae4b4bc1cc8b5e7db0b5102dc830bea5d00756b5a46ade0147b1897a
+EBUILD tappy-2.4.ebuild 1043 BLAKE2B 5a96d6e614d19a145178662cc3628daaefc3cb114b357a6129bdf4df846d63c6f93585392739070410b4b75875cbfff426aec3846965a675c59dc03fb2fcf0b0 SHA512 69ef721acf039c96e3c35391ee3fad9c1b69ec8344f2055464bdaa73b70e53be14759477c0434fc881c32ddbc866d24a2481963716d2ffaff9fbc2a4228ae255
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 07fc89b47ffc..7061a34caacb 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
index 6e940ba77e03..5175265043e7 100644
--- a/dev-python/tempest-lib/Manifest
+++ b/dev-python/tempest-lib/Manifest
@@ -1,3 +1,3 @@
 DIST tempest-lib-1.0.0.tar.gz 115527 BLAKE2B 4937aaa84ad8b6315bc4db03edb64303a64801fb4915489f0e48262bd52224a047687d2adfb6524273763976053eca5f209d12f93914408f4c21e2e2e69a1171 SHA512 e47716d897c2df4be08b863352cbee986194db00d113a9135d57cc440436c97dea5c009d6a24c4b489360b04585b2a54a9b66a5776d17a988dfb9f0baf57e484
-EBUILD tempest-lib-1.0.0.ebuild 2076 BLAKE2B d7916a12d6b8477dbeb2b40a73ae74898e6798f871564b13082ec542891678b25a6a7e5b24f94d763ece8dc301e35eae34b4b46a521fa51448e0f67d428806f6 SHA512 7bd8137ec96bd56270f0489b90cc04caee9b596d2d57cd687ac6626e56cd9afd5c4bec5d3c8e5f8b6ee55c9919cbb564c9c91926a09a9b0e368e8592c350f87a
+EBUILD tempest-lib-1.0.0.ebuild 1982 BLAKE2B 0d0daacbd91b8a8f9958930ea04f7dd7fb2f0b79e0f3c41e702654e2fa219de411b6a1cf40c6ecfeae8412240725a5eca52e902ab703d36fc45a4a3a7a97480a SHA512 14b48dbd2e3795c4773b24c5f158604c691edc05f5b0c1bae58c86b3bdee029be7fd9de0c8bceb024abf8464c586b3f85b7e9fcf24c314b88ffd8e37e9a65746
 MISC metadata.xml 783 BLAKE2B 14e7df8454923e775a91e481b5c0fb30730fa9d255a9971600351392cc3f3e72d7c02d2bebd4cf0f65e1d02afcd152ccf73ee4de854b5ad0c082c4a2718b1216 SHA512 4c90ae3bab98585854785700c90545fcd89ef89e5f11f8f53a102a67f59342a347f683f98429cec498537a6c2307d36cad3f0f4c9bd0e7f12af75090f8d14dad
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
index a011f7cd8106..0767ecb6d2a5 100644
--- a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-1.0.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
@@ -34,8 +34,6 @@ RDEPEND="
 DEPEND="
 	${CDEPEND}
 	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index ca47efe12f16..4b7acdf01fb7 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,7 @@
 DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
 DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
-EBUILD terminado-0.5.ebuild 693 BLAKE2B 5347d69333c657a47f53c0cd0f0247b49c6b52ad87fc2847c09e36f751028e825666294b872e046d087a8dda2fbc6e47a95b4161c87d0f75a138d7e51047c890 SHA512 bad3e0e671fb4b2312adfbf4f4945d026006ca771dc6f57f34351e980e2beb3e67725574561604e3c715b7ebfe20f5fd43c051113a4e796c28acf6b6acab487c
+EBUILD terminado-0.5.ebuild 692 BLAKE2B f61d49c44fbbb3a80ee9e17746ec02b25b78b8bc857c11db1e6b829a4919abaaf56d2bac248ad3a6dcc9f7777e8184397686f6ab2b26bf3b8c4cf794edfe5cbe SHA512 81595022878d73bdfc400408954a98ff276e31ff7939dbd66c4bb07ce91eedc6710849dd0b6d20c4b2aeb3b58b7fa4c37734ed80cb81e87149a6b30ad9fcdbc0
 EBUILD terminado-0.6.ebuild 709 BLAKE2B cc1ea1fbd66aed9c98952cab8ab4f575bd492890b52b7b5a984d5e754aefebd7bd46abb7727387bbc00d33bdd29e0442b6c5eda53dc28ba9aa67f0d6c86ef8cb SHA512 1de87595a0df46db02086b4b81ea885108eca6a3a3ca908af7db8a2b0e707e6573764927e3a77f2c6977deca01fd860ca66e87498cdc11287b747238aab63dd3
-EBUILD terminado-0.8.1.ebuild 698 BLAKE2B ac9d901bc4b4396dca67d284bba80f89dffeedd2db57c95dee45e7e6d225ea49f1efe79f05adf9e2e61dda2df72acb98dd8e7c3118e63977b918b095cd6cf705 SHA512 4e3bc67431697cf8d3c69c2788fdb642ee16c733619f0d3d69808acb1ff78a547b9c5039e7b2ef617bf6c4221800f8b6635a9ca0ef8115d992b5d4cca9096bea
+EBUILD terminado-0.8.1.ebuild 697 BLAKE2B b42cc9f6182ec4209aba95c6b207ab9617ac535eded6d2626801f4cfe38789d737a906cb4ee6a52ce76a177b8d13cd1417b2edef582e33d0e467929f34a46cb5 SHA512 0cb86ede0049e7b44f18a7db11431d480308441b45b0e345fefd00e638de3130fe7b0cf3f712737a01e8bba87e7c022a65ab6b335c250b5fe5d3fd4d61cd7c3e
 MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index e12b28a08268..7123e4c0ac12 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 27d21f3107e7..7ddad742fba3 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 48884e0ace3a..1b12fb77ef36 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -5,5 +5,5 @@ DIST Theano-0.9.0.tar.gz 3116713 BLAKE2B bf38d3c504909caa7aaf8e704a6afc86ab56810
 EBUILD theano-0.6.0.ebuild 731 BLAKE2B 9a9f133b2f645a2b7f30fc70745aab5b2cf55deb3168cb46027d0ff5d8f750a06f2182fd9787e976a12cf5e378c876fb839e895128adcfb0217d32027335b7db SHA512 54e3bc7f4dae23ebdd850fb26bf43c8f69a452c3b06bc1a4da1b6f133a95856bb2208f410ed2d3497c943c19165595620c9493b7c11ca928502bed737de0ddb2
 EBUILD theano-0.7.0.ebuild 1005 BLAKE2B 934cfe616a4ecf858ea278fa26c71c39655310d1377e8ec4fd57ce7bb642004b861d75840e238e04e238562cd4c86d4cd5a2f960b6f0fc566bc8e7562f473137 SHA512 5d15c8eb54bc2a6db09e5f2279b54526bcce8c07041808d6a021d41200fce309b3aa430c95702d1e5d6e549102070489c36498bde0ae717d93c301ef868107d0
 EBUILD theano-0.8.2.ebuild 1325 BLAKE2B e7b89ee6c43ad06ed7d99e34c5f4594cffd2b03f41983f0c63f210f272b68aa5dc44052428f7d90eb5953a53c8bf562d3adafe60c75652723aec88a9a6cd7f07 SHA512 763f07ed681dea61836b5d3c0a35642fe6bbd8334091d6bac5d9016ed0c2287e60e8235ec2f390dd1856879756b0d7c73b0cdb0c82a01f983415779b539b9836
-EBUILD theano-0.9.0.ebuild 1327 BLAKE2B facfbfb5718bba23d126e90fb211c5a8d2bff26e5e5842e0d231ea9b925bac2c8c82a08e597162dac7a1823fcd659ed266223803757cb8083fea7ef3f8d9ddc1 SHA512 12c0160ab51031fb7a3102eb5a25a1838692393b8ac9abf0f546a50aa28627653e348753c2bae3bc7e41593609d46eae5c6813e00830a28b53b16dc6eb21884e
+EBUILD theano-0.9.0.ebuild 1326 BLAKE2B 0c895d7988fd60fbaa48e1e38a93a32eead802bd582d3041f98df50d0e45d565ff9c2bc7c68228727fd0e53301e7d4f408c8f3e0dcbe6e03bb85c0607f693622 SHA512 de28a14628e8127185f26b1b51a050c6c5dfda457cb13752ec9036bc61109f6c831a7a88c606147cf0a118b705c448f50bd2d0c7fc26bf030fa0fc73df3e5f4c
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-0.9.0.ebuild b/dev-python/theano/theano-0.9.0.ebuild
index cc371c650767..9e54917f924e 100644
--- a/dev-python/theano/theano-0.9.0.ebuild
+++ b/dev-python/theano/theano-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/tmdb3/Manifest b/dev-python/tmdb3/Manifest
index e7d8d152b1c9..d01976d71197 100644
--- a/dev-python/tmdb3/Manifest
+++ b/dev-python/tmdb3/Manifest
@@ -1,5 +1,3 @@
-DIST tmdb3-0.6.17.zip 38179 BLAKE2B 92501f0f5bf31c227fb5d4aa982e2def8f3cb6f08a93c4db79874d390dcb1d66a298d8783b93ccaad3552a1e48160ba9d9ac983b00348eac1bf7c6babe371999 SHA512 ad2cd838a9127e4839572590d1083a0b1f3f23d5fd52aff2dcdc159ed189b4f73acad0b916d807c8ee77cc434102d7a6e99d4f7a0d560bdcb8fdbd1f9f6f4a72
 DIST tmdb3-0.7.2.tar.gz 39545 BLAKE2B edb84ecedb7c23a6f8887bb1320d18d408bd969a19f5a269f0bcd906fc13edc67089f0994ae2354fea9183a5b291b8ee8372833d74e52ebeeb262fb467fa0041 SHA512 d4294cbc5811776f7514f5dca82421c61538409c6d76704ed22272bbd9b6a362b7887c392526f285d81da29500530e684f1e829722f646d1d3eea4293a748a64
-EBUILD tmdb3-0.6.17.ebuild 432 BLAKE2B 451f886811250a4af719b99e2aa70bef97748fbe742a9b30af5851fb442797091eb88ed6ee2b541cc29a849beb15e618b17917fa5d6e1f2320bf112728b10871 SHA512 d029eb1830d0b496abfd77ccbb6ceee3fa69b378e0b3b4016ccd7e67be701091207e05630840b12507f7552999a3126ec14d77f3e1073142983f9d069cc5c8f4
 EBUILD tmdb3-0.7.2.ebuild 399 BLAKE2B 9113195dd02560d591bc910772e429d5c8da0efdba315c6b5a4fa48ba7d5a2bd473350e70b279729956d6d06a2f33e249ac1526ab3b20e2771f2a2d6537264ad SHA512 003716db96469ef18e4530b1b599b98a5df45d4659abaa8ab00076fad78d78f9d3195be66082d657f26432f7c6c29778eed033e33564f096204e5e338a7f4d75
 MISC metadata.xml 298 BLAKE2B f6f179a2928436f27c7c5bd469f536c6d1c60200bbfe386bb462f643955209c029f687cb73489e645afa7bf7cba9fe9fe442ca3876fe6558b1757af70939c6ae SHA512 92423b0c7ec1f1bfab4c2957a46acdc01f198872fee30c44066023aad0a1dc9544bdb7769a0692c0269ac40f9c805853243e7e6796e894f86f21168ab06117f2
diff --git a/dev-python/tmdb3/tmdb3-0.6.17.ebuild b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
deleted file mode 100644
index b13b1ab193ca..000000000000
--- a/dev-python/tmdb3/tmdb3-0.6.17.ebuild
+++ /dev/null
@@ -1,19 +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="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 11d880545a6b..652646a7ab67 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,3 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1216 BLAKE2B b5b73ca89ad3aca5ecea9324382f8ea8758120d4adb416084ac9b4a438f4d1ee2e330200d29748afaab360a71eacf8b51d6451c0af2c0859f39dd8bbe7cf5ba1 SHA512 e709552faf511130eede66caaa69deb7c3c9e363793c735ed6070c931151ab231c226e401360c9f24a2e9e8f143bf48de93a5be10d42f5f9daa62fdb21e33762
+EBUILD traitlets-4.3.2.ebuild 1218 BLAKE2B 16aa57987b4d43ac95a414716e9defe19fabfabe097709499821b394f12258f5da39a0f5f64235cc87e68a842f810baf748325cb44564303c18721398432c872 SHA512 a2483720730a02663a094230c3b63e404528057f0db46f77413057c209bd25c9024be64930bc6663cb9e2446ae341360df95cc12b703d1155b6749c57cbd658d
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index c9a8ea73a32c..3a5382eaaaa2 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index c9cdbae1fd36..acb55a9055fd 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1,9 +1,3 @@
-DIST python-ttystatus_0.22.orig.tar.gz 30262 BLAKE2B 74c308175c5b436a0cd2e7b427c6ffe4354c2221323d7a0149a245735aacc82ded2e9b65aa555331e6bb6fe156ae5b8bc0fb7de63e9786dc0923dce602ad27a5 SHA512 c6bf2a6dc81842799aecd9cacc0f91ea95cbe0befa80beef454c9f6e819f03180ee4964018c698a39cc2b7e245402a7c1d422fe5e0b750715bb068c22373d90a
-DIST python-ttystatus_0.23.orig.tar.gz 30299 BLAKE2B 7081894339a1eacb61e78d57361932af998ac3fb2383432b51d5be14a3961b6bc374120678fcb9321c43e326bfc79b5d508d18a589909bc2cc6f09b1c5444838 SHA512 29dd9ee0a063b4f49c72a1f08acfe80f4db9b3a374b1424a98926d25e22c8df0ed89441997322556edaad03a339dafdbf874a1247f095f1f857ef04f90b8a040
-DIST ttystatus-0.32.tar.gz 33642 BLAKE2B 8557c8c6cf2f7db2996489ef157c00b6da0ae2cc9be901596aadf5438ecf1fd3c507da80bd92cb7997f81be1d7a27cf0b716b6b2d0591faf7296118de93053e8 SHA512 fd1983d584eacab8302ebe795d7d907cead382d4188f8baafe78e0e493d329d330d60ecc682e3ff743b180cc52438bc1adf9c4bf3b98caf2e0ca8b1e26eeacb0
 DIST ttystatus-0.35.tar.gz 34144 BLAKE2B 92a11676525f2db5b3bc09786ddb3651f72202eaf9edf872faa5b5cbe7c01a64bb904fa92538ddfd15e7a077b4648bb02c0ac5a60fdbee105ef2789686d6c405 SHA512 5c2b1306bb1025dbbc78b53faca3ed07b21fec6a7084517f6b58c3e195fc8a901ed71b62429af2261850e819b52a08e3b3bf3def61b06c9a9451af02f4f2dddf
-EBUILD ttystatus-0.22.ebuild 480 BLAKE2B 030f109e34d4554372ddb24a354681aa5fb276b156be9f74799e6dd4b10baae6aa9382bf0089fa1b86a0fa76e0bbe08d8d2d7323112356ff1e240c1c92ad34d2 SHA512 a630abd0fe622181bb23db23c8e52b01bdb24fe4a414414070632710b0763039b592bd1a8145e0f3521295dde51ee08072b3a0df0d89803d8b9b63d90c55abd1
-EBUILD ttystatus-0.23.ebuild 489 BLAKE2B 9e320dac4060af471dd967728883d013ee4c3b8c056bef0bfba467bde3a10ec77ebda6098d2a47196ced3b06df5032e7e83706e4cfe2ac8c4213523f300de0c3 SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0
-EBUILD ttystatus-0.32.ebuild 483 BLAKE2B dccb177d2f734037efef5020259ae9aeedbe5f85a1d3b7474f126c54752c271a45431e505a829bcbf3466757e413f40b37419b02db9982e94721648869a152aa SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6
 EBUILD ttystatus-0.35.ebuild 546 BLAKE2B c8e695b3a7d4780814cdb70a3fe01fb5fb38380b1fe44de1fd73713774f1a3a957cc73027c07cf842e1bb1a92a94f34ff160713a4d3c823f360bc3ff9a884e21 SHA512 3f59da4728fd460e8b04e0871977117ecf378409b19bf89e30bff766037a92fbd13448eb25688b3abe69f8e3bbfee31983074180de0785652c6c0d876c06d5fd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/ttystatus/ttystatus-0.22.ebuild b/dev-python/ttystatus/ttystatus-0.22.ebuild
deleted file mode 100644
index 4cb527807bf7..000000000000
--- a/dev-python/ttystatus/ttystatus-0.22.ebuild
+++ /dev/null
@@ -1,19 +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="Terminal progress bar and status output for command line"
-HOMEPAGE="http://liw.fi/ttystatus/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.23.ebuild b/dev-python/ttystatus/ttystatus-0.23.ebuild
deleted file mode 100644
index fa0197685191..000000000000
--- a/dev-python/ttystatus/ttystatus-0.23.ebuild
+++ /dev/null
@@ -1,19 +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="Terminal progress bar and status output for command line"
-HOMEPAGE="http://liw.fi/ttystatus/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.32.ebuild b/dev-python/ttystatus/ttystatus-0.32.ebuild
deleted file mode 100644
index bcebdfdd01e1..000000000000
--- a/dev-python/ttystatus/ttystatus-0.32.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal progress bar and status output for command line"
-HOMEPAGE="http://liw.fi/ttystatus/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 16d7ba64dcfd..79cf4cdeaf40 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,4 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
-EBUILD u-msgpack-2.4.1.ebuild 826 BLAKE2B 969ad987cb2326e797550172dfef8ec166dbdc52e372e7f99f89e9f759a70065793cca1a8a20d0b18d6cca377310e66b709a027b3bb293bf2b58ec1497d5d8b9 SHA512 518cceb0919d74ef6093bc36af5f0db45d11960292c423d71a66a5994da62c9e57bd2ee11194985baa7629609a8805015e073695847bc916e90e5f1cd41e0797
+EBUILD u-msgpack-2.4.1.ebuild 828 BLAKE2B 73694be0a645b148ca7e93f2a2e6e21b646380c8a8f51171123b4f61879385eb8afbad3b878a988faf8e1ef001177eaa7ad8f13932a19d50d23091e98252d6a1 SHA512 27d6634c416ea61e8ed301df718644ed97f2c7024868c397dfba5e74c2991251105a67de8313bd5b72ec2eccf236c8e43b939fbe43fe1910bb0b8535437295fd
 MISC metadata.xml 985 BLAKE2B 6c8134062eec629a9e15fe23321a10d4248f00fd92cf14d43d35395b29970c7668661500dff63f3f004925d2b00d0dc8fe91487d3a056a77b7b2f1f3a33d5d91 SHA512 642fd0a2bed62a5218a3f2765f51f7e221ab57850d03a03f018ffbe1469705e34884b82c51958bc83c4fb722f00b818fcfd85df0366eee2c0550a58d0fbe91a8
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index 251384bb6a2f..5d18c5a0670f 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index ea1776db1a52..508141db4bde 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1.ebuild 574 BLAKE2B f9a542ff3f7834de8516c005094cb1e4d635967de6164cec9a69dd1510067716332551c29229034beb7d5f0b7c445d60bbaac2c7c59d509b4c919c73541846cd SHA512 8290a0d499e34a06a5abd4b6ce3760d4a2c71686f4f331f47f18b2ba7279da16a4febc93518ce454205e68200dbc59c340386e25609405755b60d3e3d82a9f29
+EBUILD unicodecsv-0.14.1.ebuild 575 BLAKE2B ba6c30731b319d6ddc8243cbd9c94614eea94021286cdcaf72f6c953eae84745757830d98259726812daa6895c2c7efbcbb24c7880dc47c65a2a724b8d60c0f5 SHA512 96d3436a17d973ff9320bd63d6c1529affe02241f59bf8557176ebb70ed0d7fb23c20b74dc26dabb7f65002b78ec2fe7a4423d93cd82a43863093f5c9fe11ba3
 MISC metadata.xml 377 BLAKE2B e3a9bd3feb345bb487881810f332f1caa566eca8ba8279876eb6936dc98c47ddb5008623357b82a715d1459f3c50cd5e9b0e00433e678705b433a832d0f7a268 SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index 8d63db7874a1..33012ba7038d 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.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=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index ff2dfb3a6443..945cc0a2da52 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,3 @@
 DIST versioneer-0.16.tar.gz 37736 BLAKE2B df66304770ca0ad85cde13ed1870df5901bb5526935b3a17a28dcbb267db3a8a822c1f43b16643c7f7237225c27b50db94cc0d4c3e87dd58a004475fcd64bc54 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3
-EBUILD versioneer-0.16.ebuild 812 BLAKE2B 597472babd6fc45661666087925ce3625261a8cf2c7a76c68a4c8ff249fe6b4468693c3c86eb87e9cdf48fd464d1aa07f410cc8acadc8c0a1aa5bb41e3ea21a3 SHA512 ec237579f4082b07ab88f1bd662512d1804e4a2dad8609d86f4497dfb4810e9d0db56f104c71caf9bff7ba741195cb6f0055dc821831dbe6b82d37fdfa8c8af3
+EBUILD versioneer-0.16.ebuild 811 BLAKE2B 9e300d0aa903e9e7a4a168d48c3f07e5b11679832400c997d6a5783fd9065895c9bd900eeb52043e7cf6f96c56bef0d323c32d3ab392e66ac020cfa2683676c9 SHA512 13bdae5189ecd827f825c9ae9fbde5fe1e96686afe98c9563a80d0f79ac9c8c26657c31f0619864ae2c9d095f7852d3aadf667f6938b1bcc989c3321260f6fb0
 MISC metadata.xml 389 BLAKE2B 44aa4001cf007b381c8b974b3cead34f1b403b0b604ae5bbc09fa40d7ee152e2f102e8ec3e52a2ea186404ab6758f4e4ed5dcdc74335d464255d5796144303a9 SHA512 56007f4ca5e05201b08750acf76d0f83a017b54b4d2533084615f2a74ed288cc0d82e6824d2da31684dd3027a3a53f8b261cb5e2371a089544f8edafce595ffc
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
index 27ee36ea5c3f..71057bec652e 100644
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ b/dev-python/versioneer/versioneer-0.16.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 5ea2b46e0587..1ef5c1ca88ec 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,5 @@
 DIST voluptuous-0.10.5.tar.gz 41436 BLAKE2B a768e519157ed6999a67e7c759588c4558d3e694e4c5d4a1da0567737d249664e985661b57f9f8595fd7cf5f1b0d05d511616d6d44604443b948bd414b334412 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363
 DIST voluptuous-0.11.1.tar.gz 44346 BLAKE2B c0715293fbde6ce9008916d6e016d52920eda1906dc2ec292deee4b6b9f596f2d50592486b5a89df6a90e0512973e12cd69482e55f6c3a96ea0cc4b3e52bc77d SHA512 7e2f3ea122f739944a7820a536551abc45df9847a0c3daf5527eabd781b904706ea708c885d724828cfdaaac66774d2f8e7b42d3376de1c78ef2be9f535fd58f
-EBUILD voluptuous-0.10.5.ebuild 526 BLAKE2B 88924b75d02810542ac9336dba0243598b266fc8d6399db1c8ee13d48d9a8aec67b3c7e51eab682ebcc93cbc35c8735eb9fe7db3f1dc43b947c5b1e2c00a8ce7 SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae
-EBUILD voluptuous-0.11.1.ebuild 607 BLAKE2B a629468360538a2947aaf79d690b75bc0256ca79962e93f535873554c6aada253085d5688436312d9d8eeecbd0f8d481984e76ea84004e32eea7fb2a2197fb93 SHA512 6b1e4f953a0b613af8097963d5c8356f292cd14fc43f3d261f1619554eed531f8c32892476b68bccce02b6c0f33ed73a4c60e6fd943c475f85a5185a55facc2e
+EBUILD voluptuous-0.10.5.ebuild 527 BLAKE2B b7187a162fc2c4bb15c2d2368a7e068aad0660783f54748850d0632a18dfb51a75f8d1814601974ffed253bfbbadc2284868dc08740704276cd8872a55af1178 SHA512 ede6b66884918fc930790926a74fd1d8a39345f3fdb7a4662adf1d3122ddf4afb1e73031d8572ea2340cac9e713a50919d20452c27f781c66d7dc56b294fc3fe
+EBUILD voluptuous-0.11.1.ebuild 608 BLAKE2B e613471a8118c082d03d2cfeac1ae3b8411d0331cf0d289f35826603f67c68d717cc94b6a43e14c526c87b743e84d4ee50518092a1d67731d5853a35d418ed1d SHA512 6474520e2ed5fa0f13ce3ad1f355bd17a3724ed39a95116a1eca951ac78c2ffe74c7f373b963c6f4ed08bea0cba4b5e3e1f16e06bf4dab7573edf0adaad9a1d8
 MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
diff --git a/dev-python/voluptuous/voluptuous-0.10.5.ebuild b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
index 0e92b05a57c3..c9451455cae7 100644
--- a/dev-python/voluptuous/voluptuous-0.10.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/voluptuous-0.11.1.ebuild b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
index 951d2e8500e3..379483041b97 100644
--- a/dev-python/voluptuous/voluptuous-0.11.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.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=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index e3a1ba531eff..fdda178bde66 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,3 @@
 DIST widgetsnbextension-3.0.0.tar.gz 1253392 BLAKE2B 88d435b06fcbf759f7ea919ee69d3523f86f2a150bb7d411d9f2a41f9e4a6176a7900595ae5bd30232c203b81f3462a1178c001fbbf456f847597b0acbd20f12 SHA512 079a2ce837e37a8d1707b6686e5c23989bb79af298847ae6bd01dd0f6e570f91e86ff53ff4aa3a8cb4f56f895e3839ef96c722bd156599eb01893870aa1fb4dd
-EBUILD widgetsnbextension-3.0.0.ebuild 494 BLAKE2B e382d392788fd0f5a7466300f14cc25e23265ecaa1e41cce7f3403fb4546bf917f5cf349e35197c990f328e5995589b3279b10999af0bd5ef3be31eaac49e62b SHA512 5371d48ba248ef0c4bfcb8bd5232ab73ab2eafb03583ca3be4d53671bd097ae88ebe17104bb23a804e8b1de326b598c6b9ccafdd6b5185350cfaf281d865624f
+EBUILD widgetsnbextension-3.0.0.ebuild 493 BLAKE2B 643aa052b43c83406c5640cdec90bba1e295f0045559036d04e0371bf8a18b3d0ba7873b8d570774939ac69b2259237b8284fcc38e291db060101b5611d11fe5 SHA512 141cecdf8357d19dac14efd44f699d551290e7ced9970816957943ce3fd21404ce2fe24871b2b1ca82f3e5de373d0bc9f8d326c7e4132ad483db793723ef2274
 MISC metadata.xml 505 BLAKE2B 7fea495f73e9db9d002d432894dcddb9e9b86cb4e38bd96e9841b4edf5338e659e440b9a47abef5fea5c4d04ad27d91f9fb4583f8ef334c2aa12d39b08fb83cf SHA512 4e7df3a611f92efd9e82d7fa7cffc23f1b90d93ff5c03153c4d34dff6e0acd862f56a2ee9a8a049e213d191c7f1cbd364572b85c6e7df9b3e99d3dd743217505
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
index b782f95a363c..3c9a32f0d95e 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.0.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index d9b253829bf1..9425cf96c4c3 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,5 +1,5 @@
 DIST wrapt-1.10.10.tar.gz 122052 BLAKE2B 216c3cf5ba3b91d2ed6c71c3a131242e8e668394b429e13d1a0ca3a0f806d380ca4e1a1a1d17ea029643fbc0d56defdacfcc9659a9eb1df67771dc03cdc7d292 SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1
 DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750a2a1c5c29acf91e87a9c9405b11ff10dcb56e4aa28d07d34f7a56fbe9154d2f30556f5a2ae4f1a0986033e05a SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98
 EBUILD wrapt-1.10.10.ebuild 1005 BLAKE2B 8a6a13c76f4294ab4bccd5e990ea3a0c3e8ecc78dc19a43eb83d0b0789ff6128b9efcd19af7047997cb105e1f0c739d872dbf122778be032d1b639926250051d SHA512 1dc3a85bf196351bea5ed15cedf09e0c13ae3d22bc3e6e0bc5847fedfc63fffc171e0f0cf81dc859763262f9d10a25f870fa96acec20fb81ce2341b0133b894a
-EBUILD wrapt-1.10.11.ebuild 1038 BLAKE2B b40dfdbbdc99443c6879ee66be2043301d4737873d8b70465a01853bc9b57d9c71534c1cd9d821ffd6d1183e9ab6ffb9c804ed3cfebb03c5998613e8a81647b9 SHA512 023bbb8d8003d0042154fb629886239afa2cd3ea210956e5f326958750a59a2af2e92939cd89e07414fb684df5019d74f06fac364c6e4343b07fb59865882bf1
+EBUILD wrapt-1.10.11.ebuild 1037 BLAKE2B f0387fde54564c2210c8a9cb53721763a8f0978974877bde7da263e52386ba1f137c0319f3cc7600eecc0450d981c0f9a7e6fbd48e06563937eb6026be30cbad SHA512 6aa9796e8021698eb4c1c2b50cad0287f59ac831f9418bd678eaa57292229116fdfce6ea87aef3b73103547e5b05a55360ae1737578aec71c47c06804bd1da5d
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
index 755a87a641e3..756fd79d36e7 100644
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 2c7ab8a7d290..ebfac90a7f9f 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,6 +1,6 @@
 DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
-EBUILD wsgiproxy2-0.4.2.ebuild 1301 BLAKE2B 0d508bec0cc43df25bdc9cc79846b7d0ae679b4051aadbca7b2ec2d2b4cdd256876da52982d262d88fc49bf2f9d31e7c75a4eb3aa0afb0a84a35486ba8f7459b SHA512 ad96bbb9a28f3d0e4e3c644e07cc90ea8702bd14383e2bf8bc0617980c11d888cc53a94fdea41e9feaa0ba19869ce4a13424106f9756bd1b0dd992e0960fc327
+EBUILD wsgiproxy2-0.4.2.ebuild 1297 BLAKE2B 76b9a1311e1cb1ef623cf42e352c3e31364d8b92440afc94adaa53ba6673f367a497133f0e742114d51896681e82ba119ca9a48512512d39e15657f4a98af5bb SHA512 4732db756d95fc952eae4d409f65af3f08a8648b707ddd2016a5379182588697401b55ef7e957cc8cc2caa8bf1bceac59af0dbe6162e3a28c9dd3af7f507c073
 EBUILD wsgiproxy2-0.4.4-r1.ebuild 1311 BLAKE2B c5396a4a1329201da256cd167959aa440cd7acc8370eb3415b53aaf06318bdbbf37ad62097d746e1c89491846e9ca7b3767946c3b4df989e177aeb7489223f02 SHA512 aa37ca4f2508f90afee59d5b4a46355db9fcb30e214426bf6b024eef651e19b11a667dd86436365fc3d28c91be3ed07c1d5d590c6bdb9e41793b522941986a54
 EBUILD wsgiproxy2-0.4.4.ebuild 1312 BLAKE2B 30644a4f92e238778c9839c1b4f45938dc170a9aa09e161aab069d9930e0eb2fc827e15f88e7db1edde1d79c7c601c2e6e4fbe3faeb29460c9987cdc3959725f SHA512 522aa657376778704f1358e9aca55d692d4fec6d9cd7a3abf3a84c298ebef3a77b66147646edf844e737b07b5c6dd1fee71921dee3601f64c92a947a8e828bc1
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index 45b230044208..e4786525631f 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index e9d867bb53a9..55ecb50d5dcf 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -3,6 +3,6 @@ DIST xcffib-0.4.0.tar.gz 74715 BLAKE2B e0e7d84cdb39a022225623fdefab7a5f8e6de2490
 DIST xcffib-0.5.1.tar.gz 81274 BLAKE2B 17e19d16a5d1b5699a10bc93c80327ba2d4c38d18c704b99f7e81a083ab8879f19dbb67b11cd0eebc47b8286c3f4413be089759bc49455674847593465dcc97e SHA512 ed13a43e301c6713c3831261bd94444d3961f805c39cc72dbe05f986eafb24e4f53f653045b84b57b4046a3ac763b20bd661298af5e6cc57978c57d68d2a0a39
 DIST xcffib-0.6.0.tar.gz 84360 BLAKE2B 0947e1a20e9ad73f77e6cb000ed9fc8d70e45080edb74c5d25642c2d5ae388cc97461633e8cee1d7676557735b57b9cc1a3de459e54f96888cf7d19451d24c21 SHA512 de78b738f2a75e6569a0529d1fe2844b2cafe48623f25c20a9572ce881cb97325c3823dfe883a2e14bc93d01342f20c4ab561928312f65d0a67364fecb5c8ba5
 EBUILD xcffib-0.4.0.ebuild 795 BLAKE2B f404ad4770a067f35492b8b24a20e54bfd9ac0f0874cd956ac419ed0a757b558721549378a4ead650dc763193f383fcd857cc722b468ec1d929e2391599a0641 SHA512 33e449cfbda001cf2337845a2cc9c83b81b2189b6f5f43050c30fcc2ea451b8ecb0a93191cf329a3dd82d000c5a9510b822642bd0957c28b54bb3d9d34283442
-EBUILD xcffib-0.5.1.ebuild 893 BLAKE2B 7a26acc9fed613a557df9d8015f3cb468b23a78e5e64afedbf1edb200dfa89ab813de29499adfe4b0eded196f16025b720c8887490f36ed9cfcd872ef778dcd2 SHA512 4ca68a0a636d3baf81c9991ee4ed2e483df42cc11b86e4b9b90d8fcb1ad46c77258685bc7f3499490848f1ed04b618274e119d5d32ca27eb4e217d30d4471f88
-EBUILD xcffib-0.6.0.ebuild 896 BLAKE2B 96a26165a31698ad6150e6d9a7837254ef013490c3fbf102d16123099018ce66023acb1312513529b76e49c2a60c3775d895909c8641994a15f96dc07f2ec497 SHA512 ee078a19572b3a7ecc83d28ad7462bd2098675535fce8c442c4b3c8c6b6e28530dec42641e565e9e253fcc55708682515d6a5a166f74f4b9436eafd7530a5e96
+EBUILD xcffib-0.5.1.ebuild 892 BLAKE2B 9a47a777f4cb7b3df0d107b5c8a764205c6b459d5db9a3ed9c5fc97e2bba61d25eb0200c9026354fa50a88eb5385bebaa51ea121d1acff5f6aa2caddf6120eb1 SHA512 1ab4a7f70f6223ac4e9bb0b6c1bf6e54467be2667298c45ea0d361b28f690ee8c0f26183163ebf8c077ae4f009b63bfe7af18c1fd6833bef756f9cacdd6811b5
+EBUILD xcffib-0.6.0.ebuild 895 BLAKE2B 1340840c234a4299bd37bd843c57312ff14d0c0420630f4a6bc8b4fe30aa7b6c06cba0566df961b90e34f9af0856f73585d0ce3cf2c28a60dcb2e49421f55df2 SHA512 3658846ebec931917e188dedb56818556e5dadbd8d33ecc6fa804e3b026876eaba9d778ee49b36f54c809416ba111949a9a516a405a8666213947ba7e89895f0
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.5.1.ebuild b/dev-python/xcffib/xcffib-0.5.1.ebuild
index c5c4077789b6..d5d345f5af5d 100644
--- a/dev-python/xcffib/xcffib-0.5.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.5.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/xcffib-0.6.0.ebuild b/dev-python/xcffib/xcffib-0.6.0.ebuild
index 575cd9b7bf24..1585b5ab0eb2 100644
--- a/dev-python/xcffib/xcffib-0.6.0.ebuild
+++ b/dev-python/xcffib/xcffib-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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index ac3a61ef6101..13e589cf5c39 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -2,5 +2,5 @@ AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f
 DIST xlwt-1.0.0.tar.gz 129588 BLAKE2B e900aec8efc254539936a7e5998c17116c3d95c66fe169aff8caaf11a9509cfbebe29f9cc5ea4a5f6b5b1cdf28f9e08cdd33ce7ae4bf474b4d51df491605f372 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866
 DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
 EBUILD xlwt-1.0.0.ebuild 1208 BLAKE2B 77d53193bfc2ccc2b247d164ec165fa3ce8fce3f0e890659675d72c8e1b6f62255bed2f201ab4ee525f2e9b2873a0c5dcb9f16721a7927d322605fb384bd70fa SHA512 21318bec5912ea375f808698154779c137ef5099dc8ec8a347bc7da01e2016c0f2ca06e1af3e6ad3de89d4fd56d5a0d7ca22498be6f08ec4f17b32f4f9c0829c
-EBUILD xlwt-1.2.0.ebuild 1254 BLAKE2B 628f05e864a0aaf6acac662533170dd1b7ba6c45198289621a3b83d29df643c3d51783e8c107dd7a19fbaab35d2ca5bef574a48e43d5cfa7fa600db41927ba64 SHA512 233794886ac969486c26fe54532f431d088562d2dfc4a3f6f63b08a14f7104b7bf2dcfbdfa0a3e5628197eb65516e14c729fdf1ba225245fcc578937fbbd2846
+EBUILD xlwt-1.2.0.ebuild 1253 BLAKE2B 89dde7bf508174a53515f7783657c56020204442691adebcf0e76998a5f74156446cc92542ce6cec57cdea2ab0689dde477fd0643935ec943c83def5f3de4867 SHA512 a6e341cc1b404001f982a20dc2f35a2fad52d3321f9d916101fa4232c568ea8a72089739d458cbbffe2a0a6f75fc8c4cd37b6235f247ad0a08753fa9c9de1268
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index d90c80510c9e..a0e198040e77 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0e6b7d6ab5bc..08bc6fb7add4 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index e2ab3ab820ea..5a9c100c6e73 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,9 +1,11 @@
 DIST asciidoctor-diagram-1.5.10.tar.gz 10441267 BLAKE2B e5adfa51ecdf966d471c9adb8ee6a99e5a208b4934646a1f0d672fd29b69cf59eefdee90444b0b99ff3c91172c99b9f41768ad7f4edf7ec203416c47b46d7e88 SHA512 fcf76d71d0b9d58dc5a01aa484faa663f636ff36f534c43621a71702032d1f49a04189d0ffaff8b0fdc2f189d54ce7392f74e1b0f29128fc3180e48d35bed5b1
 DIST asciidoctor-diagram-1.5.11.tar.gz 10441331 BLAKE2B ac1df387a4a55701fa86b336b88f3f389cbe20dcb806baf744fe041db24035f7238124677685e1c79bc1df3747c1fddb6abdfae7a981bf0703897ad868aedb04 SHA512 f3e46b0befa6a104f5dc4732bfaca006bd52be4c919bebcea4692037ed444cfdc1c73a1ae00d08989847e6ce1cd42d8d3ca3964dbd5817b22c7332bb895a6b5c
 DIST asciidoctor-diagram-1.5.12.tar.gz 11262551 BLAKE2B 08ecd3c1b7814b253e6be11d423e0e95e12d8e1097f54b09ae3a5935d94349f9ff2c40d58666895429be5ec058bd797aad38516a0c5bb292866dbbf23f857d9a SHA512 89c4aa836e554ea69ae204406fa36f25ebae12cf98acf7b96bcf96f548bdcb4d2503e671aeb419f8b5d96441564e572b714e2f9a3017c4942d139977a148bf5b
+DIST asciidoctor-diagram-1.5.13.tar.gz 11264430 BLAKE2B b5ce1946635bf24e45d8bdd264a3e924b9c876e28d42efce388e60c85e143c9267971eb2dbffe9ceb9af4770162dc1c29538291ff24b59db5fad382811810972 SHA512 9a51b69af6b60bcf7e6daa1be3965ca4497fef7e8ec04461380c51494b5c4aaba35a6e62bfe88281b8d54c8340b34b6cc739da021cfa6f7d9f528802347a02e4
 DIST asciidoctor-diagram-1.5.9.tar.gz 10250161 BLAKE2B ebeb184259042a9088c5a8f6c5afc86a69f6fcea62964ac2f571f21b6b2b382cdf2cad8abc1e99ca781b4663da956982f1a5d418126089b17bac0e68bdce0fea SHA512 b25f5c2b8ddfc2b9bdc26ef47b5a2ae8d28992ac26f70ccc4c9046a45e9338b5ed2b82cccb0f01dd44155e043b620410b468ef6b12dfe03ae20a67e4d109be05
 EBUILD asciidoctor-diagram-1.5.10.ebuild 949 BLAKE2B 00192b5b184f14a83a00d927b1c7b27e2755d95ed41cfe72d6c02bec80431c36bcb871b77db7080bca0d6ada04db6194c4bc016a71f57857d53844d4565b65f6 SHA512 b7a1e0ea65d642ab617b2c294375830bb3f67d9b09c3a5e2eaf6ab33c55b8154d4e1075e8646c28c2ecb8b21b8f197fbb39479525292d147d91e91b444ee3088
 EBUILD asciidoctor-diagram-1.5.11.ebuild 946 BLAKE2B 336b59c38356ad9a4e9b47ad1844aea0b5281ba132a4e1483e4805ea30e2ccca10e51c01331fb81786e97a622a8ffd402bb22c8358592979a4a214a3b4de4996 SHA512 bd8ecf477649fe24b08fb3209d9be5ed61fb13d4ac15702edac19f7ed822104106c5f8217bd80a794443fbbf07ba7aa92a99a05217cb24b644317b10fefa72c3
 EBUILD asciidoctor-diagram-1.5.12.ebuild 953 BLAKE2B 2d18bf3f87f9def039aaf4e7144b761a25c6ffe4064ce917184d05d43983e0a5df17bda3086180f2f5aa197cbc6f4a39aa0243419bdadb0a2a2daf1e3104b399 SHA512 36d82f3042ea22fdab63a33a387fddee51c6c6995ef630260abc898799279a92dbfe0335056c027e417bd50dd26b3a77c50aa705219bd10f2f69d3fa75449a27
+EBUILD asciidoctor-diagram-1.5.13.ebuild 953 BLAKE2B 2d18bf3f87f9def039aaf4e7144b761a25c6ffe4064ce917184d05d43983e0a5df17bda3086180f2f5aa197cbc6f4a39aa0243419bdadb0a2a2daf1e3104b399 SHA512 36d82f3042ea22fdab63a33a387fddee51c6c6995ef630260abc898799279a92dbfe0335056c027e417bd50dd26b3a77c50aa705219bd10f2f69d3fa75449a27
 EBUILD asciidoctor-diagram-1.5.9.ebuild 956 BLAKE2B f7cd62ebf9d728612cb90d7eae6314c9f9e94cd40d3e6bdf27b65bfcf74efd70cacd359c2689cd1d4fb9abb47c1137a2e26b65de4894accc1076031c1249035e SHA512 025151cc864febfb45323c1d5eec8d2ecac8e6fa48cc168a235a9fb38c38824caf4c74ad3256f64aa00176e68454d192ead807e93745cc5c3085080c3b5c749e
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.13.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.13.ebuild
new file mode 100644
index 000000000000..7b321aab14a7
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.13.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="ruby23 ruby24 ruby25"
+
+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*"
+
+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,shaape,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index c09b37da0386..cfdb6e8c2b87 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,7 +1,9 @@
 DIST bson-4.2.2.tar.gz 96725 BLAKE2B 62c40df519e185665f0c42bc8ab6a2d8472d123397f1ed1403e40254944cd423e6cedbfa014a03f6c6ed8a7cde94f8c26d06e784b82ea55f17a97996915381d6 SHA512 4de8950271f5fdd5927eda290b6506248012cb8a932d65773ad53f1e3e4c67ea17575b559447d5eb6c9286f672439879dbc89aa0cded4ec2d0fa35c49da7a574
 DIST bson-4.3.0.tar.gz 103341 BLAKE2B 29f7d870ce85e4984f47fda482b9ebc33986332eefcc3d9c5d56f7cc628e698a4a2e879225b81c6d0b1edc9e62f9b426f2510b67b51398a699d96de390544efb SHA512 c753bd68df5871a7cbed78dc68791a5d1c30db5975b70702742f12373afb754df8078d2bc6a772fd398815bca05a2fa020cc820a1ea9238f8b01eb492581b17f
 DIST bson-4.4.1.tar.gz 106995 BLAKE2B e10bf988c139ba4ffc1649f8f80dea0f7815c46ffe6d3bd35c522391879feb2996c161429bf4a5da2c092ab20fa9dcd544dd187bf3bb3a1baebb48df7c6be6d9 SHA512 740149ca01698998721cb6f585dd727ddc26ea770a16e5a6dc2d5faf6e52388ce8804a44b2c2ad1e52085dc810b522f4f320b72757c62cc7378ce6af84714d2a
+DIST bson-4.4.2.tar.gz 107429 BLAKE2B 94b3f694d79a3219a6e7b13f4dfa5935a1fec5ac99883918d61052786b2e033d8cd335013155b4b9069a730a3a87a0c0ec00b8b5ee5b89bb8c357909e8f67fe4 SHA512 a27a82fab17f596df986a3c81f1e73146a8d283bb16e8a7dba1921215e8f0e863b6996dbc107ede44546e750e4b19cc2dd934d290e25712472efd6cc075b9984
 EBUILD bson-4.2.2.ebuild 1078 BLAKE2B 621d2c66b6c5f941fa2279b6a534d232020069aa1ba55ad256e912945c51c73b823d486190679b47f33282bc947a15ed9d01117be35aa55394cb9adef64c8744 SHA512 d74d592a22fa0e30b90999478eb850f2d291118cb1bef2a8fa7af6fab934f20c46ba4ec91fa6a947302139ce9758d60cf004d3ed1604af3fc2dbcade09f4df80
 EBUILD bson-4.3.0.ebuild 1071 BLAKE2B 3d5b011f38e6e2d755db783d2197e12220e1498285b72d61c548fa3adcec7fa496951454d698c39cbad1478eb5d6e4f2f115d00496eacdbc086b43211898a736 SHA512 c22a648373baa986c0737a4875cd9a4efedc93e399cee6bd3d3e28f165439c50b4acdee7f64303acdaf5bdaf43acc690b291b245b9e4774ea5b41b6dd40dab36
 EBUILD bson-4.4.1.ebuild 1075 BLAKE2B 372ee35e7b8b096b06bb1c77086b43712b071f2b2768b4e4ee96518a32b52ccb14157c797a900b6ce1784e368172c37c606a788532993fb10aa0adb1aec4ecc7 SHA512 366c644efff28c9df13892e64abee9e53c56103d1c08a21c0c785448b476013acc0a8577517318e38b0ecba67de91e68c3e8cac96bae23e945f2bccaa1a758f2
+EBUILD bson-4.4.2.ebuild 1076 BLAKE2B 167cc4c37fea736e2e02b341cca067ba49a9c3851cc84512b3c080b5bd1d5a2fbd269369a5638dcb0dbc8c09f33b4ae803f13710323bef0b349a460b5c9fd5bb SHA512 c5eaa66135fdc0487115f0047c4ea2f7f2a6dbf1acd1b276ce606cf47fb06d910b3f4145f1f8f595b8a69057ffc2d9a83a2e9029d6a262f9c0d7d8d8685c0494
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-4.4.2.ebuild b/dev-ruby/bson/bson-4.4.2.ebuild
new file mode 100644
index 000000000000..0f75305e2757
--- /dev/null
+++ b/dev-ruby/bson/bson-4.4.2.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="ruby23 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 b6ce0df30975..8e003edb9c37 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,12 +1,14 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 DIST capybara-3.11.1.gem 310784 BLAKE2B ed2c26d0340b0c0ea0fd008436ce29a38d650bf1a7b31279863c0f84e5bcebbd534f4611e9656743cdb9c61ca9eac4c3b152d21d6b630427829f3a2e53f27057 SHA512 d97c53135d5ea040950f42750f1644c7a1ba96ff86cefbc83934a19173cae1f303f4ed5b56b95b5d7b9dfb83209312de5e129275b03d472e2614371d4234082b
 DIST capybara-3.12.0.gem 313344 BLAKE2B 7efac262e6bfee18a44b0a399bee0671e98c9d08e999e9c9cba5a325ed2e9da25e873d789a01d9e066a04aeab0ea3a6a35207e7d0ab05f63eca8331d93acbee8 SHA512 a0bc868fb69343c9b037fc7bfbc998662720a212821cb78a02d6dee29d841d1fc4781c6e5e6fe1d4a356ae495ea56dc356ec734b26005215a55ca1eb8a7e2789
+DIST capybara-3.13.2.gem 320512 BLAKE2B f6586c9e38ace599b8214b71e6516c2d7b236777d1cf2beba01d276e624cb1a49b2dc3c7fb74ef13d5bf666aeed2110fc4e7991ef960c7dd9af1430d9b6333db SHA512 e3d2f81934d75b6a54a80b913be411b617074412ccf15897454568dc9c35557a4825b6c7ac67b6f808dd199123c164c83af8bcc9edd61c2a02bc65723668774f
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.8.1.gem 300544 BLAKE2B 05c22b603bb67d3217fa9c4c87bbd79b2249219d9a62d00c511fb7c8272092d381b7598e82cc03c5080b9c5ec20a9d64602ba37d235eea9717e741232c05c24f SHA512 ee4d2b3226e5233a092d163b4323f02ba84ad682682dc9e17a4343380e4480774eac1bba28e12a83000438c7bc1d2698fe1aabe6162ff729a243fb863f06fffb
 DIST capybara-3.9.0.gem 305664 BLAKE2B ee11e9dede512a49d2b652142976f34a882be2f9e02c0af6b22d4980d1c0e6c1f6f73807fee2062662625ea11e96d533c865cb9f4d25eb4918cabd0b06247bc2 SHA512 da2b9d7809d66b33288a31902ffbbad91da7b306b5035546618b987acfe40bfd99451df4be34e4eac86032e13509ca7baf4a2eef0eb4cff0dd8a265e43cc1a46
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
 EBUILD capybara-3.11.1.ebuild 1593 BLAKE2B 52140986b4655ba78e1cb318f8eb5f46da85d72d94144f6261df1346de9be4ed3cb5824a65c47d4e4164c06a7575de2170c1003966972b68790e56d160122cb9 SHA512 39982cb2b2724e815772f2ad266353c6e75c22e99ef50b7f2c5585082db97e2c8bd113ece5ff037eae817b57cf818cc5554030cd297fccc3a3749ac1dd47abde
 EBUILD capybara-3.12.0.ebuild 1593 BLAKE2B 52140986b4655ba78e1cb318f8eb5f46da85d72d94144f6261df1346de9be4ed3cb5824a65c47d4e4164c06a7575de2170c1003966972b68790e56d160122cb9 SHA512 39982cb2b2724e815772f2ad266353c6e75c22e99ef50b7f2c5585082db97e2c8bd113ece5ff037eae817b57cf818cc5554030cd297fccc3a3749ac1dd47abde
+EBUILD capybara-3.13.2.ebuild 1613 BLAKE2B 6f94bb6b1461694a970cd91339d286e95eab853bc5f09fde68b4219dc5aa1960582ed27c7e005eef5a8ec41aacbfb0554ac7063edb585369b48b2d3d75fe1f69 SHA512 b41da0c42d6576d5ad2650d13c1de22049e9219d37efdff3cdd5913fa6cc94eb5c80ac53389690854e2adb502a24f11187cca13059ab9551d3c8ec2c0a090850
 EBUILD capybara-3.2.1.ebuild 1545 BLAKE2B 51d0f8fbc35d0f628e5224460a91fff7708e8ea100c03af063eefba6c31434af10a852f85993d7648dcf76b8c3524d5fa310b755da16ad792cad4e4d20d7cdb5 SHA512 00b38a2823b5261140e0dbff705f4dba76c8ffdb8a65a162232e22e23e3683b67a0c7568bfb642c9ff47b4d81d82b19d73c0d7a5840b0a61e07c305f51c1b862
 EBUILD capybara-3.8.1.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
 EBUILD capybara-3.9.0.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
diff --git a/dev-ruby/capybara/capybara-3.13.2.ebuild b/dev-ruby/capybara/capybara-3.13.2.ebuild
new file mode 100644
index 000000000000..ac78bf082bf7
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.13.2.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="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/dbf/Manifest b/dev-ruby/dbf/Manifest
index fe67fa167e58..e1d9112306ae 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -2,8 +2,10 @@ DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b9
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
 DIST dbf-3.1.3.gem 127488 BLAKE2B 6c75d901b0d694266cfe2441567bf5684e5845a95b3c68eaf7bcbd5bc7b9b4748412740d8afce1015d5a84b26fcc30656a7f6dfc57c8a11055ac657b28cd034d SHA512 222957472dede8cfee42971ad9e7de4a08a7fb0ed017930027d4203da75298ce4eb9d222b841c4b051cf54c772b9799b2ee78cd5308452672142303bdf60c9f9
 DIST dbf-4.0.1.gem 127488 BLAKE2B 60fbd21d8a5caf14480ccf03aaf9ae6b9917d8537b3437a6831c4e69f878fc17a8ac70344dbfb9a459aca88f0000ec7ea89110dd489a802079bd8171f36f36c8 SHA512 cc678bfc7faf1e24b35053a77e91f203228a715a357d0c8e075998be27f19f2db2e6aa9e51d700842e81ca47f9ac5ab68cde1241e59d951ba82a1a7a020d0d0d
+DIST dbf-4.1.1.gem 127488 BLAKE2B 82fc54aee620b64e43fd9dae540b4447f5edfe880f4d2d217016503a566c9fedc9b79c1dce8ee3ef252511f22fe989a1d709c1d8392f8c9b068dc6f601e62b65 SHA512 76e04319e1fb88f7e061b80e3ad5b9043a85e0e2ae29dbcb3ec2172f8c1d3b63a31eb38e38e2061fa3a8a9094cc5f4b5cde4864d481255ca6c46acbc0b1ced7e
 EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 EBUILD dbf-3.1.3.ebuild 481 BLAKE2B edf2f9b62f9b42de84c52500e2ce6dff386b5427923edc9d10d55eab9266ded02b99367000c3f5686b2eb88bf9d01bb566244e67ad7aec6310bfb21f631cb9bc SHA512 47986acc778cc81e1c5921636bdcae7970cc8e7deccd6b7620ece6b49b8f5a159fb1647e056bf0edc61d74d3841cf8e4356fa93241a9ae6b2c16108cd673bb10
 EBUILD dbf-4.0.1.ebuild 481 BLAKE2B e5b317cd0c666a53b32120f954bc089595ce6870755db13d9ea9682e1e20d7f5771546f74223293f05fb38b9c543a46ce00a5fa026ba9d8d320fc93399b0b13e SHA512 a21c9e341b3b4250687191328a0c9b30ef186afc4c86fdd69b8040cd42ea17572d8db0b36ea1420a63115218bf7e7314701497588a8f56d131d69bc0300d78bc
+EBUILD dbf-4.1.1.ebuild 481 BLAKE2B e5b317cd0c666a53b32120f954bc089595ce6870755db13d9ea9682e1e20d7f5771546f74223293f05fb38b9c543a46ce00a5fa026ba9d8d320fc93399b0b13e SHA512 a21c9e341b3b4250687191328a0c9b30ef186afc4c86fdd69b8040cd42ea17572d8db0b36ea1420a63115218bf7e7314701497588a8f56d131d69bc0300d78bc
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-4.1.1.ebuild b/dev-ruby/dbf/dbf-4.1.1.ebuild
new file mode 100644
index 000000000000..ac660bd38e68
--- /dev/null
+++ b/dev-ruby/dbf/dbf-4.1.1.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_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/delayer/Manifest b/dev-ruby/delayer/Manifest
index debff790fbb8..fc838ad90993 100644
--- a/dev-ruby/delayer/Manifest
+++ b/dev-ruby/delayer/Manifest
@@ -1,3 +1,3 @@
 DIST delayer-0.0.2.gem 8704 BLAKE2B f0fba28398c0e585b10cfa48eaa7aceb9914e335f11253e8c4cb7a3c85201fae7a52e6792f1d0e824c75936ae2dea572a0ea99e89384562b76be615f6b70628d SHA512 1a5e149b739d8dd975d5c4a9e6a072181cc4d816af202461a0f98ec91f92e85e76faf700171b83652ec4f5114b1c1c5b2c6cd9d1d8d6508c1161b43f099e2b88
-EBUILD delayer-0.0.2.ebuild 484 BLAKE2B f3d51f9e0fffd9509b481b8d25f4fbb5e2476e709c8a127af9a0efefb835b9af73056f89b70472a89e9f3d637acce4fd23e448982b0e9d2b5fd1c77f35a74500 SHA512 a47f54e8d53b1379995d91fcf0c5988204521c83726e2af637df2f1446f26fb81c8abf9148c01e875b866058b7489bfd8622705cbf9b851530b3ecdaf621844e
+EBUILD delayer-0.0.2.ebuild 481 BLAKE2B 0e15d86fc49a9617b2f56e50f142c74b616ae423019ca98dc9994ab19a5240a33629f12e159d260ed8cdd1061a692cd52097ac99689bfb2622683c42a4292806 SHA512 d51a61129b82b5f5fb168251a3535cb7f27dead399119c395d45300ecb09f4df09c437c0f45fa00941ff2004cdb6088be22416efc942760a560baf4e0c7f1483
 MISC metadata.xml 402 BLAKE2B 55d14808082ea735f42e1973414806c29ce83dc35dbc7a9b72c70d22bb00b0f5f22f34798a8232dbf32a74a134387eb47ff014477e336c912d89bd23c388e78b SHA512 9d11aea71d2c27e3aeaa80848458166719daff95243f342b946756e9b2d0d1ab23551a3eafc40a74fad1d029798f2ec7bb67bf224ae9985bd7db9fdf4576ef41
diff --git a/dev-ruby/delayer/delayer-0.0.2.ebuild b/dev-ruby/delayer/delayer-0.0.2.ebuild
index 81ec49694bc8..d9fb739a5159 100644
--- a/dev-ruby/delayer/delayer-0.0.2.ebuild
+++ b/dev-ruby/delayer/delayer-0.0.2.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="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/facter/Manifest b/dev-ruby/facter/Manifest
index c33121a0cc98..ba051b67c23b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,7 +3,7 @@ DIST facter-3.12.2.tar.gz 391789 BLAKE2B a4476dd37629aa770d66c2597d29a2bf46ae67d
 DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b2ab1b71455871a9364b7d0111ec78753cdb45d082041d2b028bac8e468a415a2bd9a15fe51dc69ec9738dc723 SHA512 d1568ca606b07c67f2e293b020dc5c2d399d5080857e47d3c748a7d104f75231d59dc95d54e5504b24f951ce540d1223102ee1b882e4495633ed89324ccc1c7b
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.12.2.ebuild 2415 BLAKE2B 1dded0b152090abc05db0a008088ef00e208add94f75cff29527c15bb1465e6252bdc613cf658e5e5126d3fd69966c8f47f637801336b9a3d24f351871f5179c SHA512 8a89678c3623b723594b70884a634214e34430aee18a28cd98d93746d559a4843841b5194ba968c76979e97ca6d2fd8a9c45948ac8c10382e97b33af2f69be82
-EBUILD facter-3.12.3.ebuild 2417 BLAKE2B 9e50a6817aa42275146514c452ab5116df01eb376d0f16a7fc31164645fe646d674e75f77bbf3f0a34de694ab9d8bd6a39477008f69e0246e788d409f0184db7 SHA512 b0ca5fa53efd56f6837844f581d8b03e835f9b20509805e6b4f3609e29d719a76946c0b461d8904a1b14f7c2d21bf49e63ca193b120d92068a18f2062df3c693
+EBUILD facter-3.12.3.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
 EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 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 62e2727dc21f..c6ee584a2aff 100644
--- a/dev-ruby/facter/facter-3.12.3.ebuild
+++ b/dev-ruby/facter/facter-3.12.3.ebuild
@@ -93,6 +93,7 @@ src_configure() {
 }
 
 src_compile() {
+	addpredict /proc/self/oom_score_adj
 	cmake-utils_src_compile
 }
 
diff --git a/dev-ruby/forwardable-extended/Manifest b/dev-ruby/forwardable-extended/Manifest
index 1a01f97325be..a4ccd6e34744 100644
--- a/dev-ruby/forwardable-extended/Manifest
+++ b/dev-ruby/forwardable-extended/Manifest
@@ -1,3 +1,3 @@
 DIST forwardable-extended-2.6.0.tar.gz 6602 BLAKE2B 2ad027f671bb308a02de8b0620df9b9dfdf49d08e9f6fcc6bc60becc57e3e7d184d131a2acb689d08dec26c4ec004f5791b4630ab653f974a0accdbb5f46331c SHA512 23a682e06ee823b076d6b9925a1ef4ada4f1fc7fa63b02d1b9122485204b62f55c191866170b63b34891934c762ac903df46bf5a2b17055d7504ee7a70627a8b
-EBUILD forwardable-extended-2.6.0-r1.ebuild 746 BLAKE2B 0da8eaa8db7c969669c9233a835cc4833fa55613af9254603b80206ef6dd3ab5dcc8deaef5538e71220dfbedeefdf34f8611bbc32ec6259f14e602d540adf314 SHA512 ae651a29dddcd8c23ca8206dffbd6cfdba27a2f3b4ba189f9dc51e0be33566bc7aa8571258494133b70ea445d2ecaa804e59b9fa0dd8213cb521c6e8536c74a6
+EBUILD forwardable-extended-2.6.0-r1.ebuild 750 BLAKE2B a65e67185e65ad13ab38f7241db1fe4271dc76625b769573cfe906e31532ae15ea6dc14b5a16fb3e7e0565a8ebb0cfaf54354f2aff938c83fe83229de7baddb8 SHA512 4e7f54f3cd2b1c868679848cd8e15086e82e6004e0f53963aeeec6ffa222fff8b4c75d2d14c1ac4bf9f709132b6d4f38835a9ca3ed8736fcf3b3b07479e5a700
 MISC metadata.xml 420 BLAKE2B a8eee09dc7ebf7ab036a2c90207ab3cf040d7022bb8b6786a915bb4a04b1e1885000c16ce20c81abf57253900495f63b46865cf418b2b4659553525f85e3b161 SHA512 79be9859ae890718b7b75b27279f1e7a2651b1f1b55c7ce6bde87605ff589afce1a6478e5411feaa305d4ee933a7d9545d718250d6e734615be703c333c917e8
diff --git a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
index a7ec6392431e..0896096b690d 100644
--- a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
+++ b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.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="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index abd8f902e67d..b6b5a0f98b9e 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,7 +1,7 @@
 DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
 DIST hashie-3.5.7.gem 71680 BLAKE2B 8f03e190cf299f3597e0fe1b991fd07e00af0ecff757ef56648f97e8a3091a1445441d4e00f59c9b93d5db0d21636d9e5352175e49692f7b28a5612c87da9163 SHA512 c7ae610de5fe9b19a724068c26c184b44f951b29b56e3c5240074a372ad24d0ea70e39541812cbd82d5516d9e00e86a33d935b90e086b7db305b9b34b8f44f23
 DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
-EBUILD hashie-2.1.2-r1.ebuild 713 BLAKE2B 0f27740d0e8be35e6278f7b9abc832bd099e85cb539d7294bddeb9cf7d8d322124ad631000da5dd8caf416f090a56b09ad8cee5fdf79f53a550a133ef6c9f3ad SHA512 1ebad38775161f73e659e122f107f8a30971128d2c7f884b559915cb49e6d6736ca3ac7ff949952de3398579302294cc23e050e96e7d53e870ed52804d41af15
+EBUILD hashie-2.1.2-r1.ebuild 729 BLAKE2B 4cf5d841a5e50b8fd76b8b42b935675043c734facae79601df3b3aeb402fe350ab5599f691af07956b04efa6f2f9651b41552a28d651d81f4c6ecee482b8faa7 SHA512 93775f9f9d9b01b88a05df1795e8dee87bd713537b7c9daffff8628eb35d6d7686aac6da48a1210d02bd7be5a10bbcb8cc0a4488f1a31ef4675cbbefd5415880
 EBUILD hashie-3.5.7.ebuild 1261 BLAKE2B 19a0a2aa6fefe3d0ffc48563a13689ac73c53630d7d5066c0a8fcd6a011259b6bbf8ecacc499d1a8a035f04a8876868ecd867fa2796ada428d2092330f0add22 SHA512 ad85c51d5d97e2d46e87958763e8c50bf4c3f032447e790725d41f73dd67106ca09f0781bc1a72c54d9ef3824b9f62f03a2a3487f419d843318c97ea0b674339
 EBUILD hashie-3.6.0.ebuild 1275 BLAKE2B bd8dc4c35211abdafdd8c7e25664fd892e5f48e98589c8a86250795b85f60d5d06328023695866fb53ed8ecf1cef932bf413eaa9ca31307b27813b17647b9b79 SHA512 abac62cfe3f15cf6d856586012f87c10f884c99dbdbe0d19f34dc25ec6bd99cbc2088d4ece1efbc838edecfb8f9d4a5c27c615c36371345aabf8095c961a32a4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-2.1.2-r1.ebuild b/dev-ruby/hashie/hashie-2.1.2-r1.ebuild
index c6a44351cdde..fdb5923e0cc5 100644
--- a/dev-ruby/hashie/hashie-2.1.2-r1.ebuild
+++ b/dev-ruby/hashie/hashie-2.1.2-r1.ebuild
@@ -1,9 +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
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/heredoc_unindent/Manifest b/dev-ruby/heredoc_unindent/Manifest
index b4da95b99c2b..94adf1f7f3d4 100644
--- a/dev-ruby/heredoc_unindent/Manifest
+++ b/dev-ruby/heredoc_unindent/Manifest
@@ -1,3 +1,3 @@
 DIST heredoc_unindent-1.2.0.gem 10240 BLAKE2B 2d29e85e03b4da87277e82ad3c7f85f8c4f4063651a5e1aa9931ae257c8e3416b6feb6403ee158b2fb6bd4bb0b6fcf00a09bf688b3ba3acc76b5000639a7c248 SHA512 a975ffdc2ae3716a7fb90145270df03d6f3d45d42d3fca3125044a2b960a9c8ffc74a7fb0e315b6021cb6ce535b08207a40351573ed89c27fe0c8e196ea02c76
-EBUILD heredoc_unindent-1.2.0.ebuild 735 BLAKE2B bb50376d4b21700ec72a662d9a3d770e4d47bea454848a725e2f974fcb0d4f0ee69da4619b10d92f095d893e439edd56806412b1a738dc6f3d14671415eab863 SHA512 e0bda314f7ba2f5eecfcbca7f91c91f456dd64981dc0a9165f6ec6a74d78dbdbfd4502aabd61e6d5b4019e6f9aef7826cbe30986a2328e14b4d10ff55c4f6c12
+EBUILD heredoc_unindent-1.2.0.ebuild 804 BLAKE2B 262a0bc00d1f362dbb514400c53eab737b1f7a88e97c29d2be7d90936fe4ee3b7da3b125c9348fee11442574dec54305349f51f55ae9f79ffeb4b4499bf6cd8c SHA512 47d12e18d497dff557f1092508d10c383eedf2b02c1a114aca85267e7255a0e4ba1d4c392cab2cb4a072014f1ad2ee04eb621b9cab23300565d416880a2257e6
 MISC metadata.xml 355 BLAKE2B d6f3b21bb4e87e3eba58668a666a27da2fba665c0c96595b438564fca3fc691be1f8a5335175295617a18b3a77ec0966db5d9304de89859af6bdafc301379739 SHA512 bf551d4c3b25ce65b832a8d23fa0d333a79fff8b0681e975cb237367f0470fde3ee8a37f3df81d292915ece3a0bea6246de190880889d0f739870e106ec36978
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
index 3697dee1b3e1..a46c76b36a6d 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 inherit ruby-fakegem
 
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
-ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.8.0 dev-ruby/test-unit:2 )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
 	sed -i -e '1igem "test-unit"' test/test_heredoc_unindent.rb || die
 }
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/instance_storage/Manifest b/dev-ruby/instance_storage/Manifest
index 04924117b825..c7f2095e9202 100644
--- a/dev-ruby/instance_storage/Manifest
+++ b/dev-ruby/instance_storage/Manifest
@@ -1,3 +1,3 @@
 DIST instance_storage-1.0.0.gem 7680 BLAKE2B e8c4f90c90c6efebcbaa577ab17824f4d759782f1b3985679200ca97b89f04245c562f6d9aa96ac894d488417f4e393bb7faf28ab18aa3f3ede1e03365706a29 SHA512 45ff98b3d0ab47d3459d868eb1b0075abb83b23bbc3a9b84f261077bdddc385ed016e81d01c19f93fa6cffd7cb9020ce1e22411636709f18af09a76c7d44598f
-EBUILD instance_storage-1.0.0.ebuild 506 BLAKE2B 676e855b121dadf778a611ae4e69722c9d04467f093f14ff16668284d920dbf55c478f449b2bd17b19b52c19da6d414daf8c1989b2a7d68ca2ce4d2a46b10385 SHA512 b5e6cd71103d24b29f136822d391cbf858968261a8a790c2363da8125f1a170649a9f3381888de1208514b91855367fa6330216e6396248929c1d694dd1fff92
+EBUILD instance_storage-1.0.0.ebuild 503 BLAKE2B 46b71e8a0a18a50557ed12464e54ae306496395e5505b22692f565bfef6fdabfdb6514224ee0cb0f71ab9f10821218973cf35862716de47df7f51445b1df499c SHA512 4072f5ea6248611c28923638252fb082679f4ac300051c4350a08f69e6ebcb204eb4b4513a45eb2da36cade44301c58c7fbdb2fc3fc04cf7f4b9b0a3db5354ab
 MISC metadata.xml 411 BLAKE2B 2e1ba3d431fafe85a4b3d22369eaad7de3a2e8f40a2aa7596912dd5a3c7e242731c00714b35bcb29fb641a79daaa3132aa3a4695d6faefcc8150afa38ba4f304 SHA512 2e7c66f01814ab0c9c5d677183d3bac6d67617279c422e29a4f697b328cb461d53b142e9bcf1995f8f0c43c2c7333d666d6fae3a5f30970f4da99e59bb0e1105
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
index add45677a736..60bd5f3f2516 100644
--- a/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
+++ b/dev-ruby/instance_storage/instance_storage-1.0.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="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/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index bb73a4c8970b..850d44ad7e4d 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -3,5 +3,5 @@ DIST maxitest-3.0.1.tar.gz 60926 BLAKE2B 9ef03af6e55e7565acfa89d64e04aab40ef1144
 DIST maxitest-3.1.0.tar.gz 60956 BLAKE2B 5819137a548dfe1ae1c641ea3ddb4fbdf522e08b35eddbeb5dd4f3cfe2f320d16779d48166be820215e3dedecbe1f77d2db475403d476e53d5019631a0972d09 SHA512 37fdba5658cd640de311efaaa50ca32b9415c0819b9adc919d6471ae9317f9a60eb5004afa29d67386b6b9524bda06791054b1d34e31ccbe160a56c315f44b76
 EBUILD maxitest-2.8.0.ebuild 1320 BLAKE2B dfc9156672e8da6105f8b0ffe97c99b144b785e7638e3d31c80a58c8f9e8d158c55e160b6bba4933145f0402334d533fb60ec249726d47e7c8afdb82693d25a5 SHA512 326bd8314fd511ed80684b55996cadcd745344163169a1f5a025682b538679b9f31e4f3b5bf6f6bea4c04427285c6292f03518c28f5b1112659b5be7fe2a7618
 EBUILD maxitest-3.0.1.ebuild 1314 BLAKE2B df8c3bc52a80394b51af34f412e419e715b2d40fb13a43f660c125eb78553a675948abe6928c96b7db7488508be3e22240038fe2cff42e28a741ff80e1153f56 SHA512 cfc7e19b333dcf409c7166ad7dc72364e16c7fa5e61d806010712342aea824805a4cbd0bd72d21bff50137ac9c63fd2b8cf9e9d54becaa0a8d6070a8f0f32d11
-EBUILD maxitest-3.1.0.ebuild 1314 BLAKE2B df8c3bc52a80394b51af34f412e419e715b2d40fb13a43f660c125eb78553a675948abe6928c96b7db7488508be3e22240038fe2cff42e28a741ff80e1153f56 SHA512 cfc7e19b333dcf409c7166ad7dc72364e16c7fa5e61d806010712342aea824805a4cbd0bd72d21bff50137ac9c63fd2b8cf9e9d54becaa0a8d6070a8f0f32d11
+EBUILD maxitest-3.1.0.ebuild 1318 BLAKE2B 56b09dfc2bf264dae7b44a06957ff857e0d0fcab9ec823012053397444c87864531abbcf9d3013f7654ca5fb19d2989f354ddfc42b09313acdbfdfb6fef1934b SHA512 c9f75b6d64dc1877d4ecdfa6576b4622da818b7e24fb7d612a0e3af397f764a9015a15d6f4e4de819958926a861faec23cd811c284f6e63cd4a0c78a987f6362
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-3.1.0.ebuild b/dev-ruby/maxitest/maxitest-3.1.0.ebuild
index e82293c8bdc0..03975a3bfdcc 100644
--- a/dev-ruby/maxitest/maxitest-3.1.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.1.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="Readme.md"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index c62e74547a07..7f4be4cd1d75 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,7 +2,7 @@ DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc2
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
-EBUILD minitest-4.7.5-r2.ebuild 956 BLAKE2B 9b87ede8aeb7dde79d22f32fa115a5749f247bd0c3812abb3033781a6e7c3651ae5c713fb8c49cce716b9bcbd8ea33f4ff97ee2bec0aa53b570f30631b878f1d SHA512 e550453f60141176e51155d8d86828e52efc6377a007ad48fb8000c63f64c8dc3fd4202dddca7373373c122208633bf2a271daabbc2f88445423fe4a86edc63e
+EBUILD minitest-4.7.5-r2.ebuild 955 BLAKE2B dcd64317feb08e4b441a891a79fad848def62853396048cb7f370026007cafcf65779861d1aa69f18030d64be9d2415233b5cbce05bb63de182f23d51848bae0 SHA512 0ab36a392c33a6dbfad0e37eb3a87e319f96c28c6b0fcb60904ec03e6169cb11a6fba7eb13b18a2e4e58ba703263c45b689cc00c540f7ef7d0a862a3a7f8362f
 EBUILD minitest-5.10.3.ebuild 793 BLAKE2B 711eb5c2dad734877c502f315301063ee166f7e5a1e6ff2a8c69019bfa7c007e05f4bf0696b395366ce33e1501fb0792bc58fe6ca4b6389b1b5c91bf849fee25 SHA512 88b8d031915cc635d56b204ae17c91a250ab4e348987d32b915bf366d7d6d9273a9157d4da0e77c4031c90c2511d14788ca81da30a7350b023e57f9e26a9f74d
 EBUILD minitest-5.11.3.ebuild 803 BLAKE2B 380c43d42c329e39793f114e712a872785ec06e37428ea512242a5f6a6acefde1da4c6488a73a28d01366673de094ba45526e77a76d0e14d4759b4795d11b2d4 SHA512 6c28df398cd127ca397e371cc3cd6684dc4b922b9374bf12ba8685f59995f924644b3c7c574d3e9898642f0e00960277f9f081723b5efc964c680fa6c690f69a
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index 7e172ef5b7ac..62c84667d453 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-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=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 47c16add2809..dfa96aee8aa4 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,5 +1,5 @@
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
 DIST mustermann-1.0.3.gem 51712 BLAKE2B 03672295ec33dd5320a40a2c5e5f78ca83a055f73e1f2f8b127f13cd04e0ce5f7bf34eba68f49e253c209db4e169b2a51dd21541d86debca0797b3dc2b3670d9 SHA512 776ad3f24e1165155def04a6e1ff18ccaf536606dafc3fa19b8b2c2576cd316eaa9b72cac37bc6ede3c48c7ed6c90e99a4388f60cdeaef0bca461e9caa4bb4f5
-EBUILD mustermann-1.0.2.ebuild 534 BLAKE2B 6a5bff5ae07062702aaa74ef0ea40b370a107782d678c6394fb92d34d66f8d7e233311fe95dccf14f4221d85a156bdcf5be352a0acbf19ca1e68a0e70913bf12 SHA512 2fb1737b3b5d4db3b192859af706cced0e0c4f9fde974b06bc952134693fb67d4eced5d3d9b67840dcf56278b845cbffd53f8af3fff8c2a04195519dcc4411c6
-EBUILD mustermann-1.0.3.ebuild 534 BLAKE2B 759d5c84a596663825e5ac3482c366814c31755440d4234a3d09385ac9acc3351c3ea2c61818512d47da40ebfd1891e5adae803071fa2ce1ab6b6f3eb6090dba SHA512 74b63509d66996becbc857126e55b3c893400f1f0ad4f7057f20d30107dac670e35fdb01611f07fcf7be767abfab0c8cfdefc9d5753abffa486c19d1b647372c
+EBUILD mustermann-1.0.2.ebuild 540 BLAKE2B 94705959a1ca2bb0be066c519179e954b8de91fb5da27fa9b4b3103e00ea8bb182aa7d03f89f7eceaa202254d9f480d30fca097102582ff126f27ca61b1ec652 SHA512 4c8a5edcaa07846efd9cfa644d6fe6906cf5e0e2f1e083f9c6e5f713cf7f03a498e4c1fb4e4d8b1cc7c20f5aa1f3a31a2ae757e2572d1616e3834db435f18056
+EBUILD mustermann-1.0.3.ebuild 540 BLAKE2B c243c7dc1358102cce7d768a09e6c5e458c4130f14472b37ecbaa0b7463bb7e45d5833b34e7e99802e476b4c0f9e3f9a1b49fc329d016fc67909b209bb9e6d29 SHA512 be305423e1690f92f0eb745140a6e985b07a6a685c3b43a1254e408c4cd5668ba5489727ea7b6e7637afa1f99747167d2cec9f83b42f459ce52aec620f373415
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.2.ebuild b/dev-ruby/mustermann/mustermann-1.0.2.ebuild
index 2ee4055641dc..f81bf2944513 100644
--- a/dev-ruby/mustermann/mustermann-1.0.2.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.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
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/mustermann/mustermann-1.0.3.ebuild b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
index f9c833d1ab34..9a67e49a335b 100644
--- a/dev-ruby/mustermann/mustermann-1.0.3.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 521191426bbc..2ba8a32171fa 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -3,9 +3,9 @@ DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db
 DIST mysql2-0.5.1.gem 99328 BLAKE2B 1ed8d9688a78ee30f3f7b7a71317cbe92b39e2a1b6f9db710a328a4b9542ffcff4be9051c5fa440bbb93c1af56742755e4b70bbff895695102c126293b7d7ad7 SHA512 dd1934e4f8aa8a97b70dbe0f1436496892a155fa188930321e776d57ec72ec34f95f2665ad5db671fdba99304e279aa8a045dbc6126ab50d8cc2d84838bc145b
 DIST mysql2-0.5.2.gem 99328 BLAKE2B 0f1a0d4657e5933e14d445ceefc6ff605a8b07bc01686dd0a67e018c45857a92d25914e4f0aae1116ed1479583636cdbca2aaeb127b856b38052264d579991bf SHA512 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566
 EBUILD mysql2-0.3.21.ebuild 878 BLAKE2B bca3c425b169f6ddeaf900476c2c8ad1dfa1c6faebeace43dc69765c5668d52ca9fa2efcd09d0fab2abbe679d7a59c9db8180226476fe9abc065a54a83180ba8 SHA512 44b798edf111cf335bcb7a489f8c854392c07fdd3ea3e96b7cb81bc6f00489a785a40833edbdea2ba8d0cfad6389211e0d1e5131ff58260f17c629530a62ef11
-EBUILD mysql2-0.4.10-r1.ebuild 1100 BLAKE2B 3faf6d4b910ece292fefffa0518b7809ba665ceb55ce5a4b4b1b08193dc9320a68c36362939153e62e310ab34996ad528da9f587163200cbea2ce8689cbfe149 SHA512 14e0835ffd137e26cb7157a380932a99359fd7003f8e314f2b846d559a47e25966f129440bf64ad735d2773d8044044f4382dbee89c8dfad6ee55611577a032f
+EBUILD mysql2-0.4.10-r1.ebuild 1104 BLAKE2B 55d46ff7b0a94d0553f618015d31a4ea640150fd6c7166858edd261e9a3a9f84eb308f0f7004db5658a4f83a090374643fb3077dd6a7209175cd244fe3ed5856 SHA512 a9d322091cfe2ff701f51b0c2b43a8e41de8411956bf19ac55be49ced9b744668f17c83ecef8196174781c63467ea03b3212d22ae9e21239a337a779fc26df4c
 EBUILD mysql2-0.4.10.ebuild 871 BLAKE2B 80eaa8d0541ab2ab4a2483e8779eb0ae3d6b9929be09b64f389d51dbaf13f2b98301dec8e41cec48d26c0a06375d2e1592c848cd57b252ad5351166b48228200 SHA512 f385ef153b9c0cef750687eb9bd772c0044c88cf85c60f359dbabfeec9b92be59c60503b9acb0d76e86efc25e878dbb5815ed1648fec9f44a5d9b1ca304fec4c
 EBUILD mysql2-0.5.1.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
-EBUILD mysql2-0.5.2-r1.ebuild 1102 BLAKE2B 32b20e40969d6ef5f448c6250a382360811ad695a078819a021362dd91746bb1e9c650df64229790dd0a10c3826bab893c3f8fc368505508ea225d196bac5488 SHA512 becb37f9a6f0ad589485b8939f1092f90dd5723f251985f2efe1e82c5134c5a48c9fe87386e727d99cbd24994bebf27d390793a9d8c2003860ef3d28602a5097
+EBUILD mysql2-0.5.2-r1.ebuild 1106 BLAKE2B 0ddae463bbebec7f657143730351a171215dc2d79eb95d7fb6ae06d9f5909ef56f1ab068b6eda8796619c9201d1c9081fdfb08bd9451f56c43441ba05b2a8088 SHA512 3a162d11cc6711db46aac18cc4c61cb56a00b7577fa01f609d173da2575867e67f63fcd80105c9dda48ed013f3ffcd1990c36ca7bb58fc3338403863a307d2b2
 EBUILD mysql2-0.5.2.ebuild 864 BLAKE2B 0b11d1fbbf05babce69c0b7ffbaa363a97b8e5961c844de072cb83185b3824e51ce78a2adfe003e9cbd5563d151839ea428f60b2eee80636897051a297b45123 SHA512 c03098a3bcd4b9a73a45ddfb922af6caac8535bb6430091db5cfe2100e4f4a1c0af6e0e4c3979ddbc885f5c9e7c50c0aa9f54b7aaab24defe86bd3f731ef1413
 MISC metadata.xml 413 BLAKE2B 1fdeec661490aaea22676fa4af618fd6458c8bf67c61ea0233f1c68629e89cfdb5f8c29572b9d75c4dc010b1a774b0c703fb6ef4cce1e3e1649452ac0e0aac75 SHA512 1e2e76b14e8c3b44693f0a1d9f83d8b1c95f4eb65490c914fc925fafcfda58fab2764c8b54a87a8e347d53ddb8ce9ce6ca2a08564c97bddae0d0cba0719dfb73
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
index bdeffdfd19b9..b8a1d8aabe2d 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.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"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
index a0b5b7bc3cc9..19aef24fd2cf 100644
--- a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r1.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"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/nagios/Manifest b/dev-ruby/nagios/Manifest
index 46f1cfee973f..c30483be83c0 100644
--- a/dev-ruby/nagios/Manifest
+++ b/dev-ruby/nagios/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-0.0.4.gem 6144 BLAKE2B f4ffbffcc5b934a3cdd987e86cb52aedce386ae1ce1de753f8f0503a64267245ce43ab42abdfbb662db0b933e80029f4c875afcfab222eb2be4c74c80903ca70 SHA512 7903e3f02deaa0e8f7c5e5b9b09afc5a1907c7c3a3157f6b100add3b9461ddca36cb442a3465124be3e65dae2112caaaca089e82d7dda41d31813c2963553ec2
-EBUILD nagios-0.0.4-r1.ebuild 445 BLAKE2B 591f051f517fe2d6c4507db2be8300d6d1f8013662af0ae85c945d50d7e6bd753b1299744a5dfd38983b809e5967d7678af9b4af7b8e50d881382b391517bd16 SHA512 ce25ede5a222a7283d7b14bbcda44336de43c9790fc307c5833251f71142722a6d2a8697077dc62ea14b5d1bc40af70a41228b136946a604303405fb4f4ed26e
+EBUILD nagios-0.0.4-r1.ebuild 442 BLAKE2B c8d3ee561a5b878602deff828518ebb8fa791f9360f2f5201c07b2797db931a211deb6992430cebabb62278284a70bcccde98d727951ecd1c7099fe56e61246f SHA512 0fbc9a1eaf567477153f840e76adfa97bb617c11cd59acb12239c1043d5d5f57a4a5fb28e5a2ae5c0b0eb1ba790055c4cd0ecee83aae7fb1bc1780d21d7674e3
 MISC metadata.xml 347 BLAKE2B 94f5b95fc2d3a5faff0df8f45a5ca800deafe91ffbb3a70944e5d1d5b83d641c6e2ff9aa1ab7d05aaa8c4a2a0992806fe4b094a87188b9e236762f2faa9f336d SHA512 93628fab7fc3d8babab1b9b4011d0f5ac308a38b94adc7239f9e8c61fa30c79dd155d412cb1f53efb14e12c73217d161bef9ac0a4971b624294d0af7649ba730
diff --git a/dev-ruby/nagios/nagios-0.0.4-r1.ebuild b/dev-ruby/nagios/nagios-0.0.4-r1.ebuild
index 29c1ebbbc4e2..52f7f277daf8 100644
--- a/dev-ruby/nagios/nagios-0.0.4-r1.ebuild
+++ b/dev-ruby/nagios/nagios-0.0.4-r1.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_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/nagios_analyzer/Manifest b/dev-ruby/nagios_analyzer/Manifest
index f7408b6dce43..a84d75b994db 100644
--- a/dev-ruby/nagios_analyzer/Manifest
+++ b/dev-ruby/nagios_analyzer/Manifest
@@ -1,3 +1,3 @@
 DIST nagios_analyzer-0.0.5.gem 11264 BLAKE2B 16e90e269f73e7f717fcde574fd729efd0ab5a0c1892ffe1692e5bb0c87ed6e6909f45381d8021b24540ef3f99d80d9564c37476bbbba7ed11743616b065c6b0 SHA512 052ad107bf39d35b0c21392f4d5905ddcf009e3fa4b780706c23b9d6a45bf6a7b0a64dad596c8a32aedb332ee069f062c30b47479289569fb5f13b5705b03303
-EBUILD nagios_analyzer-0.0.5-r1.ebuild 438 BLAKE2B 6d8f4b0e3a87d3cd7fe0e210c5616297e506115cb9ca3b571d9c2c899ae22285385033dde15af742fe510e116613230f3997053d466e9194c0610dd917f1501e SHA512 38d63408c14e58293cbaef687171bbdd4a282c83d5140afa03322f1055cd4ebccdf6481d4408a564284db5fd2fa61c8589086bc7e4867cdc1fb6a0eb04f3905a
+EBUILD nagios_analyzer-0.0.5-r1.ebuild 442 BLAKE2B 4a3277a52d24d60136f7bdf13478728c36eacee1bc53a31d455004ab9af68045db39e7122fd859214893c4cabbf84a9a73e80bdfc4dfc85cca83ff143a6e678a SHA512 7b045e7d537d81b9f20a1cb4389c0e84793f32d9d145519a26fd49fee6a81ba6fa23cfb8ee3adcf8dbe049d91e71d0f191caa1ba59e1cb82cba39c065729a28d
 MISC metadata.xml 349 BLAKE2B b88a4828c225866c45ceb229b2f35956a16697e643404534e059db193440402561746ab56e5c50df43f413759a889f0c9e1ffe7cc4a017451b02bab72b1c69cc SHA512 3320e8d3b105a506254e3934a2bc29c816d1576d7f65396c7d44c709eedf4885d75ee4aac4bc050a231cff5cf6ebf6cee8b80a57d084436d1fc9f3c726c0d976
diff --git a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
index 800d7e25dbbe..28d52b0cceb6 100644
--- a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
+++ b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.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/narray/Manifest b/dev-ruby/narray/Manifest
index 8e7c08779552..675624dcd284 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,3 +1,3 @@
 DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
-EBUILD narray-0.6.1.2.ebuild 1289 BLAKE2B 8e100bbd20351ca5b973696d76c247c52c14a7eb4ae80037fc91093e109af3b2f90930d3a353ad24596a8828972582a7ea1d80baa026193058b010446992caf3 SHA512 b0368cbc286bc0b3437dd33f1d2145067b58942950531ee93d3a344439155d45d6e11edd772b66d677166b256631ea42756b1b26233a16841296ecfcac09ee4e
+EBUILD narray-0.6.1.2.ebuild 1286 BLAKE2B e7d9d9c5445699ed89d5548e0f27c1c56308b261969c2846e45565ca6df027321db1a53c75ce4ba74f859060e62cd1620093016a4bf8294df7f49a71960a0030 SHA512 cf124bb3831b6a20fe6d6c2560b567e35cd68a8e4079f56432ed7108d1aeece60a43e0fe3d0897d725558eb6314ee92edfb9f7f9fc91c58195013a6a167e3eda
 MISC metadata.xml 339 BLAKE2B 9337a45d749879673fc180a12d5e7d27326fdfcf326f86ccc45fc2ad10b7eff1c4575c1379fb6b634f1482b7adb40531f78cc0b556148fdd622b9807e11122b6 SHA512 47c9372c3fa2a28f5d728cd9d3df7b030c2e0bb2378099c287018cd55324a188eb2ef8c901b52acfd87d278c4990752a4860a7281e062f4209bf92c10bdc36e2
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index eeb30014535e..8972cc9b257f 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-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/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index d63ac4441604..2c1f4f74e773 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,3 +1,3 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
-EBUILD net-http-digest_auth-1.4.1.ebuild 607 BLAKE2B 346d197291d33ad5972d61885caeb8a3661f6d28c769b216831a3481c5021902516b03c75513a3686bca9b441de76f5f3d23d0e32e2db5d6e3ca5982329d9ea6 SHA512 bdc0b67df6968f4be499d7f6a66c7cc3571c0c6cd25eb3ea74de715ff0a9d88689c5c7dd54a62f2cb632094f924d5a92e338971d2e8f15e1dd014844e190679d
+EBUILD net-http-digest_auth-1.4.1.ebuild 684 BLAKE2B 2f9ca9df17d81b392fa3c7b6aff5212a30f773c2972dd2a178dcc9a341e75782c83048c121e2c9d1a8317f810c7e4363bf0d261108c0484786e6d00720f2e559 SHA512 6a3eddb3e83b83cbe61d9a8ce7a355bb8da8a53f8759492737f99b4edda594adb4a158917fb71a4c45b3f6f136ad68aaea6938b8ffd6cda48fa8b06f8e2516f9
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
index a546d33b4899..2337b056f830 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.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=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -20,4 +20,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-http-pipeline/Manifest b/dev-ruby/net-http-pipeline/Manifest
index fdae44f9cd95..8c23ed3acebe 100644
--- a/dev-ruby/net-http-pipeline/Manifest
+++ b/dev-ruby/net-http-pipeline/Manifest
@@ -1,4 +1,4 @@
 AUX net-http-pipeline-accept-encoding.patch 654 BLAKE2B 11d1ecba6b2895ba4c3ae7408ef0bc3bbd5266885ab519090c172ff27c8dbb4e9adc2c90d8a03ea24e1e68043431e26236c9a1c6f939ad5f693815b2069e0183 SHA512 43c6382f01538faaedc38047d6099d26c6d91805c45eddd043fba0e98b4331fa42a2826ea8a3216ddd5ab047b37e8a7ce1ba4c52b9ed5c0c645a5483d2cd1931
 DIST net-http-pipeline-1.0.1.gem 12800 BLAKE2B ed36d871544ec203ba6d72e864aca4ecfd6e975eb5d2d29a0c1f785ba7422734824535c2a30e36d1f031c2863ac4036f103d94eeeae00a8f6905354020d713e4 SHA512 1377c20038176f6c246a7d4adbce2c6972970d730902f9faefc31b2f6446f4237603f45f0f59de70eb9545e3c1e150fe6e63cf350551203166611bef7845f4e2
-EBUILD net-http-pipeline-1.0.1.ebuild 492 BLAKE2B 53235fce1ee412819b3a4f095c642b79313ffef0f3f962749302134a77ee4382abe393c78e11811b70ac43f2443abddd44983bf59eeac6ef96086fd2e32b16b1 SHA512 6c029d376538e911e02d866200416a07311b26e74528bf557b76ad247a9dc156a66a71cab317e86374faa079dbed908dc3d2c3a83350cc3de73240e5dec1f8c4
+EBUILD net-http-pipeline-1.0.1.ebuild 568 BLAKE2B 94a0e1ea8b6d37f8e1323ee74ff61f1d5eeab7bbaed37a477220f839e7957db2de52acc77ac0bf4bed31035346baf3f4e681c6fc6452e6202384e0410f29f43c SHA512 68647ac30f179014b32ddc60e4d78c80982f4696b47b1d4e8e3d36f88d497c908235642d05b901c8b453e60c701792dcbbf044997a18be8a4c9ef4c201662bed
 MISC metadata.xml 341 BLAKE2B decbae5c640bf76dcbee55de227dae7b7cbce0069e7200bf535a7406cc23b01c9d3965aeea69b6c30a3e40efd41b76e411e42c3d2d0c7b8619a08f9d50258bdf SHA512 4c7d03fb0f0d3fd52fae9413a204cab1aeb6e1975fc124c54faa1e3905bc15c6740207c3234747a27153700a9b4fd9e32f5e994248c1f540aef336cefa4c594e
diff --git a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
index a8ecd68283ff..0f4ded070376 100644
--- a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
+++ b/dev-ruby/net-http-pipeline/net-http-pipeline-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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 inherit ruby-fakegem
@@ -18,6 +18,9 @@ IUSE=""
 RUBY_PATCHES=( ${PN}-accept-encoding.patch )
 
 ruby_add_bdepend "
-	dev-ruby/hoe
 	test? ( dev-ruby/minitest )
 "
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index 0d3e50e9d516..72d69157ef41 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -1,5 +1,5 @@
 DIST net-ssh-gateway-1.3.0.tar.gz 7735 BLAKE2B bcf9b96e35377e8650e8c40fb28d248fc60f7c47e69657c324f58bf8f001f5d10400b983bcbe9529185b74de45a9f3e3f62e2bd14da46b6e4b1bf94f38dcf99a SHA512 6cac1b28fba648aa333824c056cf8183fedc82f45f7f380eceac7aa5a4e8c3d3ec0870915aa058b0500514cdc364d75045050e2f8fa6f0ddaf799b88ba2e57a9
 DIST net-ssh-gateway-2.0.0.tar.gz 7825 BLAKE2B 05ade5aac288ee634aea37acfc68c9781e8178bf0ef92abafac13858a86ff952a2b30b6f92dc08f3856d9dd02a9795e0b93c15543b932070b9ec3f6a50c03e52 SHA512 6595c2a2a25ca9bffb942497be984773c10746f34e1dbba3d72503cef3c88e5bb50bdc8713c246aa6e38272540fb0ced66a3909bc02df96f511b0dc9fc50d735
 EBUILD net-ssh-gateway-1.3.0.ebuild 840 BLAKE2B efee02d9a6ebd856ef3daad37bb300ffd991f39acbb70ad5628532859adb81d4f1a5f6379d28b591a6ef4780a043f23d7a687ef521fe3f62aacb69bdcd1cf1ab SHA512 ff93ade218f0b19264b93fcb93baed581c2d727a9e02bc56f306adff4861ba993631c6ee605720e64adb36946ee897510dea3f57ae89fd27e94fc43f78088c3c
-EBUILD net-ssh-gateway-2.0.0.ebuild 752 BLAKE2B 7e15cbcfb357094628a8eb203925679687532b0e96e91f915a4366b27912fdf2c50b16cbcd73373cb9520eb04a8d56e3bb04fdb38f93c3f912fb26417bd99bb7 SHA512 e4dcde9b7b3907f21885c916600f686b7388cd30b7a5ba0f4663f5a01d6597c8dfb5d85645b4a0bed6c84cade81851fc3e06b654e06248a5d8e3cfed7a22797b
+EBUILD net-ssh-gateway-2.0.0.ebuild 756 BLAKE2B 43851481329fbab8f9fac30a9756dd22bd10548147becd78eca1ace6ef6b0a0a43050a49e9a9b68c68a9faee6452bc72ea861536e7f0f117eda9780d0dded9f3 SHA512 d876f2e11bf9dee4a6f38c926777900e8cd39ec8a141c8dbfbd59d6fc72da9a06da797a58274361097eff7204f23b18e68902adb3f0bfe6253dffc04fd8d78a4
 MISC metadata.xml 331 BLAKE2B 1c926dbb5b9903bf35a96b839b8564de448a527cac952fa91c5df4c0df4f825eefc7a6bc1cac6c7da39a3127a2a0245b5e3b7d780009c3069bd72723f74c291e SHA512 a5ba1172a48f9aff250cb3cb9c6315a0ffd12595704a2bd5788ef59e73b9efc606d8d944ecc0f1346340a4a9e1caee2c6a1c30581d5d6a78bc26c751d4c6cf7e
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
index 31123781c956..3dc9887b9638 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.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="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index 66537e077785..bfe67b76b969 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,3 +1,3 @@
 DIST netrc-0.11.0.gem 10752 BLAKE2B 40f78989c7b58b726c1f83ea7032eace74c11776b006a2f5fc9459134224cad6129b370d6da4bcdef540d75504da6d5ca5a1d6bab9c1ab8a2620b22c3933be20 SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a
-EBUILD netrc-0.11.0.ebuild 766 BLAKE2B 0e128c8f567388d0cf80b74b870edd1cc4f23ee0f07036b5dbecb4db27d7fbac5c3aa09f79f50e73360809dce6878c4efb260224c8a7a71513f91d68e2ed8556 SHA512 4ddb5d0e72ef67791ba7ffbbca8c249c1c15a5ffc73bd8fcf48c2edf87cf1351573495f68d2039d73558896ac7cafeb26ae4866eb7d78f92555bf14a921927e5
+EBUILD netrc-0.11.0.ebuild 763 BLAKE2B 015b7728bb136fed0490125c8d9e2112cc32e6fdf76390751b2a14df458bab2d67f12a8bb4b6f1899b47f7bdfcb2db8c0ac234f8fad3783dc87ff2d3b90c74bc SHA512 334e85350414eacbe21507543d4042b0eef4e2eed0513f8ac310c139f25ebd5327454e4d6255d08869cb71fbbfffb966e6aa3a94c124df9c807d37f1d9644231
 MISC metadata.xml 338 BLAKE2B fd877d1b2970baa820f621e7e80e39b4ea8bb996e01e7c5e34355c0c383ce7207a8c8c5b1ea4a75be4a677cbf75e61dbda9df88a41aa7aaea931cd1ba0cf351c SHA512 db880221f96281decc8c389d944bb9a8cced54f2ba173d470efaa1bcf7d1f45598e1fe8b0b1beadfe25ec34ce6fe81adbbfa4d210a7257741d1b367a8d9e0af2
diff --git a/dev-ruby/netrc/netrc-0.11.0.ebuild b/dev-ruby/netrc/netrc-0.11.0.ebuild
index a2304ca9756d..c76c9950e2a2 100644
--- a/dev-ruby/netrc/netrc-0.11.0.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
 
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index b5b8915fe128..a341f3c59379 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,3 +1,3 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
-EBUILD network_interface-0.0.2.ebuild 819 BLAKE2B 9aa2193311e08ba37d53b5fdeee9916b6a01d8daea17d02aebdeb7d9359c39408e6efeaeb1ebcb4010bd5cc25d693d2aba2b8a7a06868c1c0c389e70a73062c5 SHA512 a610ce252167f143f7b1cba47544d465d68924dff453197e942122cfac32a9920654552808721ab34160cbd97a10fb2b93262f9b5a8ad3157c88ec742b331bbd
+EBUILD network_interface-0.0.2.ebuild 823 BLAKE2B 70f558fe871ad0e76f2709b5388dc1b43ca10d5d37511999a66c2ff39cd6802d25dd3c1a737df5a7eaa2f78be34d47a482812a770bd887c1df4086aded5cd642 SHA512 5e6d50ffe4b2ff4acb14e7af51a3ebec85cc9b75892220dc23f20902584cf32380c7e08abce31d1ad28f78b3c86a0e828c2cbaf226c970b7c6c2384af14e3ace
 MISC metadata.xml 346 BLAKE2B 37363f8c2d49a4d275b002b7e6664297dbd560cd2cffad001ec194e2181b302b68c3821cc1ce94bb708a0dde94342276a0013decb385667804cbbd44116b521e SHA512 4d29ede04b6944c1456d1309122fcbc42df1909aa8690bc767bce69749ec8bfcaa08cc51e6f686adb02d81b0eef39a4c78744d06ea130c4f55f66eba8a47cb57
diff --git a/dev-ruby/network_interface/network_interface-0.0.2.ebuild b/dev-ruby/network_interface/network_interface-0.0.2.ebuild
index 619438aba6d8..cdf61eb691fd 100644
--- a/dev-ruby/network_interface/network_interface-0.0.2.ebuild
+++ b/dev-ruby/network_interface/network_interface-0.0.2.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=""
 
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index 66586c053422..93ba46745295 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,9 +1,5 @@
 DIST nio4r-1.2.1.gem 94208 BLAKE2B 229c1c690004444a6701ad765af26e592b9dbdb3646f155dc2114ea677b40097c0158c615efb25506c2ae59316e4ecdd7ec8747bf4f18a3ec2ca1be6bf028b85 SHA512 3136863955bd6f4d489955bae9baf2fb527447c0e71dade1a05402f3e7c8570bf1dd9b8335d70d7303ec4df0a236b13e4ede74ce9154be00a108afcd7c6b7f40
-DIST nio4r-2.2.0.gem 101888 BLAKE2B b860169c4fd4b3747af5327554b808c74585f509b69664da3da1558487a2f0119b9d1b56718c5301a13b4b4ccf8a55a8b661900d8992f40a8128ddbc638b0d87 SHA512 9a9acaede13da07894edb7012f593bd2132296f2130cc2529cfbbad421aaa1e7b144403c9812e6ac8429cf6bb9e8c7e746acd86f2061dedf4cc14fb10fdaa7fe
-DIST nio4r-2.3.0.gem 101888 BLAKE2B f2f3d1c962ae875ad68e5c4acd91b738a2a094f13293903ab1d65e6d2b32537bf624ccbf2524b897b9b3f1c4ac4161dc1f1758c267ed776a0b35f3dd3a994833 SHA512 266cb1cfbf62a0cdb130ccf7defa3f7142f1ddc4a45b6364197250abaa857b7177074eb7643bc9e005b30aa114c4337059092125734a3f13f3646a315eff2698
 DIST nio4r-2.3.1.gem 101888 BLAKE2B 1891581eaa8659ed86f13e365664974ea55921e0107b7ce9757961cebe27f290995e90c17d375b35cf15245856c7c1d61fd05a332dc09032fffc1599bc2474ab SHA512 6e8fbc744f17b42a0a5c9f8f6db79ce3c9c0dbf6cb047f0b48faab813effc9f5dabe7405475a755bea9f0eb49037f6f26bdc6b8ff3fc7ab3bca61fc238e4eb6d
 EBUILD nio4r-1.2.1-r1.ebuild 1009 BLAKE2B 1e03d4b0f3fdb2643ef903fb78872a4e050b2ee7a76f21a25ac0070351487b94dd7bb423302c352372098828b7e8015b8852a93fd4fdec55401dd9a4898dd0a1 SHA512 bfac422750ae73a1c5046659b007e22d486165992fdc1ac73f0c68b0c4cd4c219c7a51573beb1fc9cb7440b09074927a581018420cdc18bd13d05c89414f7c22
-EBUILD nio4r-2.2.0.ebuild 1047 BLAKE2B 3b887eccedf0a04ced4a842ea505f3a944d742130814957b5eb70d9d32802ae9be6bf8e9464c1f53215ee08d9bdc82ce53fe2b889136902fdc60b2909f6c85fc SHA512 402a2a497dafdafb6b56f0e6659075b6a66fa1b2bfd0678bdc990449a24381954edb73359f9b55856d0de15a58d6730f26a80dbf7a95cbd34be1e187fa9bd0b1
-EBUILD nio4r-2.3.0.ebuild 1059 BLAKE2B e69c0d2447b3b19116910540daa59a35c719249cec1664fbf168167f518a20cb86caae0b445a808d584421464a0b8229315f56fbdb748dde229d36f0902e505c SHA512 8f79fec77c9181c58befe5f07aaeb5de6a30ea6a8d926b389aef998af6c862d7290e2fa3db6fd0994d85c0193af30736bbd21237c5dbdec662698afc6b675bbd
-EBUILD nio4r-2.3.1.ebuild 1059 BLAKE2B e69c0d2447b3b19116910540daa59a35c719249cec1664fbf168167f518a20cb86caae0b445a808d584421464a0b8229315f56fbdb748dde229d36f0902e505c SHA512 8f79fec77c9181c58befe5f07aaeb5de6a30ea6a8d926b389aef998af6c862d7290e2fa3db6fd0994d85c0193af30736bbd21237c5dbdec662698afc6b675bbd
+EBUILD nio4r-2.3.1.ebuild 1056 BLAKE2B 075fb456e4532098a0460fbb926410c1b74e9aa97f1ef8f93679424af4139d44f0e19ba78a529361ebe99071f98308595f21ce90b021959fd18b741c9fc83745 SHA512 ea1cc25b6b71030eecfccefdb4f84fc9b6c911f8a52844c179ad4096e8fa581a34590df586d21be7100e1d2b22ce005ec3dcfc477fe0648ef9fff4ab22ca1212
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.2.0.ebuild b/dev-ruby/nio4r/nio4r-2.2.0.ebuild
deleted file mode 100644
index dfeaffaeab53..000000000000
--- a/dev-ruby/nio4r/nio4r-2.2.0.ebuild
+++ /dev/null
@@ -1,40 +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="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/socketry/nio4r"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
-	sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/nio4r/nio4r-2.3.0.ebuild b/dev-ruby/nio4r/nio4r-2.3.0.ebuild
deleted file mode 100644
index c894fe28db5f..000000000000
--- a/dev-ruby/nio4r/nio4r-2.3.0.ebuild
+++ /dev/null
@@ -1,40 +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_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/socketry/nio4r"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
-	sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/nio4r/nio4r-2.3.1.ebuild b/dev-ruby/nio4r/nio4r-2.3.1.ebuild
index c894fe28db5f..823f0b88dc1c 100644
--- a/dev-ruby/nio4r/nio4r-2.3.1.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.3.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 57c5486efa68..e36dd6ab9430 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,5 +1,3 @@
-DIST nokogumbo-1.4.13.gem 228352 BLAKE2B 60e85f1cadc2c8b98d067c9bf0f651057e709f204d7ffa7759ec68090b816e8b17a0d12dce4a5d6f6efd372c931f75ef54c439a5496d0fe696edd8795488cd8f SHA512 369743cab4a4bd3ffa5eee4f46074099afd253b66ef5ef9303b79d5e5ce1375f33b73916f1712e256044a00335bdb6595f2ce028e02169607252f32dd9dff9b0
 DIST nokogumbo-1.5.0.gem 228352 BLAKE2B 66740dfb9bd9edea13c6bc872e1cadf855116ee7247c7691210d3eaa81ad4c7b972fe8edd02a6f7ade6c172c870923c9af3fc24b10c5594cd0255b2fa0c2cd82 SHA512 a89ec7ae4d42cce5431070e790f0f10734655654f6f680c0b949fab7527b6a811953f1c3c13d633427b40980f9e9bd434a9afe1a9d1f1e504af05246d96be77e
-EBUILD nokogumbo-1.4.13.ebuild 1054 BLAKE2B 73131a9d95d413af0cfd94c2f06490291cf03bdd0762f4362fa6278c4f706c563964d95755180921967930524b4538e6132c7d3fc5b10557a89e6a4e10eb4715 SHA512 fa1347ba5cee32b12c7b7b7bb8b9e9a128d34aa4682f74ec3af3b1de6a503db238493d17cabd4316ad801c24ce80cf2c80a97dd8f02ae7419865c5c1aa9650df
-EBUILD nokogumbo-1.5.0.ebuild 1054 BLAKE2B 675fff0c77d75489a7199994ca1d00385c7add728582da386da32c960f523c535053b2d665504da657b37ea58a1c727affe1be69a0ac6535eede4ed3ef251959 SHA512 219f455755b8c1477347dd74c57f6c4bb75551bb6c4b2054f32257cb0985c1d7eefdb80b84793e21481b51e32827c77ef89e5939b169c7ee0a0f9b6ca66836cc
+EBUILD nokogumbo-1.5.0.ebuild 1051 BLAKE2B cfc715ccf04c018d79ca64835132aa4659c74eb58c1ccba4cb20910506150bda269c7b7dccdfbfd8e81b2f29ac4d94f104ec701b5340b28c755b9c7d979a28b8 SHA512 bca18039256e49ffdd12b4b7b2f76f374b48a00f41284359acea861055b423e39999c8a3eed0f696040ed54e0e842d14315baf2e94a333ad2182ca1f5fe872a8
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-1.4.13.ebuild b/dev-ruby/nokogumbo/nokogumbo-1.4.13.ebuild
deleted file mode 100644
index ec3ae6405f27..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-1.4.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=">=dev-libs/gumbo-0.10"
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.5-r1"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumboc/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/nokogumboc extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumboc/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -Cext/nokogumboc V=1
-	cp ext/nokogumboc/nokogumboc.so lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test-nokogumbo.rb || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-1.5.0.ebuild b/dev-ruby/nokogumbo/nokogumbo-1.5.0.ebuild
index 7ad6e455e8be..5f07eb3fc6c9 100644
--- a/dev-ruby/nokogumbo/nokogumbo-1.5.0.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-1.5.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=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/notify/Manifest b/dev-ruby/notify/Manifest
index 4e9950a3d8b0..56af70c5f12f 100644
--- a/dev-ruby/notify/Manifest
+++ b/dev-ruby/notify/Manifest
@@ -1,3 +1,3 @@
 DIST notify-0.5.2.gem 7168 BLAKE2B 2476cf4a3f174b5f1003e25782ae5bd3838ef1adcca7556f30c609d335ed707fddf1d41e3699ed85eaed54d548f8152bbc079c07538538d4c459e794a2d7c283 SHA512 f64ea5f265acc970f145e1c43e27d6608b1d90b8da6b7236c001808ab690ca302af501d08bda62e66b69434ef1940b6fa19faae3f9ef37c5cc9cebc4b5310564
-EBUILD notify-0.5.2-r1.ebuild 487 BLAKE2B cd61ad07b284f958792a598d81d840eb978bc953449234855bb867458a00ec6cb8a9cfad5f887da61550d14d2b2c34c4dd956bac3dbafa9ff0adfa20b65ceb3b SHA512 35ebdec01f2b93cf2b02edb270289f4f6e2df176e434d7b64ad852bc16b328d8dc5ff96526d8e3b506cf36fd23b9b3d80ffa195783fc7c87826608580586e703
+EBUILD notify-0.5.2-r1.ebuild 484 BLAKE2B b0403147fe2902f3e0f8c711e6381de73ef4df0067639012d834fe0224890351c488d57240008e71cdd74eb8bf8085218f7455e1d99bceb03e5f623f5483de9d SHA512 e7c08e19944215c4e18208df3038652eb9b1da2cf1a5c5517045140dbb411d340a6421f487da592fbdb0cd595d8852caf602e30759bdbd8b6b8f6dcb09bc5001
 MISC metadata.xml 419 BLAKE2B 2e0160a24e63a837ba30cc806a1223cabf79656305139d1c3e5dd1b7cbc6271a6922d96180067266803a4a0beca846d0102e85e9c68764435e50280718c49a41 SHA512 ab5bc078ef24913748d689e00961499fa446ebb2a715cbebec71aae2ec16532d5b51c352561d69b5c867b49a5e08ec5603956b6455724a595a3108cdcd869138
diff --git a/dev-ruby/notify/notify-0.5.2-r1.ebuild b/dev-ruby/notify/notify-0.5.2-r1.ebuild
index 7fc2cbab3270..9d77ec93ce5f 100644
--- a/dev-ruby/notify/notify-0.5.2-r1.ebuild
+++ b/dev-ruby/notify/notify-0.5.2-r1.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=""
 
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
index 000b76b953ae..050b6f248c7e 100644
--- a/dev-ruby/ntlm-http/Manifest
+++ b/dev-ruby/ntlm-http/Manifest
@@ -1,4 +1,4 @@
 AUX ntlm-http-0.1.1+ruby-1.9.patch 657 BLAKE2B 179668ac8377cb16485f934027dcec83faf2ad790f45b0382facc3fd25eb957a501099b346b1f9a7d1a90d96e96566cbd6307fd3868bb5702945a88da75785be SHA512 c1cf26169cfb7eb8e5759b143f49dd7eaa124cb9e22314e0d2d36c3128080e2dd85b84386ed219cd35e3022e1ba36926dff6ee603400362d8ad59bb627f3080a
 DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
-EBUILD ntlm-http-0.1.1-r2.ebuild 877 BLAKE2B 4a832847268e5f3340dcd3ac68452ba45e10fa267e4f7a5e23088399722df5b8c432dbeb7afa67616449094306d45347d9e46282603f31d8472b4a033aef76b0 SHA512 86a64aecbc29dfc62bb22e91c3447127c2a043f4b7c2b4d956165eefbe7cdb94fa70b8653d55777498b09502d19907805183dcba98c55d4317177fb5b894fbce
+EBUILD ntlm-http-0.1.1-r2.ebuild 874 BLAKE2B 3f0d3d64befda91ad6623ee166135c8c902085b810a9d12c07f0c3fa04e01efdbc003c0f450dd5c82f02cc5aa97d270a074b54c9be464113581aa96f41c73a44 SHA512 13d025bdc53c7d8dbe8147d436db891f35a19cc8ea9c82b5dd80eb94b7fe4bf397e5e41679a417ef2c1c6b08f0851bf9b1b00796e6c6a2e9b39802e27939cb77
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
index 7770578b87ab..005ceae39aa5 100644
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+++ b/dev-ruby/ntlm-http/ntlm-http-0.1.1-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=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest
index b442590f4e2b..90340dc00571 100644
--- a/dev-ruby/open4/Manifest
+++ b/dev-ruby/open4/Manifest
@@ -1,3 +1,3 @@
 DIST open4-1.3.4.gem 18944 BLAKE2B 00ef3139cbf6ae175aaa40526c105d39fdfb07c69f0a3aaf607feb799f0a8adac99cd5ea5caac29c884374af6591f4049b3888626c24b3d2371d4c0c9019cc7a SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-EBUILD open4-1.3.4.ebuild 675 BLAKE2B 3dbd4d1848fb8a9f168880a8776ed3f9f3386b3b8318b86f2aabcb75208b9d61d4d20b43aa0add38bf790057ecbbbb85e8aa8153387fa9c87adbe74f076910b6 SHA512 2e23f94390987327f1837aa643d6456d5fa2bd2e97baa8a51798010eaf09f68879917f2e5f4bf2ecc92be2b0c8374ba3401b86f257a0e320c23fdc189ed6bbf5
+EBUILD open4-1.3.4.ebuild 672 BLAKE2B 99ca7e99425a283befc3720010ad262c54357538c1e89807d52401cd510740081ef9259b00439afd09de32206cca5a156ce41ff1facb153582e8b3e0b01cde27 SHA512 732f18e227932dd507ce19070fac3349edd400dc3e27a1430a0778c302e0207bf043a3ff7cce35f2b51d013e83951df3410a9308972889c3df7659b79f36d445
 MISC metadata.xml 339 BLAKE2B 560d764d73e28f2679a134b33e3f281b678aa2cd53a0a271c646949fe1cd63a3d7399d33774888c8f3fd8cc55c44a5151629a8e376abc4d45f8b87f43bb9b8d9 SHA512 1a79e7584a1a8a3ca0df51e0b3f0631eb6a61f1aa529b464a15dc94abcd7de2385ce68f50db14b5041fcbec5b5d86d50d9584c524c43c89b3648f35caa23f1e1
diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild
index 2bba04258286..3a751a66106b 100644
--- a/dev-ruby/open4/open4-1.3.4.ebuild
+++ b/dev-ruby/open4/open4-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 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_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
diff --git a/dev-ruby/openvas-omp/Manifest b/dev-ruby/openvas-omp/Manifest
index 331c601c03e0..639c469cea0a 100644
--- a/dev-ruby/openvas-omp/Manifest
+++ b/dev-ruby/openvas-omp/Manifest
@@ -1,3 +1,3 @@
 DIST openvas-omp-0.0.4.gem 10752 BLAKE2B 866f04895551ecace2183b1125deb727083d1427e4326ad5123e660586e26af40632a8e68b0390720fc39449ff8c3143a25edf22d2e015c31697ce6c24464030 SHA512 cb62ec9e480ad009eb9f47cd4ac77d385b8d5855748509466e5227e9d729067b279c277d3d53f2de1a89cccba75bccdd1e23b7ae858adeb35e0958fdb004c0e1
-EBUILD openvas-omp-0.0.4.ebuild 493 BLAKE2B 4ae05ce5e29a0e7dbe2c0014aa8a9f82549f5e5438233ae2a36cdc1bc5341a7a75433251949581b27f8e3595ef63c34419aefabe5375d95daf40e8bfe869de53 SHA512 6d9aec613ddd0978c8a0dbd9f054d400abe462a82cd60455be67ea01dbbef3851a12f372e27359c6048bff5a24dc917b04394911e2951b096a4a7dc6bcca4ed7
+EBUILD openvas-omp-0.0.4.ebuild 490 BLAKE2B a6ac0ffc81f57f8adc949c867cdd2b7f33baa4b47974d070936b406b431c1338ad09bc41eee977c6995ed6290516ea08d227463dd16f5bab5eabefa6106ec8c9 SHA512 013bca2c27930413c883c6863f0519f05c13292c4dc95d91e34d70b979a479b46d885f263d50d9ddd06f22582a78fd26637a0732759714dd5e17c3968af51006
 MISC metadata.xml 398 BLAKE2B aed4b6bbd8d3130ddf96898287a699f10d2945748e2b3c3f8e6937d20644555cf0d5c64cca607032ba6b5ff98bcad6e335557d414acb6a1c6851884f5ee3a36b SHA512 c117d7e913c409536e0c2e4c13a98d0e94f88a696202e22fc879b0f9b81de3e242b3fd0bff2520deb595b2373c16a8a9e167cba391ffe0de38336f5382c8b082
diff --git a/dev-ruby/openvas-omp/openvas-omp-0.0.4.ebuild b/dev-ruby/openvas-omp/openvas-omp-0.0.4.ebuild
index d99538ec31bc..4de270ec8451 100644
--- a/dev-ruby/openvas-omp/openvas-omp-0.0.4.ebuild
+++ b/dev-ruby/openvas-omp/openvas-omp-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 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_TASK_DOC=""
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/optionable/Manifest b/dev-ruby/optionable/Manifest
index 28c7ffa5717d..d95a77d947d2 100644
--- a/dev-ruby/optionable/Manifest
+++ b/dev-ruby/optionable/Manifest
@@ -1,3 +1,3 @@
 DIST optionable-0.2.0.gem 9216 BLAKE2B 4d77994fc4a5b800d03f1fa675760f4755b5b0ed6ff18e79e15cb918129261a37bf09807bca504a0caba4eae8037b688933b7bf62b2770e8e451e7f4ef94980c SHA512 4c633c83cd51fb2f1771f5f842cc8024d769f644d513a8d4486c7960d2bdda81be44746a7bb4604bb458cd58c3bbb5db28cb426d25cded6098263798f7daa465
-EBUILD optionable-0.2.0.ebuild 392 BLAKE2B df9e426863cfac86d31f02b4e1b968391f87ea6e9325dbb5651836a6fe912f7382e238ed30670330c5c32b027d9e982c400e46bbe17124ba25086a6ca609d10e SHA512 9c1b544a114fa348312c0138a7da1b33c7e362bfa7577ea8afa97873570b137d9b0476cd29129c64492d04948ce2625700fe638fa62328a872d59a73f5efcc26
+EBUILD optionable-0.2.0.ebuild 396 BLAKE2B 1b3b69ace0ba84fb38af959132ce218bfdb4d96496ac9c489a6ee933763d12065e5c3b11545a1b79e5478bd35d975d147774d06841a43ab535ddadd25605869c SHA512 5ecedf2ee0ce94a19315affd33d36327b955784563d1ebe45d7f73305b7d5cda9cb836a1fe1ecc3c7fc05c9f9090d2d7b29f5b956613d025a5f4a31904f08487
 MISC metadata.xml 343 BLAKE2B dadca36b1b953dffb43438426b7c4a6848636a892a5964d9777b3c4de7acb12f78b4bd9f76aaef3bd4a09c2cfe1a4579d8f656262c59c28702d753b4fff3598d SHA512 0d809b55d6aa2e967ac7b85e0222365053e0876566ddb5554561289992da0945bd143f94f3ecf75e578a497ab4c341793a26f4815159ec4c0cb91439cd05cb01
diff --git a/dev-ruby/optionable/optionable-0.2.0.ebuild b/dev-ruby/optionable/optionable-0.2.0.ebuild
index bf83794dbad8..5022ef6d17da 100644
--- a/dev-ruby/optionable/optionable-0.2.0.ebuild
+++ b/dev-ruby/optionable/optionable-0.2.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="rspec3"
 
diff --git a/dev-ruby/org-ruby/Manifest b/dev-ruby/org-ruby/Manifest
index 76f217453ca6..c3a74d3bd767 100644
--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST org-ruby-0.9.12.tar.gz 143472 BLAKE2B c90e0f664f64be0449e63d717441f3c8aac9957c3b892392c8425847ea42dd23e3b7a598f57969432601ba9c6208633c7aa6e101a4684db2f68c07511bcb0458 SHA512 040c7bc9d9727fcec9bbd7ed4994ca489121c103d58242f98d340b4149f94cb97fc0bbc670bbd5dfba5a11de53930b579a33b6b1ffa343c7f2602674ec65aa07
-EBUILD org-ruby-0.9.12.ebuild 831 BLAKE2B dda0ce16fd4640bfa3663b74faf7fb198cc58c22c91df818e78f234a8726aeda747e61e122a26e4691b9920cc08d53a91a35d8545c9eead3dffbb69a3dcbcf98 SHA512 7f9f3e687a6d10cc21941d75747625569bba066637b22eece73dfec27fdb477f0897afc5a7d2d2b6f4ad3b163702e27faaab2b537718c14c2a55ef53cd02f7a4
+EBUILD org-ruby-0.9.12.ebuild 835 BLAKE2B 6dbee9c8e3e2e803dd6940524e4dec0788eae07e987231c76994828a24a89c3a7523a42cfe27b204ba571f64d41b855a379274c23bec2d114d8a1f2d726d1240 SHA512 f3af164f73edde3ecd40171f1c4b326a036b677687a5581c55ff263a0bc4fbb6a5eb8ee2a0fdf4e8d0171760b8c853825a960931f022af9ee202d309ddddd427
 MISC metadata.xml 342 BLAKE2B 84af0d7e7af39798323a672b3318def4306872b215b8ca84b5f44bb74109ef1f82bfe81dc366cf55db1d54e33bcb414b1d70ed0938ac0e5a1194335fcae06c3c SHA512 427978e7f1422a295b8f7115f57b6a432c5ffb5d5d8671082298b3a52c8f175fa63de13d2a3dfcf59b506f6407cea0e6e9a1b54e2de4b1b2bb7337dfb07c90e4
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
index 5b45699d350e..67e280f6fe86 100644
--- a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12.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"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest
index b4cc66cc1a1b..0b92c7af9798 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 1460 BLAKE2B 1017f75d1300edf686853a9800c45806baaf3a2faa5df8fca796921520ccd69a45e6c936908347f442de369c8756be02e681ecc26ad59f289c9513fd219ece3f SHA512 f760a75f734cf01b6b4f0bf901c122db603661b175d5eca1528a624588a1700dc542cb142a2cbb05aa1c1b8ea9c17148514f447eb136606ed6abdb1c0d878a34
+EBUILD packetfu-1.1.13.ebuild 1457 BLAKE2B 38e6695ae320acb9ffc712f082c93f8cb861c8177a9452579ae8ba65193131e61acdfb0199f5bd71e400783965fa02c288a8937c89be205f06b1caa15d595f54 SHA512 c7a7921cd500e10d4637170f0d352e9ea885edb38696eba41d5c444cb898741df75f3aafe4e161f0f42f5459a3e50fc478219f429519734db820d944f2fe6290
 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 28b5036705d7..ca383b97edd9 100644
--- a/dev-ruby/packetfu/packetfu-1.1.13.ebuild
+++ b/dev-ruby/packetfu/packetfu-1.1.13.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="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/patch_finder/Manifest b/dev-ruby/patch_finder/Manifest
index 4566e7fab130..dc52e2d714f0 100644
--- a/dev-ruby/patch_finder/Manifest
+++ b/dev-ruby/patch_finder/Manifest
@@ -1,3 +1,3 @@
 DIST patch_finder-1.0.2.gem 14848 BLAKE2B d876bb130d0174f762032aba3c1326633fc10ed539b697a83dcf7999d1ae0f5045e5d12ad409d60bebff894dee315bd19523a225885fa8d99d489ccd88434cf8 SHA512 24b269fcf9d379ca07aaecb8a9282086767eed0dfa9a12cd2523eda488621a81e90c4cb386600f3120bd503e0de1887f6826da33df4e77c5c8eb3fae61e7ca8f
-EBUILD patch_finder-1.0.2.ebuild 430 BLAKE2B 497c12f5c7e71fa05beb15d2f518cb7cfbf8827e66908ed096fd08e8d808d7a6c9fcbb60af23fef1cb78d1021893b024b2a8d9a52494644b988f338bc4d70267 SHA512 1177c9eb1fceb0ddc426b1b4aadb1c4de7ea25340877fbf9958a008a7969e8bbd5a925f1d8a23bacf341d3215dc326251311409f423395c5990abe8c556f8c6e
+EBUILD patch_finder-1.0.2.ebuild 434 BLAKE2B 9b8edbbe113d493c344bfa863fdd3cac1517cb404676bf83ffece32a7ccc6c4c8b9b1a597d9ac37429dd7dd629fecfc7ab3c497c3c5b24f56a23184633ac6744 SHA512 627bb88aacb6a3feff282a558e36587b9ab8cf541e2af75c451d39cf5a9338fae01204de27c808554ba35ca33a369b16df6546af5b1f0356abde3bcf78ae7286
 MISC metadata.xml 399 BLAKE2B 7f35f4eae857297d4ba94ad8218829786759938fcd49f4b61b7ba2ee6723d62dc37487abfa3fc33b90e4d066e2f904cba363c7a733f1fdf03a8ffc89d0042e2f SHA512 683463d00c40d458128a0317b997d0db4e7f6392f10fcdfdf99289ad52f8e75b1c569cf36011309e28702ab92058f54c1ece7c0e9a43f19ff3233f87dad9780c
diff --git a/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild b/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
index ec6b8e3d5cbd..4e7103536d10 100644
--- a/dev-ruby/patch_finder/patch_finder-1.0.2.ebuild
+++ b/dev-ruby/patch_finder/patch_finder-1.0.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=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index dbf56d481fc4..ec375934866d 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
-EBUILD path_expander-1.0.3.ebuild 759 BLAKE2B bd330755d7783774be5dc732a20bab12a862cb68c83163e4cc31d051d519f3054bddeb4a7ca97eb9b2b92d4e9b38b546985aa7c483a321e6287d0a788829f3c1 SHA512 def5cc3a9f94eda59aab6b45b3d22470417ede6f6d113a8b093b28750111527388a99c5fd390db76cad9ccd3d55f9103a6d9356e86d7337c54ba5cfeed4b3723
+EBUILD path_expander-1.0.3.ebuild 763 BLAKE2B 13ef4de2c0d18b0e8a4d7caf68f8d999867e1f589f4e4b27d6d0618e2a8e20adb7ab03bd6593eb5fee11ce874210b296f0cc56e6ca285d1775d0d7bae57ecc22 SHA512 4172fd07e8184f3d8b234b209720c11014faad8f2aa507e117ae817b014656f3491ba9291922bf8acd80572d56404b553c72c017e78d58f2a587823ea7099326
 MISC metadata.xml 339 BLAKE2B 46f1672ac66227d580c5f13621d10aa58b2a17373eb108a190e64203ca4dfaa92aee5dff0c71551a52af7cb58a77336f34328581fdcb75e68ecf7698071d1100 SHA512 9defdaf2e5b30460816c7e929aabc8421c4afeba6ca56a60001bff5047052a2a7f7928a683707b26582facb2886f05a4ecb56e5036fbfc4f75d4d3353fefb8a5
diff --git a/dev-ruby/path_expander/path_expander-1.0.3.ebuild b/dev-ruby/path_expander/path_expander-1.0.3.ebuild
index d63deb968507..e197c8a5c3a4 100644
--- a/dev-ruby/path_expander/path_expander-1.0.3.ebuild
+++ b/dev-ruby/path_expander/path_expander-1.0.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="ruby22 ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/pathutil/Manifest b/dev-ruby/pathutil/Manifest
index 882a8b0f801a..482bc29a8a27 100644
--- a/dev-ruby/pathutil/Manifest
+++ b/dev-ruby/pathutil/Manifest
@@ -1,3 +1,3 @@
 DIST pathutil-0.16.2.tar.gz 26079 BLAKE2B 5a9d1dac1f1171ee6bc447725c04883cb56a9071927f3e0fdbcb9754345ac77a6609533a1308a411cb22658caeb2a4bed49225923af109bca288cfb3aeb3d669 SHA512 d06daf365b94dacd33966f3928a53f0f00d2fca7b9f6348a7efd2b55ab5ba937459e5bd78fde241f30749a1ae55e4ae3ba1ed8945b5333464e7d3ce9666cd054
-EBUILD pathutil-0.16.2.ebuild 869 BLAKE2B f854b07b9aea62409c2a3abd3ce6d7d421a5993612e1a6a0eb0ae14d1396fc92fdde63108647c1585b2206e06945ccf20facb3fa1e182090387ed75f45b60e00 SHA512 f66fac58463d3f7a0b0cfe8a7a536b0271d64c1a9662bb55f5845bec40354445b6d4b9c0252cc8c866157e0a10a2ab54b5a3ec988bda4de2da796832831e4b20
+EBUILD pathutil-0.16.2.ebuild 925 BLAKE2B ebc2511a3ee25cb6582d48d43f8477012db824041357e79d45f1c91e5831d6d3dc3547e04e4f385c3ea628ded755fdd05ab34e51e5db7662d2b469323bbd7cf3 SHA512 ff5d0052325fd3daecc03fb3c097cfa8b51f96a546e8168377cf98d22ab67fa94db5b2fce9766a4170eebd5e00f510751e314ba076583d9871eca9422950217f
 MISC metadata.xml 397 BLAKE2B 5d92c61c8d5bd93ada1cfb8cf312518568a379c6fec784480adfe804458b6de4b05d22886dcc4df14dc4ceb196cac22d485b8748533c94179c82c26fb71ef1df SHA512 ad03cd42ae59368a0642c46f3ae06ddbb14e003ebaeb79e0a93ff9212ba9fc16bcfb20e90f9f5be49cd8e79a80355bcccbfbbdc44845df0d9b678a2c4a20debe
diff --git a/dev-ruby/pathutil/pathutil-0.16.2.ebuild b/dev-ruby/pathutil/pathutil-0.16.2.ebuild
index de1ff3557b23..8b97ba38abb5 100644
--- a/dev-ruby/pathutil/pathutil-0.16.2.ebuild
+++ b/dev-ruby/pathutil/pathutil-0.16.2.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_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -24,6 +24,8 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/forwardable-extended-2.6
 	<dev-ruby/forwardable-extended-3"
 
+ruby_add_bdepend "test? ( dev-ruby/safe_yaml )"
+
 all_ruby_prepare() {
 	sed -i -e '/\(coverage\|luna\|rspec\/helpers\)/ s:^:#:' \
 		-e '1irequire "pathname"; require "tempfile"; require "tmpdir"; require "json"' \
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index b452bb7b3b59..b5c51362a6ff 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,5 +1,5 @@
 DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
 DIST pcaprub-0.13.0.gem 36864 BLAKE2B 0a0ca07da261de2e8bd7aaa131bbda9f6ee3cd5eb5fa214c552179c707d20345bcedc8db5d49590e69c41220e69f93a6d9f0b1c1b6f768c25ab648d50dead388 SHA512 6099996cca317194582a50ac89769d11ba802a9658c67f707e342b3c345bcaab26fba5ca2dc245a39eeb01f9ff6fdde1ae64a3a1ee4dd0e5243bae2ebed37e5f
 EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
-EBUILD pcaprub-0.13.0.ebuild 746 BLAKE2B 1b7c088e342a4707d9c9f6dbe9b072ab7c04797bbd8d91ec9b30a99502909cebf9a482aaca4be9f62a7d1eef81de94c6e414a1b26eb05d2e0e95923d7db185f7 SHA512 730846f532300cf61383a9ab30d5d14c198ee02c5755223e1d0aff7bd1834112d3ed995b4007a909162646c0a01594a7a697be2e3450e4cbb30e21e00097259c
+EBUILD pcaprub-0.13.0.ebuild 750 BLAKE2B 426b4baee41bd1577ebae6ab078165388f0b09a927ed2fdb05cbe827d2a4388f90d6066d0aaaddf03ab4c394795d7d3304639ad3f19e881371ce82a5942cb4e5 SHA512 5c85cb27591b0170375a7ac65cd01369d7d7a404cc15eb724cb7a7ca2c12ece9208ac0096f905648f4cbf60d74be99681630dc47fb2aa1432ddeb3a060cc8715
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild b/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
index d85148c26b66..77eb258180f0 100644
--- a/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
+++ b/dev-ruby/pcaprub/pcaprub-0.13.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=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 7ff7ff6948c2..d9af4556490a 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,9 +1,6 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
-DIST pdf-reader-2.1.0.tar.gz 10977233 BLAKE2B 5922b218108bf87c1b670e8392246a3884df66b9cdeec7e982c6bc2bb39e28bcbd64a0778693731309d51cb92ad6651bd5d894d84de3acb60cf3eaeaa2b77727 SHA512 edf41a75f89af70ee75cc1a3aa44adbc7200ea36bc671479cc652b5263dffb23a62ec8eab70eb0e137f1c7154766bb803260dcfa8973578a684b10cf09fe94c8
 DIST pdf-reader-2.2.0.tar.gz 10976940 BLAKE2B 1323310319e841f1498adc9f88cef9a3dd624482310f81bfc471e95df16113df931d76d6023fe1830c4e678e65b54a57fdbca6af2c91cbd2ea00d0b96c785917 SHA512 e8e58a64f3a474752b5b49cde0b48cf99c09c1aaafbf539eba87c74394e060c2a09d911a250e11b32833ed3e905dd2b5ed5b75bdf71115b07e6bb0001fc59329
 EBUILD pdf-reader-1.4.1-r1.ebuild 1070 BLAKE2B 9f15a43900f836d3e016adeae2b4d2d365afc1ff0d1de9836dce15e6f957475b0e9f4bce45c97fb7f40bc8cc1e0943b75c4979119723da6613e2f82295fe981c SHA512 5ec9f8660232543d03f6a6971eb0dd9735e54c0a7bee429d4f2c654b2c90217cc9fbc060a2522a90e010fbcfbab9cb8f86ebc59dab70e3a0c83619c3ddcb7e39
 EBUILD pdf-reader-1.4.1-r2.ebuild 1138 BLAKE2B a49f2c262a50d57b8de3fc27e2a69e6dfd9732f70dbae76b0b70f3aa22c020fdf509b6733f13069a322abc965e58c5917a82a7ddd200e2d6269dd40f8e6171ad SHA512 f31659ee4c07b7ef3ff706f92daf3b642bf0d0b5e5200e2d3265d9c5aa7bf79af0e428c2fb13ba1cb43e48ebd57777e4eb835f885ba430b8f8b60358c6049e86
-EBUILD pdf-reader-2.1.0-r1.ebuild 1175 BLAKE2B 126ce0ea652886b1f40e304ebe20fa60a9fed599caed096e109214b58ae7ab7413de46e22e2e2a4f89099fe49b2a3f0240fd1eac5a63f3ff8c48fa3de5a888e2 SHA512 9d6f07138b8527ebdc2318e3a2a1582ce3e637a0ae22961ea20e845e50d25f53dada55f20d218a7f29e5e974e79d253434010c8a03468ba4d2af07b640d0e3e3
-EBUILD pdf-reader-2.1.0.ebuild 1094 BLAKE2B 1cb724433ac5d1a8e71b64d8bdb2dcf51f1308493c7695f09460e6354f627acf73e334bf3399b715e52d3765928daca2d14fc327eefa26559bc7087741c885df SHA512 78e861388ae37560d8cb52ac40aa5ed51b57c9d7c09a91c95a02d90871b68376f1f65842180c16aa2b871adf969a5d61bdf89c27ec035daa8275da225a3b70fb
 EBUILD pdf-reader-2.2.0.ebuild 1172 BLAKE2B ace60960a287c50e74add14008647564fa1a6a50ebb390c4df0b88440c3bb2b917d36fe89430d379d8637878babcb24c8b8d9b327b6381b93b8c0a4f66281511 SHA512 1fcdb84ae2c5120b5b59e8261877f2c30658cbba3dab0e8f7ad2d193fe1813fae6e7d92831d767bebc177295cd5ebb3477e95960c15994379fc45504177ce0af
 MISC metadata.xml 340 BLAKE2B 870883ff3971c347d1b9a28f228629d1c972c8a7e1695d77755316a864b74a8b65190d6b1cb07e55e8138321b91a6d9afca61872434ad9c13d081ce47e75d3b6 SHA512 8746d7bf7de89f49d161945c3dd434efa275799aac66d981edabec64ee789ca5864d69f3bae738b3c5ff26cc54b1d824f7aa35b2b9c9624e07339794b56d029b
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.1.0-r1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.1.0-r1.ebuild
deleted file mode 100644
index d03629ca327e..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.1.0-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
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.1.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.1.0.ebuild
deleted file mode 100644
index 334dc6886ff1..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.1.0.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
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/permutation/Manifest b/dev-ruby/permutation/Manifest
index 5ae1ffe13702..c72889cabe94 100644
--- a/dev-ruby/permutation/Manifest
+++ b/dev-ruby/permutation/Manifest
@@ -1,3 +1,3 @@
 DIST permutation-0.1.8.gem 18432 BLAKE2B 719d2c8c3006d821e69a5540a387f5e783aa0b9270bc650110171ad7d049835d4317deec68535dd9d1119259272867d6abffe97aabb9daa6c55b1d367da4bbd8 SHA512 78f9679a652d3f18ea4b459aeeceb3e25c912e28b7d9052c523b930e94e841fa84daa329f9ff06a23456cd7ab826f18cea181b85dfcfecbf303747990fa9a582
-EBUILD permutation-0.1.8-r1.ebuild 528 BLAKE2B c8d7338f8ed8c527b7054f1be25813968dd3006a6282907f6230a3e6aea5c991081b1f6c2efb4e1d42bfb89f01c7ba349063e8e8ea46b565100392170e79ac4b SHA512 e55a63f01c3507b7fb1038b68a8ba572397141da417f1663feb02331ecb238303737ccc3d1a4fed6aa7d7ecfdbb31931278591873cf90eb6547754bd2c4c62e3
+EBUILD permutation-0.1.8-r1.ebuild 525 BLAKE2B 6ea3f26f496191e5e7ea04e96421e116d564ebd010526e7ce220abb8364b8117f2add5d890f642b25b762b0ac9a2150bc245c6ba6403ba2cbfb85e934324f37e SHA512 487615c629ed36202c9e443d5180e8f5ee6d92001cccbb5cc88f416b3c9176e7222f2fdc02ff0d0a2b7ae11409ba4e6875c868a5c352f16bd9f13a59baf0a876
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
index e511093f7867..605ec839f5a8 100644
--- a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
+++ b/dev-ruby/permutation/permutation-0.1.8-r1.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index a609dfe87a26..18e7a5b6aed1 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,6 +1,8 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
+DIST pg-1.1.4.gem 233984 BLAKE2B 5a92ca49f8e471905286c07dc468f2932461f73fba13d2786c50883b271e2528b4476a81737023c252e75784c49113aacc50e1722fa100d5e97494fe60965a41 SHA512 442eadb4e9fe51aaef71cb5bbe8786c61dc4cfaa1241491270cb251f062abae88b6b2ef88dec7ab6ba2baa6390e954a2fcf4862cc95be4bc516e029c788fa1d9
 EBUILD pg-0.21.0.ebuild 1700 BLAKE2B 4878b5181a856488ba4d22cee7866c4082636164ace979e134cc480f9f3daebcac8b752f3f53bff6ca871067f8a7de1777b4d2846b2d806bae1ae6faed10a8a1 SHA512 6e0f539145f8ec93a83dc21f1a3b4185b003d201b13c94821295ef9efd0fa6f2d6ad875418bbeee8b726addbb89e45360cf12684a0b0787f6d6aed9d34f87865
 EBUILD pg-1.0.0.ebuild 1655 BLAKE2B 6427e234010712acd305575b7f08db4740547349823a2661984bcd058e38f461dc0ba4f33f728354108925d31384f9bd503394ad3457acdb3039b64bfd8e8b77 SHA512 277f349b3da11836fca7ddcd2d3961b1c83dcc099bc5c06b3af4fea2352585aae9f25330c3e3507f781800ec3d989bacd9316913dbfa4b578371cc2c596fb10e
+EBUILD pg-1.1.4.ebuild 1652 BLAKE2B c515ac53e54f0a04b417988f44c31176975b777802c4a130b0fbc378207a85c68fe5088f9d5b0317471f2c6fc0c7c3ee4d066940a529f4293dd85eae0c09f878 SHA512 b5a49a4657fc44c9ef755dc2b980a1f9df224986c6916739e82d63d18165e9059d099f420a6ca10f40385723e64d6a97133f5d7928475278eda8eb43fffb9d21
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-1.1.4.ebuild b/dev-ruby/pg/pg-1.1.4.ebuild
new file mode 100644
index 000000000000..8bd2d9802d5e
--- /dev/null
+++ b/dev-ruby/pg/pg-1.1.4.ebuild
@@ -0,0 +1,55 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="1"
+KEYWORDS="~alpha ~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"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server,threads] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/*$(get_libname) lib || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg_array_parser/Manifest b/dev-ruby/pg_array_parser/Manifest
index 59e6681480b6..a48a1a89b0fb 100644
--- a/dev-ruby/pg_array_parser/Manifest
+++ b/dev-ruby/pg_array_parser/Manifest
@@ -1,3 +1,3 @@
 DIST pg_array_parser-0.0.9.gem 8192 BLAKE2B 5b647cb3bca2b965348cfb5c442f4bf9c58d03f66c422768b22836d8a9cf73d9b2b242a055df0bea708b617d0a3ca84abe8100007ca259eeea4dd089385db860 SHA512 a1503d9598e1658eb63b6294ce1cf6f8d2e7e5c59382407946ec10d25a46b029b4bb8a8c634b190b42bef4954c4aeea60b6ffa16c596e0c3bea2df4c882896ae
-EBUILD pg_array_parser-0.0.9-r2.ebuild 1428 BLAKE2B b07ec11eb35b8270a0dfb1562efa1910a949128d979ffee58c89ee67c5435f89aa46172864798c0d04aee2877d08f21d5ed67809230270a69f8da71ca183ef88 SHA512 3aee0fa7c7f04a56947c319311d50eb7428dbe667bf55c27bc8a76ebf2cb94cf90ede774191036e5c11eed0f0d34983dbb3e829f633b142f7acf331047d95584
+EBUILD pg_array_parser-0.0.9-r2.ebuild 1425 BLAKE2B c587054af8f820e1093fe371a7ac4b84bb4044c6447c745fe95a623c3465d1cec12d214ae0b3a7c7e892f31d16c3b615500431c8d335333e4f035366fce4dab8 SHA512 99fc8a1fe4f68c299d7a30b01132e0954ce12d910224dd8ca3df1677aa8d223decb0e6e1b1e47c6fd382dcc8fcfe824d5f3577ca6c0bc3f62e8e1bcbcf1b987d
 MISC metadata.xml 346 BLAKE2B 30cbcd7afc3b0d26ad3a8cf1dbd8d2b340e1d49f223b633f67ca5d7b1c107097bd545d1474cac5b41842702d364fa54d133193232f62b855ca1bd55e4eaf23a9 SHA512 b6898bde51552dec812e9c0a6030c01243ab3f24331c509f5bdde03280a9c87c7ab4f7d3bebb4a2cda19054233f01fa989fd5f205519d7ddfc4a2e148bdc7a8e
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
index 54effc185763..760466076b4e 100644
--- a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/polyglot/Manifest b/dev-ruby/polyglot/Manifest
index 5fcacb552a8d..eb7a0f4785ff 100644
--- a/dev-ruby/polyglot/Manifest
+++ b/dev-ruby/polyglot/Manifest
@@ -1,3 +1,3 @@
 DIST polyglot-0.3.5.gem 8192 BLAKE2B c9f78c05109345e09aa0d0c899e551e67ce7bf191ef00bf169cb05c9860ab538e303fa177c6aec8ac9944bd3ad4263fbf0819af0fa190e989caad1c75c1e5377 SHA512 405790c8edf5a98010334a62f7efeddd60f6dcff91ad5ff599579be3201a7e1b359787da59523a612fed5ccf8385116865316fa8872f0350e33dc078410a54cf
-EBUILD polyglot-0.3.5.ebuild 708 BLAKE2B f14652c06a6d12d1545b7d9cd1e72a62e5047970461ab7c378b71f7777ecdb341377ed970929a6d0b7fd7269b8585bcaa49998705f3c502275869d46a235d42a SHA512 73ae570e898bcdb9b306d2c84cfd32149d7c6b8d99ab501c5ec05a7c2b1ba97c457ec4a4b3fdeb6081a95856f191f96f82f07af0e49c0a9b7fcf724e22095856
+EBUILD polyglot-0.3.5.ebuild 705 BLAKE2B 05754b5eddcdb641cbe0203410b75d5c7690d9d89add15ea21867f29509b6c1a2cf1dccf9cd67ef04fa1e31a60e87a941f1b55d474399e995dc222155de2ffd1 SHA512 fadba52257b060445dd5423ae57bcb9c37f74450b4639549ba2c2f8200927189629bf7494eb6aa7e455c62e9531a3b93ace03e70d4c835090f22bdde6087cdc3
 MISC metadata.xml 475 BLAKE2B 64c33e4ace7dd9a38c5048af6505b118a4c9b883833f9c701423201f418b5d2d21f955d7d584555cc7b350dc0f0d861472acca063a794b73d7443378e2a7f2ea SHA512 94e0a25efd37c4e396d86ecf8eae9233edaaca6796190e4d12c7a88922606cae6a9fee0d69bee6ef8d3909f2e18ef5d2c80d6334b06a6febf1fdcab5d5313fe2
diff --git a/dev-ruby/polyglot/polyglot-0.3.5.ebuild b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
index f72b633b64e8..e91fd98f7053 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5.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_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index a1256d1cdf9c..8a37802cd94e 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,5 +1,5 @@
 AUX posix-spawn-0.3.13-x86.patch 713 BLAKE2B 0c10ac73b938fe985d6c3f3f084c4f96d19293610254029267cd5b16111acbb5792de7cc5dd5195f79d5f957206140bcc7a7c47b171bd565f9eee5350352bcb6 SHA512 33f5ee510fdeb7b8b150aa61e9d3044a1571470e1187d4dd0483e700c09bfb4bfba9a52c2cde723ed568ac3d2d1cb27855a4ef09826b902946138055d4b04774
 DIST posix-spawn-0.3.13.gem 28160 BLAKE2B 68b1c241310c7b35bf8bea055e63a60320ae3fc877f9bc9f4e2dc0d30c1484eb5081be8c7d60309ed04900c410d52624dae6e37a0f134993f334526f2d9de98d SHA512 a9cd878571440cc0aaee541cbb97b6f4dcb03e48a8ef8588693f4c68990eb530e3b1685d615546763c9bba5d3109134442285023938eb2f116e9749f0da12bb9
-EBUILD posix-spawn-0.3.13-r1.ebuild 750 BLAKE2B 6713fe271a346ee38fc35d8d7c831dfb3ba8bc15989c1ae93fe3cecf32356a5c43a9bf2451f84f69d0887948c9864c9e138fd2e3eef6220c8d3de1dce42feb22 SHA512 91ee800b746f0eaff88a04e539f574ea98fb3ad56ea5b5264977082fdcab0ded3cc9d227bf3a194133720cae7c7438c9cafb54daa275fec3540416c321eaf3fb
+EBUILD posix-spawn-0.3.13-r1.ebuild 757 BLAKE2B 0ac5fff7f8066b38d8b5cb159a0155513507043db4a6ccc401feacbd7444d8a14dc82102b26fd2485a0d31e24a2ed440d24a5e25542ebf725364d7fcd885374d SHA512 1eb99911823490208687dcc57be900bb922abe5f2fe212f4c9690937946be8d9160813301c5efc321bd13bf51dd353f41bada776057585cd54d85b9e72fab34e
 EBUILD posix-spawn-0.3.13.ebuild 681 BLAKE2B e8c61d27ff00d42aca97ce70ff3e30a23fb073596bd02b4b3831ed84ec9003e80f3704908eeb563d551cc6575e92c348d40b801b710d49fbebde3ff36efc5f5d SHA512 489ecafe543fef55d3b819468e92e0b9dbd931461551ce686339187487d9ca325c1eb5ee584755b96f27f340b7c9f5f04ae018444b5254502eddfa2b577de906
 MISC metadata.xml 346 BLAKE2B cb818c5b61108ddb5acfcf890d8ba737a8cc949fe607d02a5cc7dd1d264ecc7d73a096d8d40b65872fddb0791d63aefbdd774906da4b65122cd1087e040c4cd3 SHA512 208a7646bd550d2ecd50aecda3f1891b46cc586f74479eb6a72be27c985bf2ef1f411b609e54e73f418c1653a205e1ecedcfe3f2c2ebdb719e56c60f7b1b48a7
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
index 48cfdbac5d56..6818b5a420e1 100644
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index 01306e739f2d..c77091fb07d8 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -3,5 +3,5 @@ DIST psych-3.0.3.tar.gz 133778 BLAKE2B c28ba4ca2fa8b042bd8f13294330c7704401d861f
 DIST psych-3.1.0.tar.gz 137194 BLAKE2B ab2678d44ee0824ac64cffd03f7d3e204c1c097c27f6aefe5701f663fc4e6f8adfc898f3c666c1485e6719b2902d284e8191c72cc4b35cec0982e31188b3319b SHA512 c2919840462502bca6c1619409005f3904816048caa08f9637ff6e306542afc566bb3f873e615581d9d6fcb6ace8a30c080a21523714c18d8e639d70026ed153
 EBUILD psych-2.2.4.ebuild 1081 BLAKE2B bb889cc8ceb1de707295b79d0c021486bdaa7aad0b3d5dfabb5162f9634a15e6e3cffd4ba670c035a9ee89c3806b35a8f2ec29b6930d562c92640a1a27c849d7 SHA512 f2047f58babbf1893647c28b1a8346f7f3c4b61c229206714aa5185817439766f192c54bddb82b6d14767dc1a0542cc879478c6e3b2abd63f3bca99f99a59b1b
 EBUILD psych-3.0.3.ebuild 1010 BLAKE2B 0100f53670d57576e83870ca2a72bad6ab38bccdda369ad9b7b0b9d7b56e03946c06106ce50dafa9a91c352131310de55e9c36b597ce9ea9c8b15f203d8a6372 SHA512 8f8ad8c37bc5fb1f083aebbd8a190b7c03f2a00950df394ed458313524fdd76856e42556e482ecea413a899eb5c0defdfb327c08c3b6c62fc87bb951fab5fb05
-EBUILD psych-3.1.0.ebuild 1128 BLAKE2B cf37fe1d2bad44b16a21b46e5608750e48214f969ad239afd39a132d4a9b47e8054d7c4ecf77b1b07759a98e29ea0ac03eed89d0d6e482bdb58c94dc520bf6d7 SHA512 169ab94502ffbfa7e1dfff967b364940c006195fa6afb07822436fd51d3ea4eb215fe6b899894098cde296f8c39095a4d627c6ce6b8939f28ee42a42558a0af6
+EBUILD psych-3.1.0.ebuild 1135 BLAKE2B 5f78c0e89ccd99c1fc24ce3a2bd6bddb6c6b1c22f96a2fa15ac4e477ae413373d1767d497a2412cdb224148d40e86df88c3f23fb989f1030d06584ddd88b3b8b SHA512 10f82d20b7a4cc2e60195a837bb4311b4ee9d31736fcc430711e6f9b18dcc5d5458bfce161b7601edaaa7c26deb1a83218a92f47d3e0471672cb7bed45c3af2b
 MISC metadata.xml 342 BLAKE2B 0ef324da844625ecd5d24a84a61f2845b689deec699669df0fbb6ce980509c10b1597047f917577cdca9121892ceb30fdd777fd2c66892e16ef41bf011b2cf3c SHA512 d1246a904cc4a3185ba2d91dcc6be5230461555cb57d71f1715c163caf5f8954937cbf58ddd71647a0662b65e59e917dc2dcf59d2ce92e9d8e600a3818422ca0
diff --git a/dev-ruby/psych/psych-3.1.0.ebuild b/dev-ruby/psych/psych-3.1.0.ebuild
index bfc8c27d3a1e..ea60d8cf5d06 100644
--- a/dev-ruby/psych/psych-3.1.0.ebuild
+++ b/dev-ruby/psych/psych-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# 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_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 1ccf2a3bf293..b586a4854a1b 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,9 @@
 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.1.0-1stretch_all.deb 20602 BLAKE2B 915e9fecf0a217d544a968b98295c8381fb21bca33b3449c779d8f9d508f3875a814a6b1c83eaa7a2e036e4c389e1da81602413cff31669f77f7ee3e945e75f5 SHA512 34862872e8292e06122b8eae7e52186f111d3ed486325af4dd279f1be67d4fa587755168af29ac0c46dafa61fae18a3a973a4b9edc672c5f24eb7873f9ecc9d0
+DIST puppetdb-termini_6.2.0-1stretch_all.deb 20602 BLAKE2B 6f51e8f6d87df992ced0ccc23c1cecd26a1fd2b3ad2b1d507b22d3f555fafd754913f50aa7840f40cb8c3cdcabfd4af84411213842d4a70105c69d9a8fe55eaf SHA512 ec73ee1514d6217e57672936d775974911bee7135af95d95e58f60c723d8e8760b005cb2a214fdfe692acd807e07ae53ba396bcf5f990c77d9a07ca485a784c1
 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-6.1.0.ebuild 656 BLAKE2B e18b91d5360d34d21cb5066033d0d9a4ddd292842201a9d2368ec07ebca370211a7909eac2bd1047fbbb59cafab99842991a126424db502ed4dfd61c29c29eab SHA512 f1523d8a525095258af0780c473178c2a4851410a0f8432ecc8bd351da647ff6a8d8eba0a9668943a256ffc4c22586bf978246998a21e0fe2f700fc227846285
+EBUILD puppetdb-termini-6.2.0.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.2.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.2.0.ebuild
new file mode 100644
index 000000000000..6d51b944dfdb
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 89da53a8cec3..8703333f5651 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,3 +1,3 @@
 DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
-EBUILD racc-1.4.14.ebuild 1829 BLAKE2B e34746ffa319f5a213ba7197421413027b3e55502bec9280c69cb6373c64ca5e7809de3223707051cfab735d175a3b3696b0fd8b23c9378a7ff41dd5cd99cd96 SHA512 d7f6c7305dbaf4a2df6e1d4fff6a53f466efacf59f3fa6fb11c849e712ba021563d69a2d05916378349f31466c3abf72ae85174772945272f03ac7d2ec75f430
+EBUILD racc-1.4.14.ebuild 1828 BLAKE2B 5f67fa698b0e1f7c3133b691322b9f687e1413aa79c00f7d8e1ea3042fd0ca17182bc701c0aeb1e1b7889a244b954e3d73cdfcd692f13ca040506676fee80745 SHA512 991024fbf69585be0c84a6c7c2bd236c0e5bcec78dd5be1acf7ac0aacb4380ad8cf5d8de0c13c0c4c4a74f6260a201d6e7ea6d98e8103e565aca4c8e5313b4ef
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 9f0572e84bcb..984d30c78e3f 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.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
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 988d4465fae7..b74ac5a77109 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,9 +1,5 @@
 DIST rack-attack-4.4.1.gem 16896 BLAKE2B 0c7248c3676250a94078c23256d6f33471b619f0f3948bfb8a3d6b00e97e7731ff5d84e94bc4a53eb35f22b5027709ab0d5b04f28716724762683add42a2c669 SHA512 1373cd47fdc06a1d4bfc751f3c8ca7c7394117090d190f5b58c4d7b91ac91babfc7bfed7690961ad6534ccb0ce8918f721d3e1b33902d12e686978c1c459e572
-DIST rack-attack-5.3.2.gem 23040 BLAKE2B 169f14030860b2727a494cbf4770beb6c9f74cfd1fdb9a70fb95e537eeccb08f158d9de74d81061fde39413f66b805d9ace0a586f7232ef5eee9b75b8ab73e77 SHA512 de79fdf59786ee00077ab97566ee75e38d823d4ea1854ba877fa2fdb92ae659c0c1bb6aa6b47754b6e28f1a7dbd6061e57171b0b1626dff95c17178bf4891390
-DIST rack-attack-5.4.0.gem 23040 BLAKE2B 25432eaf1ac92f3c86be7fae803768a9f8c32a61af5af493c00343c44bb0d13ea3b725c5f3016533dc0d685351917441a3d932097fbeec1f681accc9c9bd38f0 SHA512 87ab81165c655dccef0e33234ded9fd1894788c391620ed565b732a4b16d1fea539a4cfef81a0ba4a3a2edd356bbd9963976b3de7d1257c31da863f3e725962a
 DIST rack-attack-5.4.2.gem 23040 BLAKE2B 7af950339f03139e6a3ac9e8349e6d2af5182a29f643a08a9ea0806349c02965d05e99d95421f14ba827c9c942a6824f710dbaf06adbb0aa07dde03d74e629ed SHA512 a4af12c2c436a3634108494e2a5b9c5751c0fa2e87af6efa326d9c09fdae54b5bd8a8974c48785dfef64565ff9ee0a6704c90acf1277c8e80849ff30f9fbb67b
 EBUILD rack-attack-4.4.1.ebuild 750 BLAKE2B 5a51479a818bee5383233d19e11cc2b865f4a3e8a099dc7f442aa42ee9c71befece48d87f7d109087020301353067dc949e9bf73cdbfa5a59fad6f81307f4b4e SHA512 c144e27e9b68aa0ca675e2016b26d82a216ce4fa1daa781e2580002f45f9c855aa2000bbd24b86146b7f3dac0722f601c46ba7bb265d2d3de3788a5f0bbd5cc5
-EBUILD rack-attack-5.3.2.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
-EBUILD rack-attack-5.4.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 EBUILD rack-attack-5.4.2.ebuild 852 BLAKE2B cf350aac5884699c5fe3b9ddbb39f2d9891e24e21b6658786c897742dfa74756616904aba87673b91bff7baff5a692ccb2da9d5ca3ca030c23090729748d0acd SHA512 988956fa37bb2fbabbcf8b4e7fc5812af664a186e7e684d10c599613a17e11f4ceaead926f4d2090ca4022e5eded8791cc4a041a621225819a1a9d0121356228
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-5.3.2.ebuild b/dev-ruby/rack-attack/rack-attack-5.3.2.ebuild
deleted file mode 100644
index 585b3e58c40c..000000000000
--- a/dev-ruby/rack-attack/rack-attack-5.3.2.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"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-5.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-5.4.0.ebuild
deleted file mode 100644
index 585b3e58c40c..000000000000
--- a/dev-ruby/rack-attack/rack-attack-5.4.0.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"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index cc3c35bf64ac..0f165a75933a 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -3,5 +3,5 @@ DIST rack-cache-1.7.2.tar.gz 260666 BLAKE2B dc1f8bc7025f596d40d481d52168964b0361
 DIST rack-cache-1.8.0.tar.gz 260732 BLAKE2B 79104b2dd82ec1a95abbe84a97e8a7cea918f87e3845816d6252610ed24e82c4bb38fa7dc34ddea9517af06d21091c23b5316ce87a9f80d49fcd3be1a7764b22 SHA512 b5235c0b3d2a3476555bb2420bc5d69ae12d8d650fb9ea1d8d8fd4f1dff0c45f47e920c58c1e44d1e565eb45248d4e63e7643c8c50d43706365a36ae80f2eec8
 EBUILD rack-cache-1.7.1.ebuild 1138 BLAKE2B 5634fe41b8b81e1f5c64a4852d9fb0a43e878a9225e824a2a842888beb58a7ea05e8b1dc1bf329cecf1f70e21db3304c6462b894a9414cee41c5469a081ce006 SHA512 acd7c658c41acb55e40670b337d0ea3ee3b62e8e55ec5368479ca36631c04b7f489e23762d4d0f48eddfedc589f0029f3e6835d2bbb752e83c1512a576b4aa0d
 EBUILD rack-cache-1.7.2.ebuild 1139 BLAKE2B 80117cb99b3cdce517460d7f8c6505890a778647df3bd4a85a2ea16b85a960a0a7299bd0c7394cf729a72ac2fe4eb60ceceeb7266ac7476632070292a4b1ba5c SHA512 247a71dcea1e426381655911498bebcdefd986960316ca75a0f5bedce56c3cc556de41a0fd93fa4cc8caac3405edd300e8fe5a9b0891866bb535ff89e956973d
-EBUILD rack-cache-1.8.0.ebuild 1127 BLAKE2B 8df12966d9bdea38231d551519c4fa97d931966abc5ebfe11f1145820d0c1ea1c81534483216f1df518dd32836cf56b00e5fa4216577701a08c62b93589ce491 SHA512 56f70dc9812b2018bf2a583ee5df0d15071c40afb3c0375ca8d0a014f629bdd10e5c6113bed4e1746c202eb0d0a9b93fa764c7bb3ac44fde360b449b0d9bef5d
+EBUILD rack-cache-1.8.0.ebuild 1131 BLAKE2B da35c744ea6cca7183266731bc107ca12306248bf9ba1a0a1f2b834783da6e905d0ef252180388d6ca34019174f4bcf4ddbeeb7c9e9dd15830613792a48c64f2 SHA512 840dba86fc38f9a0e13e33b52e7216096af3c1589c43d8c7a4be8d6f31ce4090ab355a0894d0a113bbfe205e8ea3227e7940cc149a2a4333dd054d782344a64d
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild
index 3b6aaa6f0467..85b213201415 100644
--- a/dev-ruby/rack-cache/rack-cache-1.8.0.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.8.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"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/rack-mount/Manifest b/dev-ruby/rack-mount/Manifest
index c167160b4451..6291d828f3ce 100644
--- a/dev-ruby/rack-mount/Manifest
+++ b/dev-ruby/rack-mount/Manifest
@@ -1,4 +1,4 @@
 AUX rack-mount-fix-ruby20.patch 860 BLAKE2B 171163cb59d5a3614243db5e1836d60fb78659ab7554cc4a6160581cf7b9096f5dcef182753f1d942be65ea1121ea87462e90fbdc8697f790d693cc0759d331f SHA512 79a8acc75d2a32c82ef088d1d25a3f868205dd7e0a17b443ddded432161685ca56d67ce013ffa9c05a32c5446adbb3563b5a09beb1f5c44311cd3033f794ad2e
 DIST rack-mount-0.8.3.tgz 33944 BLAKE2B 7763b55aaff25168924c9e237b762231e346b757b56919e454db52485cfa015989a03c93b9d1f0ae0802ab35773d646d70bc87e5d02307052c3c2c9ffa295d60 SHA512 5f1d10b951c967bc4c36a81b5c7dae5c5ec8d5253ee804fa1e1b4446c962fa0882d4c59773bca9373d5eb37a18646aff0a2dff2b1636d3d9126cae0f1e10a638
-EBUILD rack-mount-0.8.3-r2.ebuild 880 BLAKE2B e0e17b889600998cef9657107c2cc10d846eaf309461c61fe557b65f30d3db2a581b00c76f2703f44ae507889cb1a9b4b05970ebc452bfa0f29e696c80d1738a SHA512 1d7cada4b17e06ecb0818d306c9d76838e9213722fbb8d472044d6d52358e7a42d184b58c389c58c58c3517aa4d2bac50ec2b3ef7d03901710dc34f2fb0cd7fb
+EBUILD rack-mount-0.8.3-r2.ebuild 884 BLAKE2B 832b37703c6b943965e6eb06df8dadb133b6e43f6136302ce45e623c9458ba2b1fe094a7a390dfc5929b2c3464ac950fb2ca4365a5099935adeae864fee7f77a SHA512 4334259a63c6f92de81816b546bf67065b9f6aa4ab0665d08fa4b976e1f1e89fd059d47b92639559a63371f91b1b17545f10a2bc0d13905ef7f131d057bcfffa
 MISC metadata.xml 484 BLAKE2B 59ae19bd6d0bbf43cf6f8f67c39ecf26b3962385c944dc87e10b7df97e93c0f80b1017af68d7a4917a23a42ba7fce008f1d30b322284c692e91d653b44ad0aaa SHA512 45803bfbd921dd5d026c0cc4989d0d6fad65525b005566a91ab954f49bdf5abb9097b3a475f9ae5186a9e813243a9e10cda018dcd55ee73926c9654ee18de87d
diff --git a/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild b/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild
index 05164ae1815f..1630b971e17c 100644
--- a/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild
+++ b/dev-ruby/rack-mount/rack-mount-0.8.3-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"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/rack-openid/Manifest b/dev-ruby/rack-openid/Manifest
index c679e18a50b3..b0f4b7a32713 100644
--- a/dev-ruby/rack-openid/Manifest
+++ b/dev-ruby/rack-openid/Manifest
@@ -1,3 +1,3 @@
 DIST rack-openid-1.4.2.tar.gz 9444 BLAKE2B 0aa675ff4b6a67fe21b93d245111415f5e483f7b4a210f819a1f1eb6b242f6d75a1c182a2965a57350eb6bf2a088989c90d4b3c0348a4643a3889639759be3c0 SHA512 7b651899c7afc10d11358bd6de075f2f902c2188ce5f9d7bb6d1fb75ec77d1c53b11926ee254eead2229ac00312382540dd550debfc5fdc137e009011eadd321
-EBUILD rack-openid-1.4.2.ebuild 888 BLAKE2B 8191cb9cbcb1d9bb114769c2e14eea3234407d0d19f431999bb33cf9354bced086a0f362c0b78a2623a54e25e5fc36fd44e1c4119ffc947b6b850ac4cc3dc980 SHA512 1c8cf1538b41c7c49f5e71de484c14434d6fe9aefbdac0164c2a20158913a877b6c42fc16630564e9dcf1ff3a42c6d02eb8dc0a99d92bd9b0f07453f19cceaa8
+EBUILD rack-openid-1.4.2.ebuild 892 BLAKE2B 5ac90d808fb40d2745b150314e9d53b9adb61b9685af3de044a5c928aad7554047352c95238fc890c4b1e3db5ec6425c3802f46338d4bed2f2eeb3dbdd5b94c6 SHA512 93de7ddb2948a50c3b90b818942feb5d38d46b34aa7a8ffb27022adb76375c5022500b31e6a426520a96d0084d6629a81e7be7f043ee0f43e6d391e159ea9b10
 MISC metadata.xml 345 BLAKE2B efd918bb5eaf6ed922c59cf416781fdfcad6a7ec77ef8280c769d19019f77d789ee9db60c5e2e3722fd3563c51f2a615a9ad5c6739422e2ff492f17a3afad2e5 SHA512 bca9d433271ba8324b1f0bdc704daa808f7d989b3f2838085615be87ef11a03eb1378c12674a6d8c82ec950bad70c33fdbadfde72503b3c2dd5dbfd79efd7db2
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
index 9b56b77bd4fa..bc00e0c81446 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2.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_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
diff --git a/dev-ruby/rack-ssl/Manifest b/dev-ruby/rack-ssl/Manifest
index 82665301cf7c..9e47dd6ec038 100644
--- a/dev-ruby/rack-ssl/Manifest
+++ b/dev-ruby/rack-ssl/Manifest
@@ -1,5 +1,5 @@
 DIST rack-ssl-1.3.4-git.tgz 3185 BLAKE2B e0b8345f38cb7a226e95e7aef231eafa2e12d132470cb91a007f9ef5802c1a536ee871a13235b72e49e68cdabd4eac133fb2e6bc82da376347b74f8e089c1aa5 SHA512 4a52d30afd9306975579f9773b7fb59f4174fa095497a7071e48599ad261eb6bfbd040e49260f1996e94b897e38873b7d5b47dae494e09cc1ad22c7078458afc
 DIST rack-ssl-1.4.1-git.tgz 3238 BLAKE2B 7861fff6dd7b15505e008d150a515dee6749767b3e2056553baa85e3696f4c9fb63a5a0d03b99588ee09d79163c0463763824a9bb53fdc86f857f9c472c9fb2e SHA512 700a2cbc848be8e410186e6af709c5d7a8bae65ada02b405711dc60f8c6e1fe4fb00c3acc55ddc76a1d79e9468ba8f92d0350c983d5c1b83e4cee2b91aa68f23
 EBUILD rack-ssl-1.3.4.ebuild 725 BLAKE2B a84757468085c8675de6231d082185f10abff66f39d3ee57bfd32c57bd308d8d5a9cafc4f4adc07b1f3c70b340d3b07fdcc995fba7744da1f03c50ac809e162d SHA512 777372d8ac8f2fa001223206b3ebf1858245ee06b3ed734a215657a242d88f8ce0eaea229b78bd23ebe744e97d4721577f45f3e12cd113186f618d1fa8a40af7
-EBUILD rack-ssl-1.4.1.ebuild 725 BLAKE2B a84757468085c8675de6231d082185f10abff66f39d3ee57bfd32c57bd308d8d5a9cafc4f4adc07b1f3c70b340d3b07fdcc995fba7744da1f03c50ac809e162d SHA512 777372d8ac8f2fa001223206b3ebf1858245ee06b3ed734a215657a242d88f8ce0eaea229b78bd23ebe744e97d4721577f45f3e12cd113186f618d1fa8a40af7
+EBUILD rack-ssl-1.4.1.ebuild 722 BLAKE2B 107612ff0f65589f220c4108c165a918f661a783a99f09147370a5e93992abcd79a1169379ab49b9eea6b111b86b97891d5fa76090363f4763ecd19be208a673 SHA512 48f7b3d2a87a7aa50115e666fcaff5cf136627a677caae173ac6364e8abc53b5d8022876deb3a0e532d25d42f7e59f77c56f81dc68f8e93e4c98c57e24bf7866
 MISC metadata.xml 482 BLAKE2B 67ca7d55352609b11359b8d39359e3b79158dbbbddbbdf44b202d807204dbc60c71bbdc0af20ed275563ce4f7c00adc4c892f32a2daa7592b368c196c483ea5a SHA512 53f23a19165373ecc6883bdb632db201f38e21d968f787e7345db51b2c145d49dca0d005551e6e7d5699c97af1e16563b7e5f6fce239d82c4235e6e19b0d5659
diff --git a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
index e8504500b003..1d1c114a8128 100644
--- a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
+++ b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 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"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rake-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index 92bba92cc50c..f577fedcd245 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -1,3 +1,3 @@
 DIST rake-remote_task-2.4.3.gem 18944 BLAKE2B 65105ded7e7c98f13c33376887220fae849a0077fa05d65f17079512f1290b1049373d130b50c756523c1562a7fdd608cf28d7fe32355ce4b52e1e09982a6b98 SHA512 0c81a4156853e6a58c094723eb5748a6aba826c62624c9a04b63e505e8c4bfab1b8fdfb80c0d28d6ab84e6a06280c52b263b515c17cab9d248d1eb9abbe78ac8
-EBUILD rake-remote_task-2.4.3.ebuild 639 BLAKE2B be66fb8925614cadb1d51508ef11711a408ea2e13750004904d3261f7316e64d3153d5214860b20ebbd4ad81c92eb80c47daa56cec500c6a732a6442469bfe4a SHA512 bcb2cd3b8375ab806a447a7ceb132fa1e15e7d191fdd71d2a2710c9404c0dabb6d43cf693c70ccb0a10193da6e6ddee17173aec356213c53f7913d7859772a72
+EBUILD rake-remote_task-2.4.3.ebuild 639 BLAKE2B 7fa42e73abd9182916d71bccb19f00b684b36beb90989b36e004cf71e5fc0c03f72547feda8abd6c6c05653ce7b90b889a98dfcc6125f4a16636d1339c399b6d SHA512 8febcc66e63b263ceb196ef621fce873340c6be2dcd52bd4da96a2054c5b7c920a46139d011f9a456b90ab423b15a762c52e3b397862e7508c720fb9f5d809ca
 MISC metadata.xml 342 BLAKE2B 04e0152e9fe68dfd8f53e6de853f9525cacca92c39ce67736e1c5416e6f0a1cd49b8f7e9596e86427e90f686414c0b779722e73c40032d7254d06aa0969472ca SHA512 78f689de3b96954e2e465b5e1d560dc6033e844fc20dddf37e03687155f731245de09221c1725cc20883dfc848368b9a4282c021341208b2eea6fd679cd8006d
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.3.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.3.ebuild
index 4a8ad54d9466..1f2271a6002d 100644
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.4.3.ebuild
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.4.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="History.txt README.txt"
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend ">=dev-ruby/hoe-2.9.2
+ruby_add_bdepend "
 	test? ( dev-ruby/minitest )"
 ruby_add_rdepend ">=dev-ruby/open4-1.0 >=dev-ruby/rake-0.8 <dev-ruby/rake-13"
 
-all_ruby_prepare() {
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
 }
diff --git a/dev-ruby/rash/Manifest b/dev-ruby/rash/Manifest
index 4e15ac0b8630..1f1d166ed2c5 100644
--- a/dev-ruby/rash/Manifest
+++ b/dev-ruby/rash/Manifest
@@ -1,3 +1,3 @@
 DIST rash-0.4.0.gem 7168 BLAKE2B 6746ea697664627a56fd9d9430f3b15391ace7a389289a1e79703a914c1bfb334d79f58fca635c49d14f2f0c2b3f59d710f4fe5c22b2b9f50b72e2d37eab5edd SHA512 18308a44829961411bd0f91356d6a1d6ad95b1c34ad9f77185fdc62e5f5f8f52658f2d80638054786acddf8dbd201e166cad8e12c5b4d19e0e9d978f3c9f340b
-EBUILD rash-0.4.0-r2.ebuild 658 BLAKE2B 14bb58162ea920527ccde6a9beb733ed46f1c54a6dcb9e24c777c25da6b0469fbccc16ef6fd26906b69ba2bd5479d184fc098e2f22177d7849f60d1af9ec5230 SHA512 0c8bef46585cdff9048149f8efd02b42f7163e4bfba3b0a0f53cdf269523fd8e40f7ba62f1ba57da38b476b137c618a474e0f03eabff67013948ea9e5ab57377
+EBUILD rash-0.4.0-r2.ebuild 655 BLAKE2B 99b82094f4d2e1c3cc78c630baa2b2341e11e1613386d14d000d3c863a4d0488897c55ed6b3e4fbc8b69617ac0ddea86817cde032a4466c3eec47b82e54c312a SHA512 faad08efbe2f0f75d3a663599a5d3e29224b4d9bdf911f0be30450c8389ac2aae4f4173b9890725539f51b40e87aaa1d5304d516b34b279a9e8bfbd6d878ba82
 MISC metadata.xml 337 BLAKE2B 3b0de27f6a9ef2ee486722cc0343ec275e8c114449ca774dff2a04b0aa28bcc211a0bf7685231b4868c877ff041538273ac3a395aa0ec05b948039337e580c3c SHA512 0d9933df5dc5c0f102eb53fdabc46ec40f1bda14847bb8764a946a2b1ad2fdbeb625d1b32b3a053272f2585754652bdb3b7ed92adddd56822941ab16010319a3
diff --git a/dev-ruby/rash/rash-0.4.0-r2.ebuild b/dev-ruby/rash/rash-0.4.0-r2.ebuild
index 31318506db44..2a6dca1326b5 100644
--- a/dev-ruby/rash/rash-0.4.0-r2.ebuild
+++ b/dev-ruby/rash/rash-0.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
index 4f48deb5e799..8f8ed3f1ffcb 100644
--- a/dev-ruby/rash_alt/Manifest
+++ b/dev-ruby/rash_alt/Manifest
@@ -1,3 +1,3 @@
 DIST rash_alt-0.4.7.gem 8704 BLAKE2B 4b3280fbb630af8a0b3eaa3f3ec03788e9a0420e6e511acce1c038f5197b10afb40e8620023141a89ab65dfb3af318df61fa073fd29aa6d2d7863663498a192c SHA512 c6b58da46e6c05a575482dfecc6e40f3f832595979bb5497f90496a57517a09d123dab691d4493e32937f58337bec37df2d1d342fdd7ed8c8befefcdd388b4ae
-EBUILD rash_alt-0.4.7.ebuild 653 BLAKE2B aa6e3b26091f35b46c561cf55cabb32dc62107476d02ebf29db6b616a89325b7e23a7b0dedbbf57b29eb88dc1ddb3c0af2f1fb1272a9829a62300ff33065b010 SHA512 d88ef246288ead74b5a9ee5e4131ba51f4d586a7c28b066b12992ee5e2abda400b565c286f93390558fde9acdc42dd47baf54c86798586a7037afb701fb0d472
+EBUILD rash_alt-0.4.7.ebuild 649 BLAKE2B acc9caa7037b48b443c2f7f4952a3cec48a3110c12aae05f30c19bb304e0afaa7d623965a98373ecf9a63056e63c5bbf06bc4cf44451754cc6e1633e9161a938 SHA512 2a19bb9cae90754e004f3ebd45722c33f9506767601ad99b35c96816103b387dc23595fc05a53305e7313f17a455d8104b9ecea38c861ef732865ec08b45d04c
 MISC metadata.xml 341 BLAKE2B 7caa3a250886847a12aa991c5dd47543d1e7189180f8174dadba5acefc1038284bd60edd162bd597658df0c1fe570abb4e46f7e3e0132090c14208b0c3ac1ff5 SHA512 d194dc7d95ed207f9022e3602712d942f592b3aa773796a1cbd14fe7d5d80d82ba767ebc5dd5fc9e5bac665459f4c624e0f074112ce35fab935a94ec383a4d84
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
index 105e4753528b..e9fc7a6d429f 100644
--- a/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
+++ b/dev-ruby/rash_alt/rash_alt-0.4.7.ebuild
@@ -1,10 +1,10 @@
-# 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"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/hashie-3.5.6:3 =dev-ruby/hashie-3.5*"
+ruby_add_rdepend ">=dev-ruby/hashie-3.5.6:3 =dev-ruby/hashie-3*"
 
 all_ruby_prepare() {
 	rm Gemfile || die
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index 825026d56386..9f57cb004923 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,3 +1,3 @@
 DIST gsl-2.1.0.2.gem 735232 BLAKE2B bb8aa488b5d3bf7c2f3facf34093c985c63bfe692933b21eb8273af38e6788691593bdcc6fd52b9e22635d1b8195f81d1302edab7c2915a19ce9574cab184d84 SHA512 c07adfb44980ca813e114db2b0917f6b2dcb7d3bbe0ccfd9561519b4e574991f3c72f3e7115218f473154690f9284bf89c968d3c6d52d29fa0a232a1160d2704
-EBUILD rb-gsl-2.1.0.2.ebuild 1167 BLAKE2B 7fe8d990dfdcf1f364844525c74d8609d297edade0f7bf9c34c9db361e014d2a027a4b3dacc07cd28dfc56819f7376a3def39f9e21ae422a99ed35ff4201f5e4 SHA512 b4381a610b52282f0eea10915660aa420c73c99a23f3db78fa929eaa1d05e5e70a1c9287135427e40a5748ecb3491baf871a6fdb2a56f538fd45e80c4e82cf4d
+EBUILD rb-gsl-2.1.0.2.ebuild 1164 BLAKE2B 38a91e3898e9a6d34c0951df93432e3f560f15daeaf41de5710c06a2e6f980fbb5036e38e5a44f99dbcb8ca501936136236c211863dd76d30eec44c19f92c7b3 SHA512 01b381530b5032ede709e1780014ba8b4848e126da979dd3af8b51ce3832fb606f3b1df28ba2372901e805365f37a0970677276f8503873ecea9f5897c2c6c0c
 MISC metadata.xml 340 BLAKE2B 768b125254ab2e25701a50e2735aa8d25a128d27ef4dcec356206519f0f017d77b3ef8e75cd2a519d74ec1574404004ad09582a872493fcf9f740379eed4dc79 SHA512 1278dd12be4197ef7d217b0106af35cd983878c36362445d09b6a76a61e0d7d1d0a04a5c84c76eceda98a60055659c366698f7faabae7e5d1a4004a1eb7e93cf
diff --git a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild b/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
index 0408c68266b6..1cb52c80d9a7 100644
--- a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-2.1.0.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_NAME="gsl"
 inherit ruby-fakegem multilib
diff --git a/dev-ruby/rb-readline-r7/Manifest b/dev-ruby/rb-readline-r7/Manifest
index 8f499b444bd8..24d83aaeedb5 100644
--- a/dev-ruby/rb-readline-r7/Manifest
+++ b/dev-ruby/rb-readline-r7/Manifest
@@ -1,3 +1,3 @@
 DIST rb-readline-r7-0.5.2.0.gem 96256 BLAKE2B 0afa90a210233630f9d5068636efaf5874294b524d7abee4a7560436cdcccd9785ea356d0ebe50a4c191e57a111c7301f9b42d787e9a1760d241ff1c14e90834 SHA512 e94b60e368104f5e626a5c98dbe894cea52294b9c2061aa0cf32c34b7575a1ba9b0c514221ce266be89553d7936fc82696fc979710b9e8bb2503fc8b3cc0a938
-EBUILD rb-readline-r7-0.5.2.0.ebuild 646 BLAKE2B e3820d8a739557b58dbb1ab039e7e02cf9817a512491672d463658922d9be5ea95babf2abb7a7bb5a51e22c7da6594fccf6dffdd3cc201e62123f6a1b9f3be47 SHA512 584d91b6c7efcfb0df310eea2226267008a9752054e4fda109e7628df4942cb2906bbeafe59f3de3264a4f1e655edc98a846105dab16205209795c7b3ac6e19a
+EBUILD rb-readline-r7-0.5.2.0.ebuild 643 BLAKE2B c12ea7043b7ec3f94fe60601860ea3a0f7eb828a9a80049d6ac8a30236b64208147816c9873eee7ce506173fb1b451e30002f5c2428a08859c95484406079d7e SHA512 fff488ba1d9653fe75e7a79b911d15c9f6ae415b30517b7375866fead0467dacc09d5150057c04e4b9cdede5986f4fd1762a8fe73536acc3b23c83b7a6926326
 MISC metadata.xml 398 BLAKE2B 3cd6003925d27d01dd200b49d5d4c9ec0f0954816fbccd9b60fee5cb2bbc8c7680dc97783f420528b12cd82002b17b5eada95c54294d8f762bc02c71d88dab04 SHA512 2f08a8565c17bdf29ce5f94194904bba4ab779fb2f23003bdf35eb15f7f2dbe39686026324c1212f3ebcc785d5dee2cc117eaf90e78ae2e4c107f3863cc6fdf4
diff --git a/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild b/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
index 4d58a2cd2077..b3626129b202 100644
--- a/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
+++ b/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 inherit ruby-fakegem
diff --git a/dev-ruby/rb-readline/Manifest b/dev-ruby/rb-readline/Manifest
index d3fc8aff7003..6051c2147e68 100644
--- a/dev-ruby/rb-readline/Manifest
+++ b/dev-ruby/rb-readline/Manifest
@@ -1,3 +1,3 @@
 DIST rb-readline-0.5.5.gem 96768 BLAKE2B d854731957dad1dc6abe6a6e1ed72397e49faf08314c8af568c0f8e6412ecaa38e937a807ac326af4f306f24dfe89a51b830663cca1544a3618ec2aaa6cbd1b9 SHA512 53ed9919eb2c057d2b26e87ba0ecabc73f0aed7fa22398b9e7f98e82bd7a0ed7ca89cb1944bf94400bf4289d6fb404aadb9a2781fa964e2f4c77d7e218e459ae
-EBUILD rb-readline-0.5.5.ebuild 684 BLAKE2B ab3bc13aa719a0907791cd0841aaf1b6345ae5ecacf76a028c9cbff88070cefc9264dc612da2ea40214eade63c5ccaa30b2210c481be36f33011c545b35720e6 SHA512 fbb0b32f68e22ee97ecdfb8926149906b69d8d8e4864f13428d63ad2ab718531736fb348d4e9ffe9b26950dfb270304ce69ab4881f9c38606fc060d9a4a33e14
+EBUILD rb-readline-0.5.5.ebuild 681 BLAKE2B bf8c6d7b225552de27a7a6962e7987c22bb2aecc16cef5a7d22ec975b242830a4b1ae9713bad2fc8921e5129c2bc35bc6369815f195114318330fc5b9652b1b4 SHA512 5e5287131a46bdc2e585c37ed77815a8e0fee6fba38034276cec6ff34bb5a3efd07b3d4669eb869618120f4185b904b41b62a33b88820ac34cee0a38d3cda09c
 MISC metadata.xml 437 BLAKE2B ccd79f5b96546c77c8e6374fda201363e5975f91fc762a265ef0f7872a8ed4bdaf2130e5b58bd696a7509508954998d73be1eedd2318879c2e2c61320cb3fb29 SHA512 bae481a94a3f4dd74f068cebbdb15e6e2ff8ef9e5e175d3d7725c6c5dd06534f6563d0807a005d228d60f28551006cd88efd6ce7274657fcfe9ed982bb583c04
diff --git a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild b/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
index e2d024b9ec29..ca674a29505f 100644
--- a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
+++ b/dev-ruby/rb-readline/rb-readline-0.5.5.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"
 inherit ruby-fakegem
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index c23051d102c8..09efe6a39ea5 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -2,7 +2,9 @@ AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994
 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
 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
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-6.0.1.ebuild b/dev-ruby/rbnacl/rbnacl-6.0.1.ebuild
new file mode 100644
index 000000000000..1207ef481838
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-6.0.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="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/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index c15bc3a0df6f..5023bb6edf76 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,11 +1,5 @@
-DIST rbpdf-1.19.3.gem 295424 BLAKE2B 27ec18ad5b2082562f9121f625397cdff60824325f6a7fd39f9109f3d7ba68f60cbca2c08bc3c177dfd2a972ebdd90260535bd36d98240ee96fe50bba8a9f1c0 SHA512 ec169555973122418f0a15bdbc9ec212d0a5151dea849e64b21e45390a2fbd6571e4918322e9c6ec048cc10e53ecbab9b32a1bfe484f2fe6a9f13ce0f01f53ee
-DIST rbpdf-1.19.4.gem 295424 BLAKE2B 4dec81dfddc6aab7da97c178e3c8bd665b803e807db537722abdde0fb846ed147d070bce6351aee0529d0032e73cd82caf47d263ab3cc86e1e66ac0ddcea3a1d SHA512 876b36b7a03f675597110c8e3b82c4a3088816bb6fa6cbb300d066d6873ca24d517eb63e6b81d6851e836524e5b1a9baa19a125ed0f6d369527fe1df3feb86c7
-DIST rbpdf-1.19.5.gem 295936 BLAKE2B b75f317a93e45cc83928cae039fd49dfc4cfb6325c4c7445b85bd396ce31b468c49935537cc6eaef5b49d55f5e12eb41258ac7b688bf4f41d94a8be3b2172d2f SHA512 736d11ba3f34fe93bce1343610a5a6ce0e9f9f7084f63c4dc58f1d94f66a3d9371ff2a89706fa9c6c32326999181ea420e4ee0ccf7e337cd938b2181fa204ea9
 DIST rbpdf-1.19.6.tar.gz 12026339 BLAKE2B 8ec388e65f110773b9a7c160a9bccbb1beb6f3ad0bbe2393a7b91087e1d2b3cbdfb03284737f6763cee6cfa947d68532cde8f4b684b004dfc92f300510a1f5c0 SHA512 192dae84ef2a44cfc7bde38e776ade1aab95e812f55ba1848c20be4a2e65231c97330859cf14b1d3bfd7aa158a1ea561602723e9e96e275ecc771ca781901271
 DIST rbpdf-1.19.7.tar.gz 12026440 BLAKE2B be785f7f810c11c64efcc2ef896486dcc3d13b506badc3527abe18065c82ff32a025eda3fd925c9ac0da5c99d0300f2d76fbcf52d444bec46ebdf533b0180234 SHA512 6d4f01760511f117f2ddda87cde26ddd0e47c6245692d80fe84a9ff5cde9759b7803dcfbd328ff9af9e59f6bca9f210d8bcb66f66f288acb512f58920fb5e7d8
-EBUILD rbpdf-1.19.3.ebuild 1232 BLAKE2B b8ff390e2a51584258e36d8b37b030347bb20e7928dcc50ffcca50b884811096fb39d88c22444bf56d896b820fdabcfcce3265554ce3195fd0346842b8741096 SHA512 a3d67be4d3a5c1a7d95506553780ef2dffd270e79047d6d01d186d44de87aeb1902905021a70a8a59b0984e789bb85673d7b51f85e219294706f14da77d3b58a
-EBUILD rbpdf-1.19.4.ebuild 1225 BLAKE2B c9c85cb2211ef8a7f4a57d1a55acb122a654955e176f1486792531cc77e5b760889eda849180ec46d5eb6d6f9521d8f7d1e0afeaaf0ace9ff6fd485744863c64 SHA512 e97dc812ad1796ab1204b141d5b63a5a5a28f5664108506be62d6e134cc8c267bafd007a1c44acce35308ca2c75f70b4a55da8dd8dd2af03972896eee21618bb
-EBUILD rbpdf-1.19.5.ebuild 1232 BLAKE2B 4c1c27b25203ebd32e43f75ba664a7a0048231999607dd7068aa83ca34d8939132d0db432feee2e1b476b79cac6072e2d9c01fd937b8d6751ec47d52da71a052 SHA512 b450f82a5162e0135ebcae2ce8e49fc7fbee4c744dcf2d33d03a40dd370a9429c92cb3d9ee39e9bdc68eba854b5dda980bfb1234c9bc17a18c0b077d38175bdd
 EBUILD rbpdf-1.19.6.ebuild 1307 BLAKE2B 9c87bb17ce8033a755f9b3a8991340111adafa43eab6a3bddb8a1cdd76a2afcbc479515e6bcfb9ea80b099d6b3b72347d67cbbb0c5b1738dcc46d51bac7cedaf SHA512 3a9c6aafcb558c88b274cc2243def2139fb0e07617e939bc1f0823baaa67b1760597445a1ae3b5ea871723c47fd31625cbc5a81f624359ae4e4c74d7c59cd54b
 EBUILD rbpdf-1.19.7.ebuild 1307 BLAKE2B ef4976b492a44d70aa4e305897fbde08eb420010d9b49ca963fd7dfa4a77c6b0a8d8c2f64869c4bb3920dbcf7644c18f1fe44493bf5aa94e89c50790db87c5b3 SHA512 fd351d15fc789e4984690124e094d9b85efdb36999a6dfc492393a12a62da22a3e187fe15dbee720dba206e3676e238a4e101f448269579f88881a2155a465c7
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.3.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.3.ebuild
deleted file mode 100644
index b986a5602aa6..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.3.ebuild
+++ /dev/null
@@ -1,50 +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"
-
-# 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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "dev-ruby/actionview:*
-	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/rbpdf/rbpdf-1.19.4.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.4.ebuild
deleted file mode 100644
index adee04e6b984..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-# 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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "dev-ruby/actionview:*
-	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/rbpdf/rbpdf-1.19.5.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.5.ebuild
deleted file mode 100644
index 7fca048891a3..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.5.ebuild
+++ /dev/null
@@ -1,50 +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"
-
-# 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"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "dev-ruby/actionview:*
-	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/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index d90e7e08c9ae..4b1620b52143 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,3 +1,3 @@
 DIST rdiscount-2.2.0.1.gem 68096 BLAKE2B 71ea7010116739e8c61aab91c2cc4a86cf679b4ae10221135c0bad854822a9a81969e927ef898c0ebf753811205ad98258c4e7c4b16f9e18a81bb01137a79fc9 SHA512 81a477782b9829ac5e68ab390ef00b7f470bb4bd84e86ce28dd9abbb71aab6fd17b67416078dd7d4e0fc7e0c8eb78250b7a71a2f24d2bd236e861cb445f9feb6
-EBUILD rdiscount-2.2.0.1.ebuild 1104 BLAKE2B 1d5285c56ee94e4a1ee36b1f2e7e1aa8f137957fe4563cdbc2d3c48eb8e4585c0d3e605a73e5e552fd16bf1c79892bb38579c39f68567c37a78a30810e9e1bcb SHA512 8eeaf65f51a4a1529b41e01fdef66a3d81d237d085b6076867bde04886f0f4d81b82c5c12e9976a8dcdd788df6583a3edaa8868c520e316f02e6101222feb7d3
+EBUILD rdiscount-2.2.0.1.ebuild 1101 BLAKE2B f5c26737a7e5acfede69fa99c059eaf069303c1671f0e6c824900ae918def65cf81138d54ddd59d74a38ea14ca94f293803838c63a421b2acdf23c42b7da971f SHA512 626111a916bce27d91365998588f7dff48859228ad7771c92afb3bf90476b4dc72e21ab99ae5b0d21307e8593c0bdb3e4deac55c1925adbf60b20970f50ff036
 MISC metadata.xml 344 BLAKE2B 4afa4c43c02006cc29edbfd9c7792c42aec4aff05203b57a9e727ec6333f3f55c13b8f197f915f8a632d9deb888f5e00f3992fa8df48d7f0969206927a342d0b SHA512 4d2e68c0284b778089ddae07ad5026c296d997afc771a5b3b994464691ac794dee27f1f7bbdbdbe2037565be70d2bc480480a7b93c867dc100dca228b09b7aec
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index 2f391e54f489..1ad5ee1e4fa8 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.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=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="test:unit"
 
diff --git a/dev-ruby/rdtool/Manifest b/dev-ruby/rdtool/Manifest
index 8709c9156038..846e4ba0a590 100644
--- a/dev-ruby/rdtool/Manifest
+++ b/dev-ruby/rdtool/Manifest
@@ -1,4 +1,4 @@
 AUX 50rdtool-gentoo.el 174 BLAKE2B 9480cb7873a3f12db0cfff40adb1bd18a5f5fb8c8249c24767631aa9f0f341237fb8c9ccd3cc720ddbe02c63b0d7846127706f7a25def3ca23e71716099e538c SHA512 77e893e6c9660b8a6cb2b8e7d1134867c4e9d38acbf11db4ee948f288b69dfe3a938ab0d37bca7b4b9da2f6ca27fa27e2d9c17629ef3c0d49797f65c036c472f
 DIST rdtool-0.6.38.gem 115712 BLAKE2B 037575dd890512ad1f88a4a04532b6c2b8ca6d5245cccaf7ab1b7f51fad971e449bf280bf5ffdb295f212d56add4e817fff5494b0bba011229cf54d2ed74e1aa SHA512 958e9066a8b3610eb1a78069e615c5bd672aa56b3b45669604b35cd094bb8ddc549d8f373d1ee53864c27a0aa7ee038101b3256c56b3b8ffe618f75a1a939bcd
-EBUILD rdtool-0.6.38-r2.ebuild 804 BLAKE2B 04c44dc8aa39bed1fbcf3ba5af205e0397b9ed61bbc01d63def3653fb249b73317a784831c0520c75009c1ff7b74714615b678efa9e76d1373ffae13a8280238 SHA512 5ff9a237a01054d3fed0b4214bb926147996dac8f5fea90bfe665a9732a1700e46614a408f1c42c803a97d936c6879afc1392cc3106e9fdfb9effcf19589087c
+EBUILD rdtool-0.6.38-r2.ebuild 801 BLAKE2B 4262a1030e88860daf0108c786aaed5248d2e6d28c17a9a6d5d94229ab9ca577d4eac14de46e00244f9e1426ccb5f175088c06097329008350072316eaa3f050 SHA512 2a37ff77e0b4aab624d86d99244bb11b4a010c3d5d403af127f447884611a21ff96cdd3b80ff1b75aa42654636eb0f019bd02f859e76d27df6bbdaa5b232d9c0
 MISC metadata.xml 340 BLAKE2B 6683bd4df51b0c5f6a518fc42dca175f433ee69afbe8c58883f2eb4647e8ab667355701b334cc2c967f5937e269f7e1fe0165a0d5a439881c4d7c917a1a11070 SHA512 c10ea0b20a1e65ffa766d84cc0f6a4fc8065dd33096962af1c0aaea27f5edde51129c987df2c10e39a378d084226c4e9b7cbdcbac6295c4e09de32ac365f7fac
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
index 4633426dab1c..4f90940a75eb 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-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_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 9317a3835e77..a8a1ff874375 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,3 +1,3 @@
 DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
-EBUILD redcarpet-3.4.0.ebuild 1035 BLAKE2B ac6e4808c1b8ed75ec90103fa2160ba09cbdab1aa18b5f561b6c296330cd43a291b973026367357f5a50d06edacd08378217ad5544eb94350a8e5dbd6949696f SHA512 ff5d4889b492d9b75ffde79bcd73b1fd84c6bc01255dfdd3c8071bf971a917d59315b3a1358379c1edfdfdf2cfd8f7276ae6da9f3af11459cd0953b9f41eeaca
+EBUILD redcarpet-3.4.0.ebuild 1032 BLAKE2B 3d177c63e1037e3d7687fc53e08bb4aa3807132a966327a42780f83768e2258d9b949b72cb7b11df40a7eb593b4853bc57283700e95cac8d46324a018e690f94 SHA512 d09fca41e0e4307e5910ba7d4b5e9d3d414814dc7817a1f2eea5ae4f403bdf5d1fcd77efcb7953de09942cf97e5cbb295d58660e828a8debf76e62ef731481b1
 MISC metadata.xml 339 BLAKE2B 3f8aaf2e00581b0e8a62f7a035a0bb80208dd8b4a1541cf77a3550cfaa486e800662c9f251bf02ec3e9a326dfe62d254981f04808b35700130b055488025c79b SHA512 eb85f708675bd9dd3d132e73d14e52689a94279ffc754097a986ddc3224ee21a69e7e81f1bc391725f1d2f1d41f72f8553079a10ffde7c8eb55048b7c6f089d2
diff --git a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
index 3c89eef579f3..1eb5fa7864a5 100644
--- a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
diff --git a/dev-ruby/ref/Manifest b/dev-ruby/ref/Manifest
index 8114f17a6bbe..4981bf63e9c0 100644
--- a/dev-ruby/ref/Manifest
+++ b/dev-ruby/ref/Manifest
@@ -1,3 +1,3 @@
 DIST ref-2.0.0.tar.gz 19043 BLAKE2B b5e90630451c8f6682c572f5115b8a3960a731197eff45963f2e0a538a74cf51e666ced5ba9fd2899c96bce3a2191f091139733b04d6e9dba940d8099b5dc62c SHA512 4407111b3f8497016b1935d3804d0f7d2d1284d31922dc7d1dfb6c5dbfcb994050a46950b0874c3b8f29bde8ac0d35f2edf1dbc711dc5d654d0680b4f94a5baf
-EBUILD ref-2.0.0.ebuild 673 BLAKE2B 0a7301537e51782064f2969e19e6cb274c3593042a9fbb8f5cc182ec06dd5c58b21522a841e5725aec220a0150363de3e873b9a4cfda41868d31d24a83be611b SHA512 ab2ffab04d48485996c0d19705c52990890fc6b5f6815ece5d0c3eb57ccdcfc35377651ead8f3b7694c9530c1d04997adce2645377ecae9a66bc0c9c75618cce
+EBUILD ref-2.0.0.ebuild 670 BLAKE2B b65886212bd67dfa5b669254ced562643396f6ee2c6de9da3b38c25da2406b0c1014fefa09193dd073ec967869ff40aa954c73509f073c99ac103a0dc54ec90c SHA512 a64e812644b139622e3718e018d6fabc442f8fd42a9fd31b5daea80faa6ba3645eeab56dd33b215d75e28b05b7cb8a514b92ed8fc00099bedec564946ad862ed
 MISC metadata.xml 346 BLAKE2B 5f414987a0e4dfc05f303a1bb1ce66a750ea46cb3b788d8a498c7a649dcc353c09d95133825a2cf08a75990d01902b41c7a3226edd1f66c593550e1e2d2e88e0 SHA512 89af18c9b2e65388d2649e5eed851dde6cbe54847cef0b1ccd8bf3a8f632a54b2946f2974b87530e7d8926b72bbbb084ab84a0c9bbcca1af2d48fb02d41c98d2
diff --git a/dev-ruby/ref/ref-2.0.0.ebuild b/dev-ruby/ref/ref-2.0.0.ebuild
index 0afa9f998373..3896a1c8cc08 100644
--- a/dev-ruby/ref/ref-2.0.0.ebuild
+++ b/dev-ruby/ref/ref-2.0.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index c17d8eb98316..7d58d91f30b8 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,5 +1,5 @@
 DIST request_store-1.0.5.gem 6656 BLAKE2B 2bd96d3dd40e846e8b36cae338c1f95ec812d6121db332e60c85b4c8e043fe81229e9e2f7f8f3c1ef3d7c592515bb69d5dae3cc4755f181fd29a1eb7e7c6254d SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727
 DIST request_store-1.4.1.gem 9216 BLAKE2B 06d88b26dfb1834e1a30bd17780e19db75dacfb07a18324efc06dfe17aecad6232f7d1bf7a42bf152c5350926e2d64cfcd8d86f12178d2deb0f8c2f4ea6d95c3 SHA512 83e75e866b838e79c99c60197f5fe5da106619f645d9f244c55e1f1ca4bfa82f0bd67d6f10f74be857b8a359484799d44ec9c4f0b926bba2e2699de231360537
 EBUILD request_store-1.0.5.ebuild 473 BLAKE2B 62fa2961842b571f65ad6e45566255eb9a87cc912fc8a6c8456caabe7f255ed0a08e434c0a6264701e9637db4821775d61bc6d63d53e8cfc43191c5e509d4cb5 SHA512 1dc521601da8da2b5a9892390cf7498db5434cc05b9286ef4bff608bd42dd07a5831d18f983a28487bac49b183b5625b2adfea3c6d7c558d2aad98a0742b8d59
-EBUILD request_store-1.4.1.ebuild 510 BLAKE2B c5212a3b937207c99943dd78f242d08b8e9ede8d4a4c0226976a00fd6bb1168b5a68ee0d2b4c33143e701e089a3996d7ce14b70c6ec8ea7c0e4dbdbaa958ed34 SHA512 5d27f157632272598ccd18ca1777a8b8a8e49d73fb647d8d18e9bf51868ef183a840774f62e5b0ec0373f9ef4c9f3db8b41fa17edbda1581cbed49d418dc470d
+EBUILD request_store-1.4.1.ebuild 514 BLAKE2B 5e8af7b54455b5f3953db04caa84e653d3cd48267545a0d596e8f35f6691d8bdff5f715c77c7c34295aca6349cf66eb7399a25078a0ad10573aadeeaca41dee0 SHA512 91bd620c6883f99d3ba84250ea1c3cd52f0699da100e683671231e8d35537238d6b386a2f5b65c108e3026a8d3584b67a28bd983a8766aa4aa286837cafc2c17
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.4.1.ebuild b/dev-ruby/request_store/request_store-1.4.1.ebuild
index 5addbd29f9c5..45fd904cde59 100644
--- a/dev-ruby/request_store/request_store-1.4.1.ebuild
+++ b/dev-ruby/request_store/request_store-1.4.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=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rex-bin_tools/Manifest b/dev-ruby/rex-bin_tools/Manifest
index 68f443ead46e..dcf9262edf4a 100644
--- a/dev-ruby/rex-bin_tools/Manifest
+++ b/dev-ruby/rex-bin_tools/Manifest
@@ -1,5 +1,3 @@
-DIST rex-bin_tools-0.1.4.gem 81920 BLAKE2B 089fa4725317b3c72166182ca1298833cfe5e7b436abadcbaf5a03801a0fe60aa282a2dd0cecd7d80e3af9a79d4bcf2694c3ee82509c5bc05740e6c38192e9e3 SHA512 d2d595c0cfac254a7b66e072c9cf8bf264555532dbc8038aaf59bd92d134d0e797a7e9aa6cfbf518889ecebbeb93f32636095b571be62214fcf85bcadefcb982
 DIST rex-bin_tools-0.1.6.gem 81920 BLAKE2B 543e9c293b7589792c5cad55dbe7b760b97194a6adb01953ca81ee603e1c576c7f391012dc669fb03d7cf18ceab0ec88e0b4b6e0ac56fe21ffc4c6bc8b937fd1 SHA512 30e9137194b97aae0a0972a10cf415ebd28a11699ce03dda2c32529d985d0376a6028c40bc8570ea8328e076c51b7a52d26872c43074db2a98ed4b2db1969c2d
-EBUILD rex-bin_tools-0.1.4.ebuild 645 BLAKE2B f393dd6f0d44facbcec3ea936a524ec77a751b66b13569ae506bb64444a13e4322643857fc922bde2ab723f5b538e3a1ed115595db14b08c3a6486c76ba460d8 SHA512 f5b667cc4b05564abf9f6a3166404d741e85b20a33cea7d9846ed351423de67ab453ad7cf0c3dd12e6591dcedabbb4f2da027a63f317711ba444e9bb39a4ff51
 EBUILD rex-bin_tools-0.1.6.ebuild 642 BLAKE2B 85a14b250185f0272d6775154c349a4c5f9d5aa4e8f762ddec31bcd04a05ebc5c29cdec65469db8eba611c6078474af08130b7cb713b83da29431e75d21abfcf SHA512 5d2df66415d00d1e508a812e6385f81782376b2679ee0b7adb6a2736fccb3b5671fd5ae31e1906bde23bcecad11ed95662ae69b510d791ae476226fe2338dfb2
 MISC metadata.xml 399 BLAKE2B b82cb7fb695efe7a4ff0e6e83e93dab0ed7f6704dd916161cd4042354714963096668585d421a362add7f73e966ce872d6533ffb6e0f935352f5e21214844b6e SHA512 7d9afbd71bb64675d28110ed1120f45f0369610b4a295fc55652eb75fd1c3bc5ea964635540a9c0161ab1f37981da6ac2c3e9faf5ce239a72b5f90b9dd8aa43b
diff --git a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.4.ebuild b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.4.ebuild
deleted file mode 100644
index f156102d0d71..000000000000
--- a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.4.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
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="suite of tools for analyzing executables to find specific chunks of code"
-HOMEPAGE="https://rubygems.org/gems/rex-bin_tools"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rex-arch
-					dev-ruby/metasm:*
-					dev-ruby/rex-core
-					dev-ruby/rex-struct2
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-core/Manifest b/dev-ruby/rex-core/Manifest
index d6804d7e0e6a..27f4f08e0fb9 100644
--- a/dev-ruby/rex-core/Manifest
+++ b/dev-ruby/rex-core/Manifest
@@ -1,5 +1,3 @@
-DIST rex-core-0.1.12.gem 30208 BLAKE2B d01d8b8c05b3f85c8e85d5f28886766587f60a726c307335d435f6c523bab2009c97855c88f22049a818fe8d0de9940e66070df3620dc43c80facc7d4cfadc1d SHA512 87d2e04752ea019f327f5a3bf07149d3245d2dc709485033ac069f31bb592a4840cfd547042f5537b0a2c90988aff54a6067999e02f2dacc8e0f4029dd9a3537
 DIST rex-core-0.1.13.gem 30208 BLAKE2B 3de93b7869e751574979160d458406cdb83f6683383b6e60e7defe7e02fd7fe02c39589983f6800d07d48527572869f685e57fa8dc3f2a0ba9fb1cf1cbf6ad84 SHA512 d7a402f732620a7ce25d3401fea9c97b4dbac8d37fc8d9183d621bfc16004e2f7171e0346b05fcb64a9c2af8b2b17e32d6ae11268a5300cc31111ab83dabfa9a
-EBUILD rex-core-0.1.12.ebuild 497 BLAKE2B 4dee0e0c939e312293edada32113fee128334836b5e934709941a6f12c88842b836629a3000fb6430384c6fe3735552c8f6e88dc5ea02539c2fdcaf5853f6b37 SHA512 ebb9c07f642a3d7980a85479ec3a9f3f1bfa6ed84ea26333ca493187566ff13b56f30280c1028610cbe23e5b5aac1fb32a403c6fcfee2db328f3a5c21935df34
-EBUILD rex-core-0.1.13.ebuild 490 BLAKE2B 5f98ca7752629ea4567e39b7673eaef09c188da0ffbfb34dc92ba55c110273686c13830afc7eb15f8e6914c850c5927efef6e53268f3a79a80fad3d25f3c3ba5 SHA512 497afef235e7f153aede954bcdfedfc0a35fd83f6288c0a0f9f245249dffcabb1821a6bd07cf3ce5cd3a06257bc7be24714c367da509a3c1bd56ea339d86aeaa
+EBUILD rex-core-0.1.13.ebuild 494 BLAKE2B c081006abe17a587aa479b11dcadea1a66106701abf9327b00449f537ecb7ef52f367afc6a9314b3054f8d5263420190f90be177d76eef7caa514debf1aed6c4 SHA512 a008ab58343720144e36dd860084877a3973fcb58f8dda621191c9338f341f024c860a03e0f757c0ed2eabc01333b6451cd44440fa56aa5d6b8a0b7189cc834b
 MISC metadata.xml 389 BLAKE2B b5042775683c44b7e922a391802f11ccac7ead99797112bfd3858142eb59cae10755d469c9d1a0bc00029cb7106ac3956dd866921f1960c5f45e4440bf5b7ee5 SHA512 bd835c3405637721df2713e6cd302afd6733af5b620e3e02d89601a89ac902e61fa7bdea74735ec6d1b102c9d77bfda18ba660e9c9ccdc3f36acaa531c89a381
diff --git a/dev-ruby/rex-core/rex-core-0.1.12.ebuild b/dev-ruby/rex-core/rex-core-0.1.12.ebuild
deleted file mode 100644
index b7aa58d0bcd6..000000000000
--- a/dev-ruby/rex-core/rex-core-0.1.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Core libraries required for the Ruby Exploitation(Rex) Suite"
-HOMEPAGE="https://rubygems.org/gems/rex-core"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-core/rex-core-0.1.13.ebuild b/dev-ruby/rex-core/rex-core-0.1.13.ebuild
index 44f7cfba53d6..48969fa3f4f4 100644
--- a/dev-ruby/rex-core/rex-core-0.1.13.ebuild
+++ b/dev-ruby/rex-core/rex-core-0.1.13.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_RECIPE_DOC=""
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-java/Manifest b/dev-ruby/rex-java/Manifest
index 3968b13cb1a4..eaa89a01e594 100644
--- a/dev-ruby/rex-java/Manifest
+++ b/dev-ruby/rex-java/Manifest
@@ -1,3 +1,3 @@
 DIST rex-java-0.1.5.gem 23040 BLAKE2B 27789a55c6922770211285ef665221c9619a956ea874534f029a450760fca8c5034a715d9aaf91864e624363efe5d9f966be7b00c5c7133284b0eb591034b36d SHA512 990f989a19cdb5c6f87ac5b57e500fa1bd7031dd867e43c6b451f538c1b581b57ee9908b40d8a37727c45883ba17f466272e739913ccc2406b69c1e818de5c7b
-EBUILD rex-java-0.1.5.ebuild 441 BLAKE2B f5a83a481e9d865ed1120e8664345d0a9fde8571ee6da4d7d683e94c713d82100295cc07f5200d76771cd2812e472617dc5d82d99cfa28b0d765a074743ebec8 SHA512 455c6e61a39cddeabb5928f3b546f1c3f7d786ad3e76ec947c6778046bedf168a7a98bc07ee06b5a5d32dece113f03df0ff24fdeaab1b2d09086681d55f11e6e
+EBUILD rex-java-0.1.5.ebuild 445 BLAKE2B 4da0c3a70a2889867368fc327b30877a1eda237ef1d98441349139a42e5f822c368bedc158299e63444cf6e9d85ccdc7cbacd23be9032ba541bd9b47c2a6d083 SHA512 1275fe4d6344c13a72da166ba4d7a83155ddb7bc03fd6e9fd84233dca8e990eed2e37a45338a57f2bc557d8918e4808d2b6d7e2ee38e3ccf4543cee1b0bd6e0c
 MISC metadata.xml 389 BLAKE2B bd09e6d2debc335faae3bb86ffb0f2cd04995182954de39f516b50237ab76fbf05269c2940c0814b65c067979b2095ab7712e8f83426e5381d951d0306a91f06 SHA512 ade2c3b7aa2a8162839d0d6adf1a5437559076611edf25d8bebb3d546e29873a79ec895dfc2615ad080d6e1728f20735a5718c49ae95bd18bb52dc7530cd43cd
diff --git a/dev-ruby/rex-java/rex-java-0.1.5.ebuild b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
index 5c4ad983f3fa..082e9586811f 100644
--- a/dev-ruby/rex-java/rex-java-0.1.5.ebuild
+++ b/dev-ruby/rex-java/rex-java-0.1.5.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rex-mime/Manifest b/dev-ruby/rex-mime/Manifest
index c2f0b77b4216..39b2ee420037 100644
--- a/dev-ruby/rex-mime/Manifest
+++ b/dev-ruby/rex-mime/Manifest
@@ -1,3 +1,3 @@
 DIST rex-mime-0.1.5.gem 16384 BLAKE2B 1c1cf22a8233420f8b29d8c58356192053f109c6372201ec8485261928ce32d7e65ac8395f7399ff4f1b64c6a5505f6fae35c2f263bfa7f55e25b784bbc3bf7a SHA512 695d2c411b26cbbd50ffa5b184ac464af2560b9e36d39c9c3ea17ceaf4e8d5052500162cbd9395259cc3c426df50a56c21c4d0f63e238e56454c6666c3d10b5e
-EBUILD rex-mime-0.1.5.ebuild 525 BLAKE2B e9ead6b8df7a1baf82637c68890a5bb257c3f69597390b95406c92d2b45f02c1fa5e285c3db63be10971f8ba1a895afb778ab28c1b813ea6e703d1ce62eb6e5d SHA512 67fe067fbce2e1c4850d85b0158130d6b0857c1df29bfd889ba8b4838350bd21f5723da25baefa9479c659e71bd8a7ca2eba8d3899f5e221ddbe4b129a8909c0
+EBUILD rex-mime-0.1.5.ebuild 529 BLAKE2B 95b0e5b29c01018c2b4d76eadeef7b1c8f0cfc246ba4cf0e5a9c982aebdbc18372456cccaa43eaa9d9bd4c04c5258195a0967df9a678334555915d1ee88edcd5 SHA512 42df511ce79180caf37e0c890dedb59904240cf8833cc292441398809376bcd3d2078b45626a55a7549c056a1ab64040927e4f1e0644f4052f2369272a963997
 MISC metadata.xml 389 BLAKE2B 7fb4cb79ebb873da46fb80581ef7a2144a41d70085a2e48f8176da00ce4812e9a2561fd0fcfd5c4e05b8d161429cd171787f8fdac5e079df74f6d277f0f04c68 SHA512 ea6782e85b7b3f06cda1b8ad29203f9bc787728adbeb247ad210070c8200aab87c6789faf0f430d6aa0fcd5571c38eea751636759b500714712b8025ab93be6b
diff --git a/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild b/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild
index 66139c8145ff..7da5945b6b4d 100644
--- a/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild
+++ b/dev-ruby/rex-mime/rex-mime-0.1.5.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-nop/Manifest b/dev-ruby/rex-nop/Manifest
index 9d2b85c2fc22..db45de06ee6f 100644
--- a/dev-ruby/rex-nop/Manifest
+++ b/dev-ruby/rex-nop/Manifest
@@ -1,3 +1,3 @@
 DIST rex-nop-0.1.1.gem 27648 BLAKE2B f0fc6452929255c9fe25af2045e72ac4f38540519a7e51fffad83613bf3886e1da3f7c8949c1d6668e4483eb58e48a2f68d0517c366c49c5c2da397577dc6544 SHA512 f0a80f948189eb3c775739e7a492882ed7a647f9a79d1cfe3658f8905b8316a386dd0c89da5158eaab351f6122bf5bbb0c8270424617940fe48a1270cb363da5
-EBUILD rex-nop-0.1.1.ebuild 529 BLAKE2B e6fbbe835e72d4781c334fd1d4e856571fafb277422d80d83cfdb9c2b7e1c095cd77bfccfa1ad4422fb96bd811a888739688e8907a152f0f5049becccdb52080 SHA512 b9cf63f692dfab4a59f88f33f1c9553b181cb5fbd41bf9a61247544479ec409752134a8d30ba31c3d0c776f05f2e2e9aee45af262b813b8560f343f004345e62
+EBUILD rex-nop-0.1.1.ebuild 533 BLAKE2B 7c670a772ef446bc96a3737382345deb728c98db5e52040203ed142d39eacf6946f184c0c35f5d75fe3e3dbe1e916f95c662893a1634f4587b0bd3c7456edd2d SHA512 23561968f167b7620022625ab38aca3d18757f4c6d3dc46396591c5c7a5e81537c5cc0d541178fee7b012c8aba81dafbe9a9bd008de7ba3cb774a63b6858b4c6
 MISC metadata.xml 387 BLAKE2B e373692fb9da0863eaa831b5a51d7bd172a65c0332365dc000a67567a0bc0038cb7a61bd11df82f8159ccf3c123599e7fbb89abf84970d48a64ec5fa38344689 SHA512 db3deefc5b999d85a23c4b4ac3f77175ce26976921ef937117ad2b653ce10a324668a78d1e5fa3b0cf49d3013387f1f6437f9769ff4abbd7e310dde9646cda55
diff --git a/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild b/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild
index f322d509abe3..ee3c4ed0c561 100644
--- a/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild
+++ b/dev-ruby/rex-nop/rex-nop-0.1.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"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-ole/Manifest b/dev-ruby/rex-ole/Manifest
index 711e41a24e45..1847c440c70e 100644
--- a/dev-ruby/rex-ole/Manifest
+++ b/dev-ruby/rex-ole/Manifest
@@ -1,3 +1,3 @@
 DIST rex-ole-0.1.6.gem 26112 BLAKE2B 1812b3f3c9b0b4f115efd66d1fa29cb39370e58e780695127390987dbb4b87647f2e0744b88ba4ee7b9ed7857155c8f1d32dbe6d090a7d3166ae5928d18686e5 SHA512 5fae70ec85058e3dca08fdedd595fb27b46de263aa727fd291606d4f8f226bc0d9a2f135bf4673a8e389d6a2e932e7514eb97954f765c1ce9401233ac2cd7da1
-EBUILD rex-ole-0.1.6.ebuild 488 BLAKE2B 388162d37f1ec07bf68a48b78cd6af18a33f709bf23195dc55c742e2674e45ba40c697c1d95a3e24e3ddab69b20678e42e0f34ca0f8cac72b163d6db9c9a10cd SHA512 fd80118aae489c1850834a1c5be7804ff59723bae97bb79df09c7b8bed907dad01194e209ac897be42a23e1d3f1fdaa201296cb36d4fd71ae6d766d63bdaa6a4
+EBUILD rex-ole-0.1.6.ebuild 492 BLAKE2B cb76f2855757747218f2163ee4cdc804a47c812d6f179dbc9828087af8890117a3ab0b32970c1e046df7d52569015d06e5aa4d64c8cbe966f798797e46880c2c SHA512 f85d743036c7f6aea7019263c91cfaad91379593227ffc96037048842583ba44304e93e8877c9b8426ada94cfef0be21e90692370c6ab8bddc2e94da75e7f9d2
 MISC metadata.xml 387 BLAKE2B b888d7a5a8d64ced8d3357ff94fced377985149874143f636d22eaef6861f27444d49db5db80f3d0cb600e5cd316541b23a47b7a947be387a93c217c82aae7fb SHA512 d215a2f100976cc348cc12b109f564c1101ffc76826647a20ab5df0529dfacb5eccd81770bb716b509de7dd232faa2c5ad275bbf33607725a6dad3f83d6deac1
diff --git a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
index a0814d9c4bc3..f449feca15c2 100644
--- a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
+++ b/dev-ruby/rex-ole/rex-ole-0.1.6.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index ec853fb0b539..735fd1d2f60d 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -3,5 +3,5 @@ DIST rex-powershell-0.1.78.gem 28160 BLAKE2B 922a4a6f8605335c664fbdad7e6214bdd48
 DIST rex-powershell-0.1.79.gem 28160 BLAKE2B 0c8deee7ff50741d7ec868f1726b2e3a705ab6d623221b15a0cba831fc0b5ab1143da9186940f73f48dfd7f448e018421a098b673ffc846c5b726128e5a533df SHA512 e7b8680b291827700f0b1eb150205ee2e6bf795029ab7fa0d2323ca345b7a73edfbd5f848dbc5b001354d1649e0c207e5b96d55e9b68b0021457b63d97e64213
 EBUILD rex-powershell-0.1.77.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
 EBUILD rex-powershell-0.1.78.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
-EBUILD rex-powershell-0.1.79.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
+EBUILD rex-powershell-0.1.79.ebuild 541 BLAKE2B dd17300f031d7784704dd2f9124fb06d3dcabb778bd86c25ab0ef1cfec0e68c0c7a7ae63c439ca8c094c6acaba53508219017253d510ec8958c58fa23a1b9c78 SHA512 677da4c5f76facadc1e2eaf4cf0e4b351f3911b83853f36736c9539b3c1e282829237bf2d90957952b5bff32493b9fb6b0fd556e63729ce26f4864e9b6113e1a
 MISC metadata.xml 401 BLAKE2B 9ced95a371f0f76b272ae92fdb6955e87481fe0e5054d87ead013f86a91e83573aac67611acb9da9c765b8e6970a71cc99714ce9e6b0a52d66f7da5f2a365134 SHA512 1960bdc2bd8ecd7b03969c7dc24374ea46e45a7b7218c7d5f0677aa6906e191908416919302f5d9082c35021d7be414040852c33e457eb6d8ad5030e95b4bb52
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.79.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.79.ebuild
index d44f1014de16..dcab5e40de58 100644
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.79.ebuild
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.79.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-random_identifier/Manifest b/dev-ruby/rex-random_identifier/Manifest
index ff549234c6ea..6ab7135538fc 100644
--- a/dev-ruby/rex-random_identifier/Manifest
+++ b/dev-ruby/rex-random_identifier/Manifest
@@ -1,3 +1,3 @@
 DIST rex-random_identifier-0.1.4.gem 16896 BLAKE2B 37c1011b91dd16a82c0ee8ff1c96b0263c4842503826bae327d3a6d3b61dac77620cbd28cba350c0cf56bc5fc480bc37663a78674d0c7c8d8d6bb95e046e9559 SHA512 8e302a511a0540f826ddfa6e51c5b29da0c42ef6bd3dc433d6624688efba245c1df3903dbf37aacaecdd39b53f721e3d6b4fa8247f8cd31e7679ff96293094f7
-EBUILD rex-random_identifier-0.1.4.ebuild 571 BLAKE2B 14fc1548b1c0284be4d5d162dc841bb6953c94e41d1f3c6fe83b43c5ed2dfd82784121cc60fc7b46ff1dd59ffc2317490edb84d4c74365d9c83459ffe2458462 SHA512 d9dfc852413874a5b54a5dfea67355283be4360a74a12ab7d4a443f6fdd96b1840bd8e420d06b2655d8f4a8ab3816727bda348db5d6680a09d398994494d4157
+EBUILD rex-random_identifier-0.1.4.ebuild 575 BLAKE2B 01292dc7db1fa5d758d5b87c4c2ffd9667590ae75e0faf98350a82b1bb0186af4c4d8ea3a2690c96159db76a4e8ec53a55bf51eb12e38e40478ceef7eb31a90e SHA512 00118a63a0d51c7ee1cfb3da4cae839398f709065ee7d337623166f9f7f5a189ffde485e639d8593625c171ba79f051ecd288f78c31156ac4dc75e2f5f08e668
 MISC metadata.xml 415 BLAKE2B 4ad85703d580032450110f21f844d19374c9104ad88b215d70688e8bc6b175c5d706a1afd793196440a1ae39dedf9342c19d34a0c295604d3f15ef112261a9e3 SHA512 9da0baa565c2f611e562aa78eeae7755603721a3d934d63552b8858efda0d379b2a479735d256b318a440305363776b8f4f352ff10201be2dd0397bd38cf0abe
diff --git a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
index 2f06cc7c2317..d59ef975207f 100644
--- a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
+++ b/dev-ruby/rex-random_identifier/rex-random_identifier-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"
 
 # Upstream has specs but they are not released and upstream is not tagged
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-registry/Manifest b/dev-ruby/rex-registry/Manifest
index 805e22d33207..1df8ea7cbab8 100644
--- a/dev-ruby/rex-registry/Manifest
+++ b/dev-ruby/rex-registry/Manifest
@@ -1,3 +1,3 @@
 DIST rex-registry-0.1.3.gem 16384 BLAKE2B 9db5f9674b8d341797ea797f5c5a1e43900f6f4c4e563658fbe55fcf43ba1126067d0e822df3cf21695143bd70309d7499d708cf48b80e6c903e06e7d0e8acfc SHA512 cde5350945e8aa7cfa0dc01c78e7a375d1aa7174c2954b658ffeba39c81d638b1d614866cbd0f8f8f417f1831281cd43126cde158944903e36c8dc5ce79773e6
-EBUILD rex-registry-0.1.3.ebuild 528 BLAKE2B a1b5de87898e5fe2e387d56d0a09a980a62c2bd93952b6a6b0e6044d8ed4d6caec5f3de40b53bbf20c41b292dc1201566ceca8d317cfcc77d46a4979e3a1319d SHA512 79ea6b4091b5528e593ca66fafc73a48173449ebcdb0fcc1da76029b99b3318a5d0aa10a7e28cd576a3e2d42453d12ff76bbfb3bc027288664e1ab750b490fdf
+EBUILD rex-registry-0.1.3.ebuild 532 BLAKE2B bb18f1986f9a805b6509c3f5a9a8f83272db1a8faf74fa56bcea8f2e9ee4497ff21ea95a46fc08e768e51b1002bd2bd23557262f7365edaf6634e41265191c69 SHA512 b7bedfab877084f3bb9489593dfcc47d48a62ba97b1645489b1b4fd5688d5b0f1cb0e320958da3399504eb2b3db894361cea41a9d48491a2e33654b385f13bb0
 MISC metadata.xml 397 BLAKE2B 9f1313db54d7a221e512cc9c4d1d4f02f48017a2414bbafa03192638203c37fcb29a5e9b8c20f1ae79c3956a3d30813ea391ed463dc8f18aca014cced68b046e SHA512 e011f42529d96ffe371032139c75c3d5521d9500825862cc93430595a25d9ddf2971488101923993f179036d54cfd44ddf63da98c9eab3803fd27a4f4fe7b782
diff --git a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
index 67eb86064708..56c2a97dc4af 100644
--- a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
+++ b/dev-ruby/rex-registry/rex-registry-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"
 
 # Upstream has specs but they are not packaged and upstream is not tagged
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-socket/Manifest b/dev-ruby/rex-socket/Manifest
index e83db4306c67..a811189d4a1c 100644
--- a/dev-ruby/rex-socket/Manifest
+++ b/dev-ruby/rex-socket/Manifest
@@ -1,5 +1,3 @@
-DIST rex-socket-0.1.14.gem 40960 BLAKE2B c2d0c4b77ff779fbc4414ef356b10e7c73a1a851571579ca0b9cfd70064b537dc8ccbc578db99276dc6fc3146ddf8830ffbdbb20d92e73952e7696043c826831 SHA512 19e0d1e3cd9abb55772bf125b5e78fd79231ddcce4d7a7444cf665f57af492377abddc2bd8b72390c870e9da65cc8f2cafce114166e06a86ecf35b9fd0868e29
 DIST rex-socket-0.1.15.gem 40960 BLAKE2B c452a0e8f95d3a5e2820d55e25d077aa594c9eba4982a953d4312bac4d5d32bdfec8dfc6b2a1f77ce9cbaaa60d7c3f0f5eb9da7407c131c89cf1eaffd4dca03c SHA512 edcc01e5c1235abc41a5579b56a04cdcb34710d24225fa9e925ecd91555429071eed281591df1a97cb8db035d63aae0c7a86aa93dc96289f42d1a56241b95fbb
-EBUILD rex-socket-0.1.14.ebuild 465 BLAKE2B eb451cca321ec65d3dbbeecaf71c63d92785ddda748c26444b92ce349ece7d8a3b9225926dbe3d8a7ecc0ed9c77ae57e5ef14bf3d53e69900d0f537c7f83443c SHA512 d681cd99bf487e81db258cb8761ea5798ef63a0bce60975bf553c854340535ba5563b9eba20b29dd295c1763897f6e8b0a9e529658c6aa7ddb7bd451e768e048
-EBUILD rex-socket-0.1.15.ebuild 465 BLAKE2B eb451cca321ec65d3dbbeecaf71c63d92785ddda748c26444b92ce349ece7d8a3b9225926dbe3d8a7ecc0ed9c77ae57e5ef14bf3d53e69900d0f537c7f83443c SHA512 d681cd99bf487e81db258cb8761ea5798ef63a0bce60975bf553c854340535ba5563b9eba20b29dd295c1763897f6e8b0a9e529658c6aa7ddb7bd451e768e048
+EBUILD rex-socket-0.1.15.ebuild 469 BLAKE2B d7cce4d8f62c31881fc345a96a572ad53c6953bfaf0c2649a88784108bb377d7543ffd23763fc8455e75a5f1890d6120c550c55299c2269ba333dd5eeb134c02 SHA512 d5fdc53a71126ab623066b3b457c51a9a2bb2ad0ac81f1dcb0a24bc3e23ad99ebebab57bed681b9ef0135a15faf50dfb23fd742ab75dcd1d83f5f37a127deb9a
 MISC metadata.xml 389 BLAKE2B 544f3d8d83c609027ede420284a2872d974dff70a2da51590de644432807e6d4e5f0f466d6928ef4f519d5537f368e70149db370bf4051c85980cfc25d34b6a4 SHA512 d2b55e0366bd178ca9117f1768f939af7a8967b8f02244bed2839b69f4f5ef8a8d6f13b1d6014c8f2ef20dff7c9def63592c80c2b934b172103ace300b441a15
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.14.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.14.ebuild
deleted file mode 100644
index 56ddb0e1417c..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.14.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
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
index 56ddb0e1417c..e5f80844af5d 100644
--- a/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
+++ b/dev-ruby/rex-socket/rex-socket-0.1.15.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rex-sslscan/Manifest b/dev-ruby/rex-sslscan/Manifest
index f9b8ce2fd01e..b7647a6301dd 100644
--- a/dev-ruby/rex-sslscan/Manifest
+++ b/dev-ruby/rex-sslscan/Manifest
@@ -1,3 +1,3 @@
 DIST rex-sslscan-0.1.5.gem 17920 BLAKE2B 735fc522593cc1caf41c5000232afa64e88a9be83cb756b91d662b9bc8ed1ca81b1a2302325a687e851b22d7914b66fafbf7d18fdf3ea3562dd25b64543c0383 SHA512 05c7606c722fad7be5f21f28de34de23882a31bf4fde1000f11d556740b14102e495efd0bc3ac478aee64ae417e761ce9b5ae80f1c10f2410828610611fc3dab
-EBUILD rex-sslscan-0.1.5.ebuild 522 BLAKE2B 90799ecf3445ff641a416f2edf7d105e714d0b7da2a22f5c18a39727bce131f9ed733b9cf2840e9fb387aaa0ae6d7631c1e47213da11bbfccfe14d0567ee674c SHA512 26c183c90e27660c7b9be4ac6a96f1f0b5b369600c73b8e933bc01d07926077f5e19a4cc08276725cc1244b6edfd878e74e76636d584cb71c08667a42de56b4d
+EBUILD rex-sslscan-0.1.5.ebuild 526 BLAKE2B 99f858d557866efd8ee60616076cc1c9715bf1b70cf6b0c8298076d0a1fb226960f729a8d54916c9545985084edbf372457448b99e242557e7b5f57a99cb6f0d SHA512 9ed5e3d1be2f146e9fe389e23a11ee79010dd990f5f7454a8e83cd3a6797f3d923dc5fbac201357e2360425eaed08ec4422c5c474da25ac71a9ce857177d46b7
 MISC metadata.xml 395 BLAKE2B e446728b57826329bf8900561263f65f7c47d085a134780f4bf4b0ddb146999a7ce0c10aaeed2c06fab41bc21f0a029108a48a8c9d56a32d1378d34ae8bc9804 SHA512 75cd04b87c0234b1e4a415f9537a6f8a6ddde8314ce2e442402035fa6bfcdbbfb1c6248cd7574821e79597807b524143112eefe50dcc74def7cd9c7db3a1ecdb
diff --git a/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild b/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild
index d83f6fc334f8..78e5105a29ef 100644
--- a/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild
+++ b/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.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_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rex-struct2/Manifest b/dev-ruby/rex-struct2/Manifest
index 784cb0fa0bc1..37d89bab76e6 100644
--- a/dev-ruby/rex-struct2/Manifest
+++ b/dev-ruby/rex-struct2/Manifest
@@ -1,3 +1,3 @@
 DIST rex-struct2-0.1.2.gem 18432 BLAKE2B 1ff9196e38ae67b87f4348394da3b05759548dbfa29b8e1a4a891a02cc75a1e02b890bf3a53bb7f274f9a5336aa46330efc38dcd50fa5da25e74392bc78a2b91 SHA512 c8b549c89e5b884a6ec6ef9a04dd2a3400bfeb885b742f1bc256a200387bcbd8ba848ad1e69a4c0c349516a62c04067a8bbffff04cb5c581f51d0ff91a142e6b
-EBUILD rex-struct2-0.1.2.ebuild 514 BLAKE2B 3a6b04801441a2cbf5889a012a34ccf258f2bb614c8f84cddf18d130b77d9a59cd6eb2b97e841ec29df4a1e6ae47878543c15294420ee17f4ba42d7e64d29e0c SHA512 7d7195f2f58b9b57d8e5fbae4f10fb326b7e38e1ead3d0469b9e8aae584a8d291b7abd1f4d99596f5439529810ee1a07a1d0892b1363b9389379663fabe79f99
+EBUILD rex-struct2-0.1.2.ebuild 511 BLAKE2B 28696d379bc77923f1393b176e1246bff5f8290697f9c2a5229d5a764d06e43e1d44f8ae6d167a329170b545ca08ebcad0a7e4b31a17f9fc6e082173de7b6a63 SHA512 42430b5c1856e7a614fa019d341577cf4c5e3a98d68e9eaffef9576d5dd828940ea0dfaa18fcd730c9722cca913c73c6e484e31291dcbf53d621548c9aaf1de6
 MISC metadata.xml 395 BLAKE2B bba037386792b3b940892cdc151b101878c5808c894ee42705daf52cc02311ab791f0509488aba1f5644a5fcb10d8f3da02d3bb201fef34edd4972f2eafa25c1 SHA512 5123190d580497055ed2f29dc79a4f6c5a21e62cc95c90e25e6ceab1a62d08faf8d766334b1d306052d6543c6903b665cf45b17ca17fd5731d93fd0341891148
diff --git a/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild b/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild
index f581d3cb9e39..0326cbd303c2 100644
--- a/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild
+++ b/dev-ruby/rex-struct2/rex-struct2-0.1.2.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # No tests in gem and upstream git is not tagged
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-text/Manifest b/dev-ruby/rex-text/Manifest
index feb420e1e9c4..022d9cce118e 100644
--- a/dev-ruby/rex-text/Manifest
+++ b/dev-ruby/rex-text/Manifest
@@ -1,9 +1,5 @@
-DIST rex-text-0.2.12.gem 43520 BLAKE2B fc9ce7134dd1ba8ba21ad6a27ae913d6abdc50d9436675f2c847330a4126b404271bcff6d46c15fcfd64069a2cf92142c8511952abcd17a75d10b776f3ab9bfc SHA512 20ff6df7527f06f3970cd5359db42893bcedf5b9432c8b349a71d22af4940a2b6fb3ab455cc9fd40301102f29e6c2de07043faded0d63a19cd951b3402eafa8e
-DIST rex-text-0.2.16.gem 44544 BLAKE2B 8ac7be3fa894fa47229aba39be046cb4e6f40a47f65a4d290e7fdc1756b29b063799429e3ee793e69f19adb0c5cc589ff3c4c2261d2a5c4f4851a075bd98eec2 SHA512 8b7cf93579abbd67445de9c89469f4d717fae15b3b1d44602733c91cbba024788aa8c76cc45c8bc6351062571b2c938d33c1f9c6059a2cc1c1b604bf6494526c
 DIST rex-text-0.2.20.gem 44544 BLAKE2B c446dfcbb54ed9cf57f019f2158fdfe37ae6815f3e02627564e0a0e472f56ab301a805e12f4aafb3f1e8e3052b35737add225c16979bb6dd4a7988b08062ff99 SHA512 0043abccc14dc70c750edf42f405368ac305158bcad98586f169b3edb808a5565101a302b32afd5d916a96a7cce4e2e27f2b0e1bcaf152367aac8bafdfbf1474
 DIST rex-text-0.2.21.gem 44544 BLAKE2B d905973b190b84f048ab26774651e394d8902b81377cab92298800b462e009b7ed8b8ac8f8c10f3726475bfe2a696a40655cbbd6efbf820974c503df37f07d10 SHA512 9504b78f77f4c00cc42e43313f48b058ecb5fb8c183225e580b8750810c26eaf22949793b46d90e5e36276d25a419153b38ea387fd28bc9414de62843e3efcba
-EBUILD rex-text-0.2.12.ebuild 506 BLAKE2B 1aadc0a8678de99d5ca6fab07bbc5b622356a0ce6ef1b726cc525074b552c861077bc2db1905c92e996ffd79f43a91338dbfc8b9c65e9acdb9c492b7606b863e SHA512 3248b1ebad78b268444514940470966c4fdbd25ab2577d1890bb7b7b8e182bda6fda94f90f5054a6583567b25a566b7d43ba3f739ac9ee9698170b5269b438aa
-EBUILD rex-text-0.2.16.ebuild 506 BLAKE2B caff75c6e8d09729f0699b7ba164f7120ee971c6ef63195ac711edaf5d20a33ad7cadb12727e57ada1dc4cf60928af992ffa7ca61870621c857dbeffd1654daf SHA512 73b3908dc76cb1136f143a19c9c36fccebc2e0a50db45005feb451d11ec1cbdd024c263a2e665d40f51eefd699ea31f71ec1b6f83f2514e74353fcbd8b0a4aa1
 EBUILD rex-text-0.2.20.ebuild 499 BLAKE2B 6b33b438b6a2fc0697ffaacd68b65d0ad7e154a767b83446ceb8b04d8047db86c2d4bc4af037e72099894724805c2944a0becab778f5c9101f0c768bc92003a3 SHA512 285f14b9a7a681c659e09c44e29b9bf874c3ae86459cea5199470220ecda001553fd1d01660eabfc917c7c7f627d7ca929ccb84a976a25cac62bc525c7dc180b
 EBUILD rex-text-0.2.21.ebuild 503 BLAKE2B ac23160287da333f15a37358d9a0312cc6fe04c59c88be8c631ba1c9c46225f1833b10219fdb8027386602ad7b43161ea512ee8faf6e1a64266880c64df77b72 SHA512 0e17448ee6fded7a2985e87f05b72b91add3f455e86152e10996a67b00e45b02fd660aae2e4e66c50aa667b4d86e1dc3097c5ae71b04ede70fc1126d8314c6b9
 MISC metadata.xml 337 BLAKE2B 5309d74f65e9d31fb44761ea01a28cddc4a698ec2700bf2a18806871b42370d931405eaa6a2c8093d7405de11defe6aedaeeb72ea585d7cfefd970a323cb82e1 SHA512 24d194089e40848fc1ccce781e29de3bbf56c536a4f5fea036d2bd783483d2018b1105a4be88b8fcd57408651d3cac45ca649a111364dcdb834014bc6bda7bb8
diff --git a/dev-ruby/rex-text/rex-text-0.2.12.ebuild b/dev-ruby/rex-text/rex-text-0.2.12.ebuild
deleted file mode 100644
index 9135f91f3746..000000000000
--- a/dev-ruby/rex-text/rex-text-0.2.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# Specs are not bundled in the gem and upstream source is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for text generation and manipulation"
-HOMEPAGE="https://github.com/rapid7/rex-text"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-text/rex-text-0.2.16.ebuild b/dev-ruby/rex-text/rex-text-0.2.16.ebuild
deleted file mode 100644
index 7348e1193fea..000000000000
--- a/dev-ruby/rex-text/rex-text-0.2.16.ebuild
+++ /dev/null
@@ -1,23 +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"
-
-# Specs are not bundled in the gem and upstream source is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for text generation and manipulation"
-HOMEPAGE="https://github.com/rapid7/rex-text"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-zip/Manifest b/dev-ruby/rex-zip/Manifest
index f5ffd6b6d22a..2c9741c233e3 100644
--- a/dev-ruby/rex-zip/Manifest
+++ b/dev-ruby/rex-zip/Manifest
@@ -1,3 +1,3 @@
 DIST rex-zip-0.1.3.gem 23040 BLAKE2B bc823e7d53c8a7245d568ee2cec013e7bf8b7c508409a0668481e323ea5343230c5bc64a7173f48a7ff966d6af5a9e50e3a0e2d64dec06a699923dc3182a89a1 SHA512 f92d64779ddf943ca4855c5b9c567a0d995ebb6ace93ac8da12a7f1dc3ea350d492d3d229d3950ffec32bbba29fcd226c27a5be81e3f45d6f0edaa35ebc70047
-EBUILD rex-zip-0.1.3.ebuild 571 BLAKE2B cef84a6ee00dfead5f56369cb8e6ba7019c9d6fd9c47697e3df376181d3684d54fe17e805ca73ede31540752734d04da136a4348bb1f64e6c62a36d2ac5efa63 SHA512 aea72bb8c90447b35ac1985300a4531180dfa155dc437065addbff7a73b0d977b1ef3162ba240ca28ceae016d4f7aa1ebbdcfe2d6e6895f38331109d8ff63ade
+EBUILD rex-zip-0.1.3.ebuild 568 BLAKE2B ff5fb36e3ced41adfa970daed380dbcebdcb86014f0c473ee76d94088804373a7b15b688657a22e37159bc59af235ccd077f4e4b44c4f491924d1805e4f40d0f SHA512 971bcb08c198e5395d6eaa1f1e7b10044dc6fc181c2d8a16ab790ec33fc0ee596834147cc7d170386e79de9df47ddcd251954e4f5a7b7e8180e2157210867260
 MISC metadata.xml 387 BLAKE2B 0e3ac5ec5b97816fe3a588ab5a4f19d8c456461c1cdae57b19c29cb58f49e2259dc7e2c708f4b7d9345e4c26d2b7e03648dd4fee009ca407ad5619fe72c53db6 SHA512 dd9953db84c05af8e5842ebac7f0419470d14fddd595175bc34467608f8d8fbf151f781c81455386718359e44a145f7d5def83b5e6ee7ae2d86cdaf580e701e5
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
index 467f89a32453..8e4c1d256ce4 100644
--- a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
+++ b/dev-ruby/rex-zip/rex-zip-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=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # Upstream has specs but they are not included in the gem or tagged upstream
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index d183e4d645aa..ab5f3e10913a 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,3 +1,3 @@
 DIST rinku-2.0.4.gem 21504 BLAKE2B cabb91710eca3f6d4985042045c1ebd37063abc466a2071c9a1c2f16f6efcdb80914eec855cc5c0795b428b285fcd6d760437ab2716cb3358e9a8e96b7916367 SHA512 fab4b47a22153d96f71e8b3c6e91595ba3ce97002233b035ab8ebcd6fb46a8e4ca2f82e49ed6d7a510338bd2ebec1b2e67d9146e589535fc8a072ae69e39d58f
-EBUILD rinku-2.0.4.ebuild 625 BLAKE2B e10d187fb14a32083af9c10954dcb6aa790af49be2e3be55ce30e01a0fb453e286d79e08579861409c717b64264a2e2f2ada6a08f9bd6b1102c454c5eeef1141 SHA512 c15a7e0102eda537add3b619962143fadbafb8da3508aec0ad2968d9a48dd296cf31c0f6d0ce13cdf55ff791c2002948e373431d7fe9e2983c0f826458c61ad3
+EBUILD rinku-2.0.4.ebuild 622 BLAKE2B 2f2e73bb2d048a87354b5295cdc778915e69d9c46184ce827291c2b11bee6008b97b86472fab70e2f4bad72bad259f2f7be68a051654b95927a24b763da69b94 SHA512 d1ba75824dc605f62d06f944aebb617c624fad0445ab3ed836080e44411036cc7e5956a120923e38f22e7d8f9bb46fb1c248b02ae77cbde8d2cab6b6c100fbe9
 MISC metadata.xml 335 BLAKE2B ac11d84fdaad5f557902d13fb489bf0bb00686e1f68adc8015255171847f7da151d72f1b6f8e8fca6106ea882cbdfeb8b9cc4834f248a5a0124160f0045739a2 SHA512 84c583662f162f0bdda4962c3a4ca5c12e70d7aa0ebb9a8f8001a997074953843b4c8137e75260ef4c63782a13bd0a53b4f8cd8e518fb0f817ca71faae9b4fa0
diff --git a/dev-ruby/rinku/rinku-2.0.4.ebuild b/dev-ruby/rinku/rinku-2.0.4.ebuild
index 63b961d6b546..7731dbfffa0c 100644
--- a/dev-ruby/rinku/rinku-2.0.4.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.4.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.markdown"
diff --git a/dev-ruby/ritex/Manifest b/dev-ruby/ritex/Manifest
index 8e6790ea4a17..fd3c785c7c1d 100644
--- a/dev-ruby/ritex/Manifest
+++ b/dev-ruby/ritex/Manifest
@@ -1,3 +1,3 @@
 DIST ritex-1.0.1.gem 27136 BLAKE2B a336f795f449b9f16d2e10fe1d866d11aa7b96d1800e157e410bd5a94ae018a4706506e4b27ff642281049ec36c4fb70ac45d5a20f59f50fdefcdb3398e1336e SHA512 dd3d13f1fabd6b7c218642b703e2426385ae14a5a5dabfa1d78ff163df0bdfeb38e9a68dd7ba2b1bdb68b122f7b5631c399f23a13fde5aac56159349c2f1de4e
-EBUILD ritex-1.0.1.ebuild 711 BLAKE2B bd1190b1f98ae4daec4fd1bfd9064ac895bbbd102efe6ed65c44996f3eccae0b94635c246a7fd851ae2ba8a2d1b325b6c41d4f0335a6836e2b16dd763d1d7d3c SHA512 b6cd94802d5aedc7ec8be99339b5f5023f5f1913f871eea7c9ca9af7e9f3d786694cb263049d73794c38e996f8669efe93f14cff53c6e65ae7401102e91d1f4b
+EBUILD ritex-1.0.1.ebuild 708 BLAKE2B 37019ea3411d525ea5c87c36819af1fd715bb05ab4ca413ea121f5efbbf755b8a8b3eca1f4476c229bed4287d748cc8862dcd3687f9e8497affed8c2a5f3c13d SHA512 19c59bd2beebabc678017257b7736ec3072a15c9d73d980b052e65bc8e31b36e0138b57aad018525c1c5e7aaf741969a5091fa8acc9b06f99b7fe8703d6ca424
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ritex/ritex-1.0.1.ebuild b/dev-ruby/ritex/ritex-1.0.1.ebuild
index 787ce01edbfb..8e9b5b28d765 100644
--- a/dev-ruby/ritex/ritex-1.0.1.ebuild
+++ b/dev-ruby/ritex/ritex-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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README ReleaseNotes"
diff --git a/dev-ruby/rkelly-remix/Manifest b/dev-ruby/rkelly-remix/Manifest
index bb17538facf7..49bac904dae5 100644
--- a/dev-ruby/rkelly-remix/Manifest
+++ b/dev-ruby/rkelly-remix/Manifest
@@ -1,3 +1,3 @@
 DIST rkelly-remix-0.0.7.gem 69632 BLAKE2B 5da7c29c13e34d319a0ef69251d1a80ea78a20ed3142e6add368c90ac05760b31257bcba8728cd8d115cffbb9d0622292191efc0b5a4eb1b56b5781fb80a9fc1 SHA512 5450b4b52b912b6626fcac3e3428dd2b4520dcb62b402e36579c9b34e8a027853e53a0860f33b4efc995517d70a3fab4f75f28ce7ab0b2b0c9e09e72ddd7cd54
-EBUILD rkelly-remix-0.0.7.ebuild 536 BLAKE2B 2c5de51a84a683f98f86ff1fb022ca0395b642c5ecc95981685d64d060fc893d8cf721abcd0e9bef8b2e58fc92b065542fb4f0bb0d16de993850bf0cf3b3498b SHA512 13b8f696cda6ba75267d4893e854c3c6e0753c2d2df4fb694234087a508358d3f8b3d7310839454386e8ecd1fa28f741d00bbef6406ba09007a4b387490eddf0
+EBUILD rkelly-remix-0.0.7.ebuild 477 BLAKE2B 91bbf830b92ff4dc703f928de625381fe126a97cde72a0cd9c8bf9d315aca9414e3668463f8964107437c9053ed3b69682c3a1678955c34a29dd05413de5da22 SHA512 4d1197c4f8f68fb7b47d81d6da8a99b68fa93c9ed1283ab11643c381135230f3256820f06209c4f13e6926689f448299f3d2b423d212417fdaf2fef1ecbcd561
 MISC metadata.xml 457 BLAKE2B 7184823eb4b7b2849a6eedbb3e452e921e6e9570aa3b4ab35714db86d9581f21d17f2fa42e624fb7245dad90a4c27caf13b518ac83617dee3a225121e44f0354 SHA512 0b5895a386afcd5158e79eed2e65a75b3ce97d969df87f8b7aa0bfca85b7e7b549ae3dfbccdc23b05fca95727edb1c9a34dff4873047be7f6848c13b48f53519
diff --git a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild
index 798c44fc5aa2..d2cc03ac3aea 100644
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild
+++ b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -17,8 +17,6 @@ KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="doc"
 
-ruby_add_bdepend "doc? ( dev-ruby/hoe dev-ruby/rdoc )"
-
 each_ruby_test() {
 	${RUBY} -S testrb-2 -Ilib:. test/test_*.rb test/*/test_*.rb || die
 }
diff --git a/dev-ruby/robots/Manifest b/dev-ruby/robots/Manifest
index bc93869a13aa..cc64e0435251 100644
--- a/dev-ruby/robots/Manifest
+++ b/dev-ruby/robots/Manifest
@@ -1,3 +1,3 @@
 DIST robots-0.10.1.gem 10752 BLAKE2B 02c2ab5d6dcf5f861a4f290a0eac59f69083928183f79692de19e4909bb0bbfbedf718a083732b7ad5882192dca6be26c0272cac87117c61a74c53ea2b25c851 SHA512 57d5619e172961128c7e2f4175f299ecde28615680dc9fa2721ab86053515da46cae03b03dbdbf9a03a96387a361eefb013a7b3c3b3e61a26592ec4998d10bc5
-EBUILD robots-0.10.1-r2.ebuild 460 BLAKE2B 292de1d2305587585b2fcab4c939600f2be08445fdb2be4d2cbec53f4b0457fd9059c5308b518c4003d98c0a1be976df09df8dea796ada9fdcefeaf39d3c4343 SHA512 5329ab4ee9f28911ffb6bf7100ddd6fe244540610d865b0b1ebbef116dc01754d8337c264d7d14be113e30cd6f902a00a47b75193d729ee58002ce03bb6b28f6
+EBUILD robots-0.10.1-r2.ebuild 457 BLAKE2B 444955822877e9a0c24fb52623ec292a2c6052569007bcb44670bd2b4de831f72faf785067f19ce3db16e3226705e1a4129acc0af4414fcac52bf3142031b1fb SHA512 ad37bdee38da106f7abf3a40eac79fa41348db71a66d2a5fff81bfd579f1e3a7da238be2d32f51500260996eaadec86249732ba959c25f2bf941c79e0f686637
 MISC metadata.xml 432 BLAKE2B aa9000ff051db61f44df8c4af394d1a1db9754fb48ba1e6479b67101c3bfd76cbaf528e8dec3566dd0200c9f277118e5cbd1c83631f26fc7ca5f9742ee7cf27c SHA512 82fff64d6de8646b9d3bd52966e0dbc54896d903e9c214b65d4ae8bde33b8471a283832bc0081950e6828f280f17a56400f812a4a0e18905063a9ac378fed8a1
diff --git a/dev-ruby/robots/robots-0.10.1-r2.ebuild b/dev-ruby/robots/robots-0.10.1-r2.ebuild
index d358be2a949b..f49f4db9f13d 100644
--- a/dev-ruby/robots/robots-0.10.1-r2.ebuild
+++ b/dev-ruby/robots/robots-0.10.1-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=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
 
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 44a5aad1e47c..71e8b6665eea 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST rqrcode-0.10.1.gem 27136 BLAKE2B 7fea719d6e76d340dd6db386994bffc5e7002afbc61e0b476dc639003757f5932598b81274a5ab74bc6dd25d10c61bc023668c8271e9387f7bcc02c6f4dc879b SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583
-EBUILD rqrcode-0.10.1.ebuild 601 BLAKE2B 79d30255a6d7cce017a9ae092f76bb6af6905bdf3136f31ec7ee46a83aeefd27db84ce98d3d6813918495cda36f474908ef1e3950f3ad03042f491226f2d88ea SHA512 f78a3dea0d8eefb1e2704f336b15b762bc125dad6c9f7fd2bb255e56789000b6ff61193dab93f32387f3985f9f70328227be179259df4c5fd3db482ba98539fc
+EBUILD rqrcode-0.10.1.ebuild 608 BLAKE2B d8fd6dff14d14069584f57586c1d0b8e1a500b13b5b12039b191ea6db23be971c505bf69dc650d48856ed1bac9382590d646817038327271143ecc7e88e7b8a4 SHA512 6e1750b9a73db645661ad4283c566a183e5dfca8d918db00587ec64b0478376793eda6e45328a7d1e0e7bacaf48c7c824bb3f88f234be71bee9d70593364e2e6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild b/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
index 4267e093f598..7c3ccc635149 100644
--- a/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-0.10.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=5
@@ -26,5 +26,5 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['test/test_r*.rb'].each{|f| require f}"
+	${RUBY} -Ilib:test:. -e "Dir['test/test_r*.rb'].each{|f| require f}" || die
 }
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 29e250ea5ce9..b76dede42b02 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -2,5 +2,5 @@ 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
 EBUILD rrdtool-bindings-1.6.0.ebuild 1324 BLAKE2B 3ef5cc35a9b495db4ffb33fd5e4b91c3fc1b6b515eaf92993c5674d281ca58b74afdb9e4ded0d3483396c10ad9761dc39ff6bcc0353ffc6d23e658a0dbbf76c8 SHA512 39ba745ed55bfa103497d66c09d7582d4e33a20ba49e1c8e1ee2bd20895e8ac5722703efd3bf94c54aaa0534cefbd61f322ea01ad39c1704c32592eb917bb80b
-EBUILD rrdtool-bindings-1.7.0.ebuild 1321 BLAKE2B 3d4aa42330134b37f1adbe038c16a1cb0e8274754b15e2ca071acab3ce0f08f573eeb80f57520395acf6f4b7aea93c3d1bbfea6076f7a1099678eaf2159c47c6 SHA512 78d9b941966aab0f4d4d965090e30c4f737c07e3492d60307742e779f43626190111a2df2f2733d1dc351e706d13415eb9170f275b274b55ba5deeeb7e3bad66
+EBUILD rrdtool-bindings-1.7.0.ebuild 1325 BLAKE2B 41e6e77c11af149d19b55509b7ef463e870630fa954049c2fb51ec96d9bc55e87700b6fba482710ae126104b4c97d3a3e3cc8bae582094d0cdf0ed174b91e6c1 SHA512 d0239ecc8605910547302ca4ee2d4f0d1fe59851b2655444a1b8494ff34be5b7029816d622d7938962d167e10e1b62b4890e956117bdb5ca060a2ce911655842
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
index 6644d0fc0228..bfce4706b78b 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.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_TASK_DOC=""
 inherit ruby-ng
 
diff --git a/dev-ruby/rspec-retry/Manifest b/dev-ruby/rspec-retry/Manifest
index 054db0f6fc63..022fb48e059c 100644
--- a/dev-ruby/rspec-retry/Manifest
+++ b/dev-ruby/rspec-retry/Manifest
@@ -1,9 +1,3 @@
-DIST rspec-retry-0.5.6.gem 12800 BLAKE2B c1e67224c0923fff578a0afbf7a5d9ea28836aadf16dbe83357d116365f20dd0f324b2621399d3b49314db94efed83ae088eef7d26958000b257b5d409b196fc SHA512 8bbc5dc37162370fa919ec7730709e5f9a9d0a751e20258caa4ba6fc2dac15701fce4d0ed82200357aff1a95dadaba278adaa2e99dce4c24d6e5a88f19261164
-DIST rspec-retry-0.5.7.gem 13312 BLAKE2B fdb726024425e1119fd34112263be1bac8d825085d1421d44aba28f1e0b4e0be37eb12926a700ad08ae4f7ca8cb5379b3f5e3ab1e9e161063394ef631d7c089e SHA512 607e5ecfbb723073d7b2f2b40898b23c68bcd53f5e9db242b49b178156dfdff07f614db732ed254e6fb92e45f64b31647a63a12acaf3b6290bed11027cd2910a
-DIST rspec-retry-0.6.0.gem 13312 BLAKE2B d7c0e0d8ed9be38a594593a2631c53cfbe2e65bea7a28f1b6d63863a982fa9cb66c3f69ff2cc86d335764770222a99fae24a797f452c887b2fa558364d6f939b SHA512 c5b868c05304fb2f9e7316de42929ec5f67389dc72a9c67afa1352c4dfa9c6f7682b9856f05f5ca0fe761cd5ced60e3f837a9947d5831db9b7ee09846380b446
 DIST rspec-retry-0.6.1.gem 13824 BLAKE2B 5d5cebbfb8e5b85d2bcd4b05c2538fd083800b1b3fbf3140ec7e0535e4dcc3c270e45c1112e110315d517c48c300b96fa7d2c6c9fd553fe8de40e40acd9cd59b SHA512 a5801bf0a4e9f4b8e20cc2b6087ec3b205a8a3c2aa0ff2c31b46927fa6a34aec6a2f525673cf06d9e474477e35db9f5c994639b399240fc680c5c820f51c3ffa
-EBUILD rspec-retry-0.5.6.ebuild 667 BLAKE2B c6a4f6a9da258a3f1313e59f3c9efd39eb6d630557762f2881cd715476c8f7875d17c6894ca40012c971f8472acbfaab425c04aa8c3015947cf23da7e049f541 SHA512 1d660e3b5017ecca0f50ec9ddb85b07aac3dd337be3ece5c6ca3315867e28a016073a55ac540c6c6c05dc22c9f5aa445c169064b331059a004b57d6286902e52
-EBUILD rspec-retry-0.5.7.ebuild 674 BLAKE2B 5037d98cb3fe82f2db91eed26f33c3bed9b93cbbf06bf1deffe844e3b028e83de19c488ed5c357b8337a5e8a48afd9ef24600bf527479fe1ffe31bc75bff1c63 SHA512 efdccc9ec6489ca5b182e743cdb87bfe884a76b165a736e3cf8aec75bebcdd90d3896fe1daae222da7f71e78002aea1ed50a32652b3196eadf1f29df37fabac9
-EBUILD rspec-retry-0.6.0.ebuild 667 BLAKE2B ffc5a289a4e1e4e9533bbed5b79e6bb206ef533786879cce9c37ca99929a365294bd341cc37909f75320c3d6c30609afc234a7cbd8e965055de09e4839287f93 SHA512 aba59510494c7cb65a3682d37d6255e96ca165da1c14857d07895ffde16e52fce37694f647a264016b323a3e833160eb6c3b309d38c4a3ab7809b9ad32c0dacd
-EBUILD rspec-retry-0.6.1.ebuild 667 BLAKE2B ffc5a289a4e1e4e9533bbed5b79e6bb206ef533786879cce9c37ca99929a365294bd341cc37909f75320c3d6c30609afc234a7cbd8e965055de09e4839287f93 SHA512 aba59510494c7cb65a3682d37d6255e96ca165da1c14857d07895ffde16e52fce37694f647a264016b323a3e833160eb6c3b309d38c4a3ab7809b9ad32c0dacd
+EBUILD rspec-retry-0.6.1.ebuild 671 BLAKE2B 387f8500ca8a460f7a1a9516d224f4560be47f4311c88a870f6f2a8e0da0e5d66005d65911443fc3d298431702ab30ca54d3945716d7e2ecf5b62919ec0c9bd7 SHA512 8785be1238db4a2d3917ecd726751245ee26a27c48aff098e6a63fcd6bb93fd21db54ec1a735ffcb7646128e03b7435853af7d4b724e3745d06f39f952ca0d30
 MISC metadata.xml 346 BLAKE2B 630a1e9e6398ff312f8536ec7e6d92b2a3bd8022c1ddca424474b43266440352ef63ea6d114c3eb21428e82ea5179810cbcf12b3c29b6f2603d038ec40ffb86e SHA512 a1d92ed8bb1d5619f8005859d7ed204016faf918885b98b56963ab9cc1e0607fa451227d25a5dc9efc88bc0de26039ca5ec4e0d3931c8fc32edbfe553912c23b
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.5.6.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.5.6.ebuild
deleted file mode 100644
index eea79143a8fa..000000000000
--- a/dev-ruby/rspec-retry/rspec-retry-0.5.6.ebuild
+++ /dev/null
@@ -1,25 +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="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retry intermittently failing rspec examples"
-HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.5.7.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.5.7.ebuild
deleted file mode 100644
index 4b1e48fd3832..000000000000
--- a/dev-ruby/rspec-retry/rspec-retry-0.5.7.ebuild
+++ /dev/null
@@ -1,25 +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_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retry intermittently failing rspec examples"
-HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.0.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.0.ebuild
deleted file mode 100644
index 12436eac3470..000000000000
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.0.ebuild
+++ /dev/null
@@ -1,25 +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_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retry intermittently failing rspec examples"
-HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.1.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.1.ebuild
index 12436eac3470..8512741d56b3 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.1.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.6.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=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index c8cad20593a8..7a1ee63f439f 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -3,5 +3,5 @@ DIST ruby2ruby-2.4.0.gem 26112 BLAKE2B 017f7b8299a5104742d6224194b65ad848bc5347c
 DIST ruby2ruby-2.4.1.gem 26112 BLAKE2B d7d033d80d0d82d9c6bd7b23efd3326645f2f4cfd308f30db6a38022a9648f474741403b45a9294359b8ffacd44ab82ba6dabb0e55b0edb60364440dbf572604 SHA512 5c0ee1b3738a5c4f780cea15cdc9ba679e31b9fe26f11b458a881d40b4717e9d07202f4358e9a0ec53a657b275f86ba466bf6ace8111403d35553292bee60c3c
 EBUILD ruby2ruby-2.3.2.ebuild 803 BLAKE2B 7067fc7fd27224c70d505628ac8eb4480008b0ec355c6b95bade10af1db89077da52707527549b04c07a63cb225ff771816ae21a78fdf958e334d31986ad6360 SHA512 f230576f8b88ddbe7075b7ae4967d91973d73f0c9c26da9ede36780b85f90a6a3e560ff0a288b5054509bc2fdf0175b0ee5ebfa0c978bd1f807299b1e6e0522a
 EBUILD ruby2ruby-2.4.0.ebuild 844 BLAKE2B 52d078fcf23a83bbf8044c848e2640ab3736cba06eb3fd308842e620d345946d5b73a4181e23751822cc5b9654ce1fca3a8877e5845b58e46424915d3057202b SHA512 b47c71ce59d46f894da4a1c1d0bccae6e4e59ea8a1277cf355bef9099aa8211eaae197a82587299755565792e80ac6f22250d061396df2ec39d3944fa13f4ac7
-EBUILD ruby2ruby-2.4.1.ebuild 844 BLAKE2B 88fb24dc9edc6ae98e0545b58064e429a65f14b5622beaa585c632e9ac31ef4025fe2a91844d43765432a0b457692aaadf54ead14529cf4b5d479453b80fb3a1 SHA512 db9ff1d8d10c320f19e5836649cbbb665f552f80b4e897d1d1433e828fdf758a5acf5d2c02daf173071798dd5e1c8645d21e012b1ccce3b656d65e2b15765df5
+EBUILD ruby2ruby-2.4.1.ebuild 934 BLAKE2B f00cb0919bc677db3e1224cff66abd274773c449b3453ae450023aabdd39cea32dde4baaa89ed6bb09c3b186bd539f67041da929c131a8fab8f80a13d8879b42 SHA512 fc14511d0b0c382e24881f23028f272a37eb3a80108f3858078567bf77de0f6f52a98a749a853983bfa88fb12faa9d22edb8917ce143a04c0a530424e0fb47a7
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
index bbbc83c02083..551cac345a76 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.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="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
@@ -27,3 +27,7 @@ ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.
 all_ruby_prepare() {
 	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
 }
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 62614f4ed1ed..c51497f9654b 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,5 +1,5 @@
 DIST rubyzip-1.2.1-git.tgz 151085 BLAKE2B e7053dd3fcb95d6850368c927a0a549a85a8d45c64538e27e21ce824035121e6333a86d65ae84aa1d309aff5f0f335bbfd489871d8d8bae31b3a1c78ed181a14 SHA512 ba71d293120943142608b617d76d72699c64b92a6bf602543a3f42f01c44eea3f0c902bc841a2aaf9cffac4a2ba02a47a847115eca1093587d944c2f4acc9b9e
 DIST rubyzip-1.2.2-git.tgz 153976 BLAKE2B 350c05b5dde15bf6450c32b679b474df68b8597e82770e2d5f59bd0c430344a3f2868e8d2d7f59f2240f8fea02bc7ccc31777ceb5ff66041dba5a619e7849b21 SHA512 1af115db39b5107687049cead85732a3cdc6b0c3db69103af20bccf1c684ddc99d5d2f5b178b86600d2d6458f5eb535b7c9dc89ab32c91dba3519bbd3df59e7a
 EBUILD rubyzip-1.2.1.ebuild 1171 BLAKE2B e26e8b0b6346abbcbfa79dab8c5d2cad18404aba7e1ced41257bec05e9a65d2223616adc6cd0facb2ce509d768a9ddfe60491a167e2aac128c9e85e9a190d4de SHA512 d89655c979d01fbd5dc8e51050030105e351f9a0efa54d30d8a303ba681509036b6ea58c7171cf3f1ba5df7bd875075fa0a70defb02b112b74402dd052d25ac6
-EBUILD rubyzip-1.2.2.ebuild 1191 BLAKE2B 6946e7e0fdc51c11da27b81a9cb9486d869e86520314f7e5e4506eede973386b1034ca8e32dc0db1a131fd8cf352619cbe08d1542ca6aec22ca64c0fae77e759 SHA512 ae0bb078a82f11ac83f15cb1febf36ddd8fd309ef28182f248191066bb6a2e68e7b1bdeed2accbae1815ee10ecda36dfcec3a5de87dd0ac290cfbff4f35d6edd
+EBUILD rubyzip-1.2.2.ebuild 1190 BLAKE2B 801b5cfa83314816f52c6c415e3c570fd61b484812b3bb32fc156bf8e45d45b2ce777f57bfcb23b856d167b8e14a724043dcaf474b224b19e699af7496bac309 SHA512 f5e02ea1de58a91aa19aec4810b5f30a6e34af7834a7e4c898104bf48433edca96e3d92517c607efd005b6f56925b094bc62d542417176487a65095fc7a2132e
 MISC metadata.xml 341 BLAKE2B 2e04f2f0e3ee64a4d476ca38f166efc94dad160850cd08b42ed54e68a275ec1d26b76a751bf9a347da5f9c8851575a8a58b9021f91acd1a733be536f947e6743 SHA512 7928d7e4a5dcaeb924d44348981910cf0024939f6f169a00df46fcd80cc933b56e91423e8919ef7a74f03e4bc1eda7b7f8a8bc6e954f6195989c1a9eb574cf3f
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
index 0b809868dc57..23e2fe7a4b5e 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-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=""
 
 RDEPEND=""
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 1f381ad52dd0..0a06ec722d64 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1,5 +1,5 @@
 AUX safe_yaml-1.0.4-datetime.patch 537 BLAKE2B 0d66465613a1ddc61d0c27ccf287c496e387c55e7d979ac7f2d9c59e1039030e72005792e444bee403ed7f8c7b20c42d0a393fbb044572ecada63ed7762753ec SHA512 4cb1c2b9cefc8fe2940cad36f090bb8345d31d129e3cc548553c6548ebab00d4795e635ed930bd1625411046123e3ce5475f824c7f2a014ffe9c4e70bd36ec71
 DIST safe_yaml-1.0.4.gem 30208 BLAKE2B f77318c098dc6f6202c3818c2095e6e412c988d227be3a962210947bc4ac29c733b4433c7ba050f26dbb115675bbd9564e020be915aed0c5749b5c09cafd4d09 SHA512 ecc944a6e5f0862acf1413d7ab38bd35b56405893bb8064be2b8a056f0164d3710afaa2f6ef65868770e855ecf54a87bf9ddae2241c3c2957ca001ca04b04c5a
 EBUILD safe_yaml-1.0.4-r3.ebuild 844 BLAKE2B e19c40fb6adaa775a40c31d5770b70b141ba7f8a9ed3d7ecb78c7f9bc2f49e741f9ef9df8d0eb25b4f9df262b33599582867e112282f03b8cdd1b491327b543e SHA512 12e96740dbb67443236ed3b33cb26f5a2c93085c927c2f4f3213dedfa1dcb1696edfa8a840394931de418084351aeba091e5404a86c4059101d02f18da27a5c3
-EBUILD safe_yaml-1.0.4-r4.ebuild 1011 BLAKE2B 624eb6e02721bcca98ca7583d3ffa7da63cc686a26fd67c7b01a98c4016fc76764deb547e4f7599ec84b6ae7c81df10b7517e3d23680cea9ff76e7c88d135184 SHA512 054678854f84e7519d6947f81d494dcc83372646524be72eaad93fc1c701f8460dd75454644008361cff0b56c0a43106809e0bd23f429652d0910ef824500711
+EBUILD safe_yaml-1.0.4-r4.ebuild 1015 BLAKE2B 6c9d1a97700655cf226f9ded620e70644d4d53687b5eb2379e09126f7deebee45a7edef2d9190c270c4939e7e66c1393683734d56617c3771352116d32277d5d SHA512 bb189390804fb83b7ecdcd9b94d608b35f489ea0c2bc69c70a1e3ff812c5ba5b06d8b4d7f05f70b2b8b89dc783f6d181e368f3355ffcb1b55b0382274eb44834
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r4.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r4.ebuild
index 5fe2d736f5eb..0a259ce3be6b 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r4.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r4.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_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 425a04a08723..6344f3db5907 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,5 +1,7 @@
 DIST shoulda-matchers-2.8.0.gem 153600 BLAKE2B 49ddfe686bbd80665cde74019a046564b6863bca1ae81517ef1ee8c9f91e3f5d58a5d25e7640b1a5e3cb9c99367f9bf5672f63b9632427eba91c40aa4d2bd2ef SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027
 DIST shoulda-matchers-3.1.2.gem 208384 BLAKE2B e9ba4efad3410f07c7b28649b9ff30de66b0d57a392052ea643ee584a97c290dda6261941bdb59146a3febefba81bbf4e5a0f28bedff80643e22f800730d94cc SHA512 e24602701a0f6eaa7ed0249449401582c7dc34f186e548d0741c9e416d5c6b5bc5a9b028b677b3f2b04091c6e5373cc03c05c8e1abf9156ace15846be4064d51
+DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
 EBUILD shoulda-matchers-2.8.0-r1.ebuild 522 BLAKE2B ef2bbd2854cf8cd5891865b7eb97ed867fe804106b1f6c54dcebb83aae58f3b79803502fdcd042e36c007e36ce9c6d73f9dd3195c802305c42cb02303addd656 SHA512 1e39bd6760a5c9984e64a410d531c387b1990f8014d0bff5c77ac97f442d969f30eb7bedcaa7a4af128003f8fe6ec37c7bb17466e1c4c3f27e4b307cf6225409
 EBUILD shoulda-matchers-3.1.2.ebuild 525 BLAKE2B 9ad4d5592a10c74a5eaadb974ab49ffec27bb3979e158fc5b46f0469071b6bd6de0b8e701a9d4ef81dabc477cd4e738571c83584ae57516b6c95dd6f88f41b3d SHA512 f1a0417e2cb94be06d59ae5cbd68c507d974e24f65c087de78146b705a24b14d958cb05f4bc6b13e1dba49b1ed49222196d29e8f2121f849282d6eb7a8e7f521
+EBUILD shoulda-matchers-3.1.3.ebuild 522 BLAKE2B b6823b43b33817d744a1dc2daae1f59192856bfa36820aac5b38430b447d842be4bad22157648e51ac07097e0208ab17fc20c130ed1766e69c154caed0a045e8 SHA512 89eb96101a6fcd4613172c796e6e506f755f45c8ee905300e4487aa770998d817acd65531bdd6ed1252bb569b376daaac2742cde4993fad9576033c9b451e46d
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild
new file mode 100644
index 000000000000..c814c20db933
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.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="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index bd539070c757..4318bbb15cad 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,7 +1,9 @@
 DIST spreadsheet-1.1.3.tar.gz 4655837 BLAKE2B fdb28822c0d40eaceaeccd7ecb7861fa7ab9cf2f775aeca2f5fa00dc7932d17f1cbf5298aac4458109bada8e1d97a5a537f9054cc947aa4140dde3ae260556e3 SHA512 c1529318384c4e48abe20aad21aa80d652ab91bca505379c310707fa23382654252bfc04d1f8bdb7aa6ec00d0e064790e3ffdcf1c1089bd49010e79729a36690
 DIST spreadsheet-1.1.7.tar.gz 4656117 BLAKE2B 4771d747609da7a552ada5d3c0d5de51e6fafbdd1d3dbc8740e50c7a8d3d6d981316816a0e0ea5f5e817e66ee6966ce501e239409a352bce56d22274816ee8e8 SHA512 f1617e1733bb41e7cdcde626a31248fce43160efbd16736822f2dc4e64db814ee5394c50feaf6986b8af4876488191e40e01d95dc76078666517f5cf14f97fcf
 DIST spreadsheet-1.1.8.tar.gz 4656238 BLAKE2B 583e3b45da505f398fb243387c375f97f13482ed39c8857caf96a865eb1f7babff188e459818e4609316ebdbd18f9050d60492fc27e0557aeebb0846dd3679cd SHA512 be90f9b3b21db98daced4bdaaf57fb1f0dd45e9f8fb330e451b51d68a78ffb0dbb2e7b08c1ee41836935ed263acd9639b074df45b7e429f5781d188bd7170e75
+DIST spreadsheet-1.1.9.tar.gz 4656240 BLAKE2B cb2b663bc4721d916f0485fe51a5e46239f2e48dca2410d3b5e6f50ad4a4fb92982e3a9ba7605c4f202d538f3f69931837c2c0d323b8b30e9c25210fadca8796 SHA512 1a4d8f3e2f6772ff6fdfdc818893d8d808b03f68428125d6f3deab38830dc47ab203fbface21b01c66ab451e2175db38f4b6d3b0cc2423ac37578d3bd135305c
 EBUILD spreadsheet-1.1.3.ebuild 858 BLAKE2B 50d430f040cc966c821bd9580eee072fea15f75ab91de8f33d7b12ee06dd96b44cb06fa206182e01ef93561879a1f769443aed0d53ec7373d45440d35fba4060 SHA512 91c10e423b90c3c8a6e88a79ec5f8a44812fbcaadd6309632fd50023c7838b9ea7efab30fa471f9009c36a6d6bc3eb824b6543f40105175457ed95951a6f083b
 EBUILD spreadsheet-1.1.7.ebuild 858 BLAKE2B c79433d6e6deb044f2ddbb8ad1d9577b76ac14099d9b6997da7d92e71da0cafe3dad31dda02b4cb75a0c7bd6f27eb8a16f13719e2811b3757830b88192c96739 SHA512 9bd59e39c5a35ed78e1d990e8741e20f4c5968b2c5e01b3b3bfef47cd451f69ba5d23215dc327ffb459d85f14c822485ac5a68bc1440a1004258e52c6358fa3b
 EBUILD spreadsheet-1.1.8.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
+EBUILD spreadsheet-1.1.9.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.1.9.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.1.9.ebuild
new file mode 100644
index 000000000000..9f95a8c8f22c
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.1.9.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="ruby23 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/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 6ab98f83387e..00ffb6df3a7e 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,7 +1,9 @@
 DIST sshkit-1.16.1.gem 148480 BLAKE2B 4d33e5258a0a4fb9dd063bf914724d69bb838e6f5a461b1b6b355306e5a99f58021ddd9d8f5bc2074bbfdbab2a823132f491a4d3d76c86b2ee9c9156bef7223d SHA512 3866381a4a4c34ac29199f9eb295fb642af624f7e96971f2c752688a24e36787698a4817943317b1e6735afe0bb035e7d7e3d8b81b49022caed2ef20ee57ec57
 DIST sshkit-1.17.0.gem 149504 BLAKE2B a44b00917eca7a4953f57821518b14b5a5ed4f8d70c9e2b728c22071c705e185da33b63845bffce6fcb2fc35ed8efa3bb3ba5202eb71edae52cfd99c26583874 SHA512 61f531651a76418e157c1affa55927e438ad3eda9dea2b3f0c26f566522df11d1d39eceef84f706aa7733b60c8428dbb3d7da863ada64a24c79567dc4a8c10ad
 DIST sshkit-1.18.0.gem 150016 BLAKE2B 3592bbacf2b9031ce9527f0ecfdcd0ec973239496c842fd659277498ec9a5d815ae77ff7b06afe7dd20d82577dab6ccfcbab79e7514752b41ddb1b80fcfed7cc SHA512 ceff9c7be99155b5e86e1564be221da5946b91b396ffc948aafbbc1a5214928020ee3db97615b780c91f4fefacff2174c4d0a33e54aa2e935552eecedac71bde
+DIST sshkit-1.18.1.gem 150016 BLAKE2B c7f2f1462c27305bd2715f90b385df0598443ff96542c1340e4251667baa0c440d804f4322ead611a10195303b0f481cc15e5627e3115b50f0f1477bdb896e07 SHA512 0fae9e948094eed1139fab66492b53743bd98d1dbcedb39f644fc1825a768299a1b783e2e0893f57439ddf2c270a520134ff5181c284a5e6b96100731fbabe2b
 EBUILD sshkit-1.16.1.ebuild 1189 BLAKE2B 2c28fa74d4b9b1f59546b3eb196a7f2c868c8f5889bfd5a5e95e81f3ec54766640f8cd57c4681125a5cb8724436926a90ed66beb376fc42279ae1ff385f9beff SHA512 e315c2d47cf33bd034fde158f21a669e1bbe3e79732657d9c91f3620bb1f921edcbc0d77f55927a4edb15825b02db8eb50f4291756487e5d8b20fdb82e5a462e
 EBUILD sshkit-1.17.0.ebuild 1189 BLAKE2B 2c28fa74d4b9b1f59546b3eb196a7f2c868c8f5889bfd5a5e95e81f3ec54766640f8cd57c4681125a5cb8724436926a90ed66beb376fc42279ae1ff385f9beff SHA512 e315c2d47cf33bd034fde158f21a669e1bbe3e79732657d9c91f3620bb1f921edcbc0d77f55927a4edb15825b02db8eb50f4291756487e5d8b20fdb82e5a462e
 EBUILD sshkit-1.18.0.ebuild 1193 BLAKE2B 8e6b7375366dae75c94e52be1c95b2737062ba4f03362d77a0d50ff1309886106372b73cdc856de045e700051ab345e4de05323497132929ccd40a5515d4869d SHA512 90e6ed5687cf7c2e836702f8b51cf5340e4dba7d1abdd6a1ce9b0332456b9f780291e68aae7d0cb84523b34e8520b83e4806b930c75e5888496cac0e9bb49fd5
+EBUILD sshkit-1.18.1.ebuild 1193 BLAKE2B 8e6b7375366dae75c94e52be1c95b2737062ba4f03362d77a0d50ff1309886106372b73cdc856de045e700051ab345e4de05323497132929ccd40a5515d4869d SHA512 90e6ed5687cf7c2e836702f8b51cf5340e4dba7d1abdd6a1ce9b0332456b9f780291e68aae7d0cb84523b34e8520b83e4806b930c75e5888496cac0e9bb49fd5
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.18.1.ebuild b/dev-ruby/sshkit/sshkit-1.18.1.ebuild
new file mode 100644
index 000000000000..5c4ef99622e0
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.18.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 8956b9e46d29..8459ffb3a674 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 30457cd25fe9..d8e7490801be 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,9 +1,6 @@
-DIST Tcllib-1.16.tar.bz2 6089076 BLAKE2B d3b2d439689320e85a2a31f9dcd7bbb23af6d54eec299cb2b4248b961f98de95a878cc20c2bca712f907f6359ae6152d912e849a47d9394910b9278ff748d617 SHA512 5e0656c178c0fae907c101b5324f04ba1bb5c26f4d1015868194dbb393e88a281ecf66bc4701167db24ddb526b87acfd88223e0e9e6db1f9d0ffb919b3372752
 DIST tcllib-1.15-patchset.tar.xz 16164 BLAKE2B 590f6ea38aa2cf98e80011591d5bf06f27d4ca2af03b2e633a2752c184d2c1d78cc22f9b8472a2e5af7052cbb742a22fec0d487974a7599e4d4081bd5e80dcfe SHA512 85507cd00692138ea3c791f88bf4bbdadefa91168a55aebd1da7a89a9de37c3352be27db25bfdb7478dfc90865f906b290fdcbd858be0c01e3502f0446f03262
 DIST tcllib-1.15.tar.bz2 5030648 BLAKE2B 9731be4282bc3b3b0bb56021c3f0a7943ff4163d04ae397b1e0543cbce0642cbf5f64b66c57348a932d9e29c53273223998f2d8b0b087ff7ac679191e8a35ece SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4
-DIST tcllib-1.16-patchset.tar.xz 5484 BLAKE2B b7dc4cd1045cc88e7cc85412734cd036a77af276635e20ff7df207bf5296df63f9c4b1374957f2d01ef278daabdb1b7bb5cb1bb9e3d2a4e0100be02d23ddbb2a SHA512 1bb3b7ed698a77502eecc7ae9fe28b0370770d08235994fd083828af4e87aee49f60c529774bf54dc339122b68fc1841acdd05b27f95ef78145934268567fc03
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 EBUILD tcllib-1.15-r2.ebuild 1126 BLAKE2B 4230c77b24b9aa9a22c1bfca957622c1b1bdf987f41e704cac8ab9b71edb046b5c27837619b6e9440dc296abb43d15f3646b047ed812c52ec478384ee28b7d76 SHA512 8e3318997ebf7a07181d76fef022febf286ad44ea92b2a9b411a15e9e73154598d90c7a763f576e9f0afbe9ac95419aea6c568c037e0aa0321d87fa96d437201
-EBUILD tcllib-1.16.ebuild 1168 BLAKE2B a33d8cfcf72e090d0901880ffd238d67ad7e200027f10e2d3a6f4d4f259a1d23ed5bd923510380e753781d42166f1e67bfe174001d7d801d14c7b4aeb3a8eee6 SHA512 8b958fe27a58258235a5f2b80f74a1bb8ac6dd795326d116947579d1940834ea5d1d0f993acae89909e4adde31b6e874ed733f0275fe149a2cedcba3078d115d
-EBUILD tcllib-1.19.ebuild 917 BLAKE2B 4cc5df4ba69561d6832076eb7e78082aafdb1ec8f8546c38891b7cf21768189ac9ce3751663da124989b8c9ec9216857858e0e1d66393cbe591e5e30af0b1c1d SHA512 df994820ef7c338e97ca84200c9ba9fc557f9a0c54c4b29376ea797a0d87d365952014a499a79cc6e8b341e9780b5a875f956663a8656c0582fc375b0fe2615f
+EBUILD tcllib-1.19.ebuild 916 BLAKE2B 33c4029786144e631c8f757c80d19367ad7c7b243e3934e6d79d9816d2d8ec5acdf168b09d392d54219433743009614323e737d7170d5bc00637249b618bc6e4 SHA512 5d3597e726d2c3c33adab6b7c84c582526cfd42f1bb4e31f452ef4664eb99d93ed436ba036f443e331f4786108ad3842f6aa7091125cafc3aed540fd4ab25dde
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.16.ebuild b/dev-tcltk/tcllib/tcllib-1.16.ebuild
deleted file mode 100644
index 72616a2dd19d..000000000000
--- a/dev-tcltk/tcllib/tcllib-1.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils virtualx
-
-MY_PN=Tcllib
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Tcl Standard Library"
-HOMEPAGE="http://www.tcl.tk/software/tcllib/"
-SRC_URI="mirror://sourceforge//project/${PN}/${PN}/${PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	dev-tcltk/tdom
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( DESCRIPTION.txt STATUS )
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${WORKDIR}"/${P}-patchset/${P}-XSS-vuln.patch )
-
-src_prepare() {
-	has_version ">=dev-lang/tcl-8.6" && \
-		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-test.patch )
-	epatch "${PATCHES[@]}"
-
-	sed \
-		-e '/testsNeedTcl/s:8.5:8.6:g' \
-		-i modules/tar/tar.test || die
-}
-
-src_test() {
-	Xemake test_batch
-}
-
-src_install() {
-	default
-
-	dodoc devdoc/*.txt
-
-	dohtml devdoc/*.html
-	if use examples ; then
-		for f in $(find examples -type f); do
-			docinto $(dirname $f)
-			dodoc $f
-		done
-	fi
-}
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index eff1e236c477..c2701e93c485 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.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="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index b71f73a9f15a..b634ddc87b15 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/revtex/Manifest b/dev-tex/revtex/Manifest
deleted file mode 100644
index 9433fa771360..000000000000
--- a/dev-tex/revtex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST revtex-4.1_p2.zip 4168885 BLAKE2B 3b0e0302ff8f7d676d319d880a6fee480e81631af24a698f733613a7b55313cb7582231ce0b90290645345ef70319d834f1c9a8ccf681d26ef9a3cbc816be7a4 SHA512 df093543af1274fd218ee9d430da76aff07174d122b446abef1bf0c0333e154bd2c4e1db06dd178c82a0f1cdf83355faffa2dee18f19d18cd7e848a06b748d2d
-DIST revtex4.zip 957277 BLAKE2B 18e46aca38a6a2c7bee3af59216a7814d91170f43db46b5028fd2a363053627fc62e5f7ee0e5e6df97892c12494dd86b78b61d3fea1d91b62c410eec04010701 SHA512 816960d3f12dbdac0d9fb762ab2fff4e88fc0d436bf70101f172440b0eac90686517a3f857a6cf072b0344273b8eb3b4dd3c7c5d33c927e75183989cf14263fc
-EBUILD revtex-4.1_p2-r1.ebuild 1005 BLAKE2B cc921e170ee0acadd6ec4b119331f3fb230f229e23bce84abec49533ae7b347cf76d161984cc5a3b4e244670058272099f06108e024cdffbeeb283d2acfcbd68 SHA512 142805655af38bfd13016b66c3f83d7ccbec0625cbf4f598b5edd3dbbde53347823bf476284c2e1cd5fabe645f2024b86dd62cd4f1300613c295cbe9e82dc594
-EBUILD revtex-4.ebuild 1032 BLAKE2B d3f83774cd1618059043568b35e55c2de230304a4ef3b357fc3b0d0bcbb9ced2e012529e376766af7b597adc86d5cf3a289878063ea7d17f77441c32d2657c1a SHA512 f118fb3b04bf1c6afa42e69a511c43a368cfd010d50a158e27d87dcfbfd01e47ed7e1f0a41eb80814dbafe6cd8f4a9d4706ac06124055571a75bd631403f3f74
-MISC metadata.xml 426 BLAKE2B b7bbaadff70097886d660994d254a869b6f1ee8e8f331234e7756986c17e3f9e0c7392f0d99974ee75a483d5e1bb803ea8537843b0f68fb5852fdf86e46c76e1 SHA512 7e262c95822febb3edbcbeae5789302be3119ae7d216a539546abf8c36041f38ddf6bb0540df51ef12aa9b1604fe996e9a9d7ecd0414e1944739acc1d777872f
diff --git a/dev-tex/revtex/metadata.xml b/dev-tex/revtex/metadata.xml
deleted file mode 100644
index 7a7c477125c3..000000000000
--- a/dev-tex/revtex/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>dilfridge@gentoo.org</email></maintainer>
-<maintainer type="project">
-<email>tex@gentoo.org</email>
-<name>Gentoo TeX Project</name>
-</maintainer>
-<maintainer type="project">
-<email>sci@gentoo.org</email>
-<name>Gentoo Science Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/revtex/revtex-4.1_p2-r1.ebuild b/dev-tex/revtex/revtex-4.1_p2-r1.ebuild
deleted file mode 100644
index 7c1b8b11ebb7..000000000000
--- a/dev-tex/revtex/revtex-4.1_p2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit versionator latex-package
-
-MY_P="${PN}$(version_format_string '$1-$2')"
-
-DESCRIPTION="LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP"
-HOMEPAGE="https://journals.aps.org/revtex"
-SRC_URI="http://authors.aps.org/revtex4/${MY_P}.zip -> ${P}.zip"
-
-LICENSE="LPPL-1.3c"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-texlive/texlive-latex-2012"
-DEPEND="app-arch/unzip"
-
-IUSE="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-TEXMF=/usr/share/texmf-site
-# Bug #574350
-LATEX_PACKAGE_SKIP="reftest4-1.tex 00readme.tex aip.dtx ltxgrid.dtx ltxdocext.dtx"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unzip -o -j "${S}/${MY_P}-tds.zip"
-}
-
-src_install() {
-	latex-package_src_install
-
-	# we need the revtex-specific rtx files in the same dir as the class files
-	insinto ${TEXMF}/tex/latex/${PN}
-	for i in `find . -maxdepth 1 -type f -name "*.rtx"` ; do
-		doins $i || die "doins $i failed"
-	done
-}
diff --git a/dev-tex/revtex/revtex-4.ebuild b/dev-tex/revtex/revtex-4.ebuild
deleted file mode 100644
index a424685b456d..000000000000
--- a/dev-tex/revtex/revtex-4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP"
-HOMEPAGE="https://journals.aps.org/revtex"
-SRC_URI="http://publish.aps.org/files/revtex/4/revtex4.zip"
-
-LICENSE="LPPL-1.3c"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-texlive/texlive-latex-2012"
-DEPEND="app-arch/unzip"
-
-IUSE=""
-
-S="${WORKDIR}/revtex4/src"
-
-TEXMF=/usr/share/texmf-site
-
-src_install() {
-	latex-package_src_install
-
-	# we need the revtex-specific rtx files in the same dir as the class files
-	insinto ${TEXMF}/tex/latex/${PN}
-	for i in `find . -maxdepth 1 -type f -name "*.rtx"` ; do
-		doins $i || die "doins $i failed"
-	done
-
-	# remove duplicate docu files to allow concurrent install with revtex-4.1
-	rm -fv "${ED}/${TEXMF}/doc/latex/revtex/"{ltxdocext.pdf,ltxgrid.pdf,ltxutil.pdf,ltxutil.dvi}
-	rm -fv "${ED}/usr/share/doc/${P}/"{textcase.dvi,revtex4.dvi,ltxgrid.dvi,ltxdocext.dvi}
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c182493ee15e..afea50245001 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
new file mode 100644
index 000000000000..d85da5a47006
--- /dev/null
+++ b/dev-util/cargo-tree/Manifest
@@ -0,0 +1,202 @@
+DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.8.crate 24260 BLAKE2B 0445e8cbbe7781fe7890dd98d46bb4451de8441fdb99b74b9f08a6a93016eb8c94978f2bda263c6f2ba6d4ea31176446c0bba43f5cb12ea644289fd4568007fc SHA512 a20753d9b9ff320162f9d02f72d2756ed9e85260238e43c0528889597016525c4bca5ebd57f9a5c63727cdf707a3e3631f83401ea565f64e55208349785c625e
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
+DIST backtrace-0.3.12.crate 33665 BLAKE2B 860f98231701f1e75a414297e663df48de739ac5b75f049831a77884ae11df499957c599ec66c8f92c41654c436117a11b92829b095c62eeb721962ddbf5f1b4 SHA512 40e5aa214691f9c3ea5a609b96ea364d72b7a1596c42f74777ac5906cddf0207f591922ffeb53ffcd62e47d3f296daea0c93b469ee3426cf34866397dc40f47a
+DIST backtrace-0.3.13.crate 34101 BLAKE2B 853f1527736d049559688f4ec49a800f0280c11ad24dcb88b7fab5a18c777f39e0307061c107d4b1d60d52183aede3db7b8f7145ad1df50d28dd13929dbb38ce SHA512 434037b8b9bae57bbc788d5db05d02464cab8aac92be1bee9636aec17b02f14110e7d6bcf0c529ce5ffbf632c2fc939fbcd96600bd90656ac489c1ccf1e8e439
+DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
+DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST cargo-0.32.0.crate 825669 BLAKE2B b3d1ae376d5c4438e1f2912dcc242e61f52633dfba0f8ace9ee4646ff8a49c1ad02ed4feb6d20ed303fc6534b937b2f4095ded193c014c1b6e1035314ff9dc0c SHA512 fadcf5e8f830920de1fdc0a6dc061d22616d98e2ddb7816ddc219bac4d51fea70ea249f3779d86875e4e5ef2b4d5b84ee64ccef1e816ab6db0f9088539b4a80f
+DIST cargo-0.33.0.crate 836765 BLAKE2B 78a06124ffb1d34bde2bc465093cc045a7a3e3c271ac6098ed0f4c0c129d6055d125f837e1a9ea19830cf3949f9f78381a9964a8df0d17a5cab6abcc70638c33 SHA512 00170f3d89b10a9abe8a5aa17bcb2ece4dd3aba15e86c01aefeda3de12ec5fa26041a1fb5ae27ea5fb15d2db80d9aebfe268cc140019b0d500a1dd0a7a1e2b05
+DIST cargo-tree-0.23.0.tar.gz 23212 BLAKE2B 464936a2ac923600dadb282077e0d7a792f03da796df56d9360ce5a6340a1397fa2f9f314d677c53c27bb43f39c2619d70b5bd17ffdae89ac67493eb526e05fa SHA512 aecb14738f97b75123412100c1e4a0e0bb073070b25c13d2a002776bad4710ccd0cb1e863283e3aaffac4124754be76aaabf4b5e88337fbb579202351b60391c
+DIST cargo-tree-0.24.0.tar.gz 22603 BLAKE2B c0cc265e9dfb02dd8c14fc7944d2d6096b7a48a39b79d04dc70fddc31a0c65dcf52f9a4e3052def20953bfb57ff229ab44f252b90cefdf9c3301fd6e47df3b17 SHA512 ba4f8d01ff3c47632c54f81731ec35fa9b5afb2df5c1866ae730c981164f18579a803c2917bc1f327dd21aab39310d99854d7c2376c604be1b252705853045cf
+DIST cc-1.0.26.crate 42350 BLAKE2B 3a31535c6168036179930c8f8a4aab0a52632d733c9e0b54fa8d1e8a5d6c426ffca4e7da55bf23ea9fddb7ca72e6894a1f6a8e9175fc4058a37b7a181afd7bc4 SHA512 f4ab851d2aefce6d9e6b08b2af99e7b6c63238c6ef931d3f7872d79edb139f62627911335b62e8ef0c62f54bec65693a97411487af449b1f750a5b6652c785f1
+DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
+DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
+DIST core-foundation-0.6.3.crate 24267 BLAKE2B 8e7ca9a19db4e51aed67df420ed50d4096d39be8485cdfc205185e3647791f27227773f466e50af3a734306880bb8f7f2236f6ef3281b5130c1fedd33f7069ed SHA512 7a21e003787738763c031934054d3105d8b573d0d52696a30c9c44e1d795b5c2e1ff0e3bd4607187004c176bd0e92461d9f037f062241b5ccbff151999179525
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST crates-io-0.20.0.crate 7996 BLAKE2B fd60658cf2822132815bca3b63e39b12220cdd3a82f519f4df65fb617a752d6aa885b378dc11d8a57ecb297f07f2ecd4825e75e1fe69ef84bcea76955f97b04b SHA512 2d9a9101ba9a1034a98a446c75f2b43a08de96d7acdc4fd64f37ab24090af044b5d6a9cb0350acf88b86a9251715d46587d41cd80cb77b0439902643460a9736
+DIST crates-io-0.21.0.crate 8009 BLAKE2B f640e0cef1cb1b06624d4b2fe1961341a2ea8245847b97501c8b252bb2b62ef3003688c15291c91ec1f07799c8125c48af06d6eddf4e2f6992c3cd3eb7def994 SHA512 977c874aab867255950096445c069823aedadf4de3b1433f186c059bf3d00a2626be2aafaa8a7b5b9399ef9f8636be23043716e6d0d1861a17c60b62a5222318
+DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
+DIST crc32fast-1.1.2.crate 38312 BLAKE2B 7448304242aba1798491da328eacc326132dd7c8bab21c9909bdd729b9b70eb321d00f992f6c7fc026ed2d0f6a562af1113e45baf61b907b8bdb4412357436e1 SHA512 f0ff5c889a89e0c235ff876d2e0bf50a5c97b85c6f19abbc3d12de26c97e678e784c04cc975be7d008b45fba7ac68c9a129680e37492d77f7a0f433fa895c659
+DIST crossbeam-channel-0.2.6.crate 64953 BLAKE2B 281d8ccc60ab2f4afe0e7b5d9fba5fab7cb2f3a36b8a04d4ac445bdd9f0838fea6b41dbe08be7f25e5154ffe2eb0fdb9304034080d881918a84ae3ef46bffd00 SHA512 6c124ebcecc70277b9957d3908acaa7c22c346f99b4e678eeda6a54406e1a6d703da6a95971dca248839cf831a830d172650dbc032de138c2d398f0f80a20c51
+DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
+DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
+DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
+DIST crossbeam-utils-0.6.3.crate 22304 BLAKE2B bb2c1cff2806cb7e8eb219d4bd63e4b2444a47f00c08b925bb165622cb1c50147732d939ab0a0e91fa7edbbae6c60cc9f78afbc9f49c3d097e6f5c2db5bf74bd SHA512 3a6df428dc2791a76823be7658905be2c45bb859703bc13e5c1142c4e5c815f2c0bc12da7419370c541afbba8e85c078f0ee0da65c27502972a6187c80b8ee7d
+DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
+DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
+DIST crypto-hash-0.3.3.crate 8139 BLAKE2B f42f7879369c90ded8dab271d5f207a327722dc3a5e386a31c60ca78e71198d3f44d2583bedf23530eda4970f6bbbcb2f4dab3855dd9c0095a5cdcc1a89f887e SHA512 a4c48e543f45c0752c4057ffcf0d6d50f7238a0b43cc509ad8451412a46df7f45f917cf3df26a6e3aa6fa66d73eb459c43c24d23d0f5107bbe585e412bd27954
+DIST curl-0.4.19.crate 73204 BLAKE2B 668d81467c9cdd215fcda75514d67ba286ba530f0122cb6406d8e8482c2146efb3ae472916822f47343ae809f5d031d20ee2beabd83c3dec4fe4a6b596c7e44a SHA512 dbcd94b7695db392ed2ad6b3335c0a9bd3db29319cf301489d5f902f250917c64fe6cf51476f0f1873275ab6984df73c39b6b3be3a7f43faddfb692333b68588
+DIST curl-sys-0.4.15.crate 2860437 BLAKE2B 10a0d95b6e88a8e06494f5cdcd9c1a9f495d39edcf63efc63cdaf4678c48057f7b18f1130a8bafdeabdde8c719aa668ac88c1f9ce1249467ef2d7b8480cb1b57 SHA512 d56f3a13c833b24578f72f72989896e8d045798ed90fcc16e8f36860ed962ce47e50f9e03df387aca687dc08d8072be9883690169a0472f414cfd0b0f38482ce
+DIST curl-sys-0.4.16.crate 2860720 BLAKE2B f37aa78730778c3b44558df89d059baed7f79cbc131de6004cdd0d2427797cba16b73fd8e547690a67cd01fb43df118517f0f9d925a39dc8dd2651e56b077eae SHA512 22842a0c973ed6581b1cc80519772f83510b5be2d4982d761db7884fd20e8654b184894aab72b94cea4fa218fa05013026c02cb3e4e2f277d269527ca8d3d134
+DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST env_logger-0.6.0.crate 27887 BLAKE2B 09370d369b4516ad5ff02ab5dc155a329adb7431a966d45c2d2ca91d20ac0235680f5872c452d9e55e59220a625494f54b3709a3f3b97c5e2ed991e24c85f855 SHA512 b75d8a6cf2fc88c926f3df8096211a46c39da418657bab73e65df373e5c2c187397f75ff6b02b9a2f18626f0a661cc5bccb03b39c72bcfdaab6d478b43fad8df
+DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
+DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
+DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
+DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
+DIST flate2-1.0.6.crate 64769 BLAKE2B 54a11a27a6db606bed5f2940fd35bee95afe9b4c4f9a434d7a607b248208586760cb28fb5b4dc2d43721d0e912764615cf8e1ae6bd4b7267f0d1d1a5c9294832 SHA512 b51c31d41db4f9732156a1f5ac956f0482d988174f06675498647d21cc70a22e97c2c01d8a5d0657b5d649c933f51582553da0be32b096f94fcf92402983967c
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
+DIST fuchsia-cprng-0.1.0.crate 2980 BLAKE2B 70b92c5e3b36c07ab357d4c1bdf26aa9813c91df36fa6f868faa5a65708f7bb5f4ed3cb45cad0e51e8c694c367e49d9328dbd8f0fbed8c4e5246b0f5ecf39bd7 SHA512 75a8a27a051dfff1eed67500d218a0f1a8f1c0859b1601ed8d7c4cf11b8bc0213e33f9f37b3461f2f8ea6d685f4bd94b678bee3ed48499bdc6093f04a387a75c
+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 fwdansi-1.0.1.crate 4658 BLAKE2B 9ff7630d03280a27d4c58e858391bb9fa0e51d4f8aab875e8b1ac6ceb5f97e0db27f46efeb8e380cefc0348cfc845a10c72cb97ab5ae8a287b84fcfca0773acd SHA512 171044bcb47a672f0d22014741e4509c571a20511ed8d9cbc26fd857b65979925e5f51affff1033c9899a6b5448a696f661e6ee617a349dc732edb02456b7098
+DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
+DIST git2-curl-0.8.2.crate 9187 BLAKE2B 6c42a6da60552fe38a2f83b79fcc2e884211e006369dbea7106434755ce60ffde4735e6d692afc848de914bab46affc10be751d75130f9d67b84fe74a1a3eeb7 SHA512 6713895f491341f1dc4dc3ca286358c8a20f8129c1a97776f60a8ab8c4e8b1fbb77e0d34b57cb1c09c8b917e7f4b8885f834f84e49813c7c6c57f1450b062888
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
+DIST heck-0.3.0.crate 54128 BLAKE2B e2b922c722afa5d67e2c8a1ec2195ce579541141c9fc983afb2589de4c5208702476bd57c928b5358a5f8d09c5e67c179c7c43bf6bcdf4031cc0b78385c92c94 SHA512 6987552f783d26064968c2860e1ffac9ec1cdeaf69bcc2966e81c151bc001e481157179742704d41d7094198559720b89ad4113b989a9d3288ef2f2550c67903
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
+DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
+DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
+DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
+DIST im-rc-12.3.0.crate 98492 BLAKE2B 0edb749ff8b20581c856cfa5d441ade046de26962eb39daf43592f6c4573a3cbbefa4b44b479c41960f31e6b9d1738ccd16c25118aaba633d9bd8a6b604e879d SHA512 a3981ccdce43de938d614f5f0ea7ed43b3d6eb5b8542c55e178cac83fe1e4ea0ffa4334f5a3499dea4e01934cb5ed9cb5898a71832e6838abd98662e1f68894c
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST jobserver-0.1.12.crate 19791 BLAKE2B 450588820d26d51a6b669faa042b8d9efc131bf2a077127468738f36f373d557ae4bad7ada5cd457540436d00d9805e67f1c886c2e2f445d5a78663dafb87986 SHA512 228af0a4174698b33be5ca5d1e87aac917e8d222f06594c7c69fcc541d0aba773012b791729c3e0669335147b62ce72259baf3ac0c9ededa3ef7c76752fbebe1
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
+DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
+DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
+DIST libnghttp2-sys-0.1.1.crate 2225580 BLAKE2B 05e0d61759122a98270a0da5a4d1bfd4ba740d6287ab75fd3491fb88f0e995209fd8718230364fe79d19d2129443fc23120d1904b12d5db832d4619ef4ee1e06 SHA512 68cbcef54c9b274050b1ef50b57b7256cc7dab36a89cd2a6bf698ecd27f02e644dcc8d2b16c61cf111dd35e09ad62c07c7069873e5cfc85273a661da34ffc989
+DIST libssh2-sys-0.2.11.crate 458377 BLAKE2B b9fa613a518ec21e5b90ef75ce0a4171406feb3be64accdc83b3d5924010d4b94eb95d1698addb44ca6756afd5663461506e3831035b745637741a35719b464f SHA512 4fee372cf5d546e6471177127041313291c7f1aa21777b1e9f0c6027052938fe4c6193b6925815b64248faf9086ea04014b6cdc0420135ca99403016700c15da
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
+DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
+DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
+DIST miniz-sys-0.1.11.crate 78188 BLAKE2B ad37f662e5f7d5eb49a49d197fbb0abb1516a9c044ae3db12d93bbf41e70cc7bc55f78f354aa3f77626005ef9c6186db4008f32e198422daf5c97fc0d8302722 SHA512 58f8c9cf01f8a5819f53fce02246172acacf89becd05c8eea32a06fb4b3911ad3b595fbffdaad5d0ca4af4dbc4e2d41c83e2fe82bc12c33b035360e83d17e901
+DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
+DIST miniz_oxide-0.2.1.crate 49241 BLAKE2B 769137bf1f3dc38cf3103e3ffcac8f6d04b95223fc4e404283088a68c6a3e6373c7199445dd7e53c8f89d5716ddeccf64208913a06b8c8636740cfe1c964505f SHA512 8f3cc13b919c6dca6c4601ccc66e0102fce505ad4082e1eaaa6b132182b9cecd5e564752ba3c62b8e9db9c353f46623afbd6415119b342c746c3b72e214ed5d9
+DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
+DIST miniz_oxide_c_api-0.2.1.crate 163410 BLAKE2B 003013ab9bb9013f17577ff729aef09265384baa0d1e1521a11a7515c6f7dedac5963d5999f45538ab0bc1e065ae0c9d73ed63fa8b71286803e3380491fb00ee SHA512 2347504ac3a45e502ace4192dee292ac656771dd9dc6557f66648b94e97e77cf7ba763b99ab9b81de053cd33756a7dd5d3ed5d2741ec88c2164729071823a9cc
+DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
+DIST num_cpus-1.9.0.crate 10599 BLAKE2B 2dafafa67a4f187d148019c690c609c01743dbb0a8df77fc2771ae08d288b12a20550d9d582218900e3caf291e0e83e1bacd3b76ae46e6e65b94d5a642235c7e SHA512 8e51f266dfa1b9837f677d41a7edafe3768a9a0fea552ff5e63ca52874d1bf174b7fab018b1a6c130cc33259d0ff81e31d3933a376535f63c28d6da206d05c02
+DIST opener-0.3.2.crate 14077 BLAKE2B 975f837863d54cd6a6c41c49d72e1b8225df60a25feca675a8fcd32e06f3a577ed0523b68ef37f6557d07aa355a72f91b136189ab269a0cadeee4cc9508408cb SHA512 21efe732971b929f46e343d54ad73f18a68bca95c941bd3be0a39a53f568872b9bebf41aab35ee4c9863595ac616ab3a305330279bf7d9a20ad9ccb13e6b01ee
+DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
+DIST openssl-0.10.16.crate 168681 BLAKE2B 6622e4f76531369337e8380447780d5e6eaef7b16b1cf04a58fe0a6dab195f27e4213ed921c999f72df7139b02ab268e9726594cbd10a570d697439a5f683824 SHA512 dff4e72f3da5bdc2b82012ec942f2725adecf2b62c42f9101436ebc8c3a38a2fed92ff421dbf02654371fa70e3345ca950159187cfe2ca5fdcb6a858197443ab
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
+DIST openssl-sys-0.9.40.crate 43360 BLAKE2B facfff126f92ad9be7f72b1beb8d6f30b69481494a71553daa6186fd16b861ddfa2b8a67a99d2dadf52cbf9712220c94e447aec37308b97b16caef31d92536db SHA512 6bd4eceaaa84a759bb6c250dde05241235e426a84382471c56618d6890d869c7fa56ec70c22ecf0435f5d83d7fc8509b68e0f9ff041a5d42ea4472d8769ba166
+DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
+DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0ff8929d49b00d5497e4fb28cc62c2fe34704b75f55fea416339be6c7417545a23b085d33af74b0ec31378edf2b0 SHA512 670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b
+DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+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 quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
+DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
+DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
+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_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.1.crate 18226 BLAKE2B 351d16c41d16b543dc8b4785cd6b8f5040f7c1e2370fb61537331373a0a4eaff6aaa34b3a68ba55f1d9ff408f7f4f0c6e614b6eab87b0e6ebef751585826706e SHA512 b1b72536883acfb97cc2797c1a3371a4ff466e454b61ea0a14ef1ecc81b423139d046a3bbac227d83cc71de4b398eef79e037d78a52d8b5c5a4eba1ae3b92c65
+DIST rand_os-0.1.2.crate 18359 BLAKE2B 699e5e8a542a92b631fb878bd5e8f5c925ea85d64cf00ab67191e16b428e583df9017ced7ec760477c4bb719bc5c718818e08c3a9ee6f504ea18b9e678c77ea5 SHA512 c4ffe4c8d0b5dcf40ca1b1804bd491345c411c9eb105be24c033aa7a76bd808af6d06ffcb168bad72e5adb5eb240827de39f483d80076a9f288316fd51e3d790
+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_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.44.crate 15254 BLAKE2B bf2ed8addf2dccdc4c2dcad2e3079f01788db01a839a9a99ec73389a1fc6e8d8e3aab61e4b3aaeeeaf76b451f5847c963ec71ba3e48d93474c0a9423d331c541 SHA512 c3f7225837be18775c50535d18888ca7ced5c2e577891c67eee34409b583ad685389d806f7aa24cefe6fc1a2b6dc47fef2a8e482f6c77a32240de7889ee1fda2
+DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
+DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
+DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST rustc-demangle-0.1.13.crate 11726 BLAKE2B cd97c38228174133532b0ddd31c0a57afc4a4061b5b40162a5ad222723862986a276a60a3917518420a125c7440c41b48a60f75497866c141e0c8787ae7a85a6 SHA512 3266d49f90301d814dde06ed9a2d0ed2a45e6f35cee0dcbb21aff213ba011f808d54ddd45c0f489ff3be06df1e6de0a0dec462a59ce2233edd1143d60b99314b
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
+DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST rustfix-0.4.4.crate 12698 BLAKE2B 06128ef65155657cc127e19bd6aea8e5a652f510ad0a290e7ab4578371f333f2bf4d53f5061b0273afb396e443887e43d65c4771ff53a32dcf234fecbeb7c05c SHA512 f20866fbc1f98095abd9c2a78d1b8580640eb59396806426b30271d376c3c0f3ead3d01880370d34065b0c6e5c3fbbcf1007d60139d8e5a55c6e7c78cef865e0
+DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
+DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
+DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.82.crate 71666 BLAKE2B 443f39840e8f88ad9a8d6c094ad6db759258a448ce2ee7c1036a4cdf446de522f960543f2a712d5d944dd8ede699b05eeb25a9f50cd128cbd3b7ec600185119a SHA512 287a11c84c8c2df98cdcb45916779f0ccca932f7901374dde7981ab16a8aa98a3cd79a698f9d126bac64269fe4def9b85b19bc2d200c2f302e916b87bf029ced
+DIST serde-1.0.85.crate 70965 BLAKE2B f6260c01d93f59542211ada91e38c77bdf0e493bf946bf33055e712aae55534c6343ed40d0d178b1f3de70172a80b482696398be4484f6d5a0c1d60099267e2e SHA512 695b6698b45f399dbba9ece3f79d3da973736260f9410cb9cdc149473d3f864cacdf5c851f1b73aae5cc33aae2949423520cfa4caf96cb3231d111238b7c7419
+DIST serde_derive-1.0.82.crate 47403 BLAKE2B 91634aff2026dcf90240a83b2955d02a286db6db9a91514645f5fb5d2e6ac860ed6f7f7b8b7526688ce3bbdc6feb46692a49b0388deadae014575418cb18cf82 SHA512 bb00e82c7768b59a01f8df31fc425476ac595186ba658c69f33ef5b7b9d419e891989e178daecb517d27a59639b8dc47a91be7d01f5a52c177aaa151c647ef5d
+DIST serde_derive-1.0.85.crate 48580 BLAKE2B 5d76f4397d7c04e69840a240270755e3ff4e1119f0ed46b68ba7b45789190330f1b79480e6955fe52bf3bb7e52eb71f711c8aaa6222e2788c3f191abe872e129 SHA512 719e8f7687c7ef3e8266eb2436e755c7fb013de6d8e6859676cce079f7044d9eb1d073ea00fec6c1be86998ab9ab8357aa70d866e3e3158176f031615be058e7
+DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
+DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
+DIST serde_json-1.0.37.crate 68709 BLAKE2B e72f8fb0677430dca0037a7b067c36848a60cfdcbf7338e7e46cc10652b1e54ddc5764bd3b60f27f5cc99d8c6b1fd3661fbc75499f6ae46f9a4af9f60e61c961 SHA512 8808dd4ab1c4a85103956057dd7c1193376d81dc2a6bb98848b2c516f8c0b4267a401737281727ad903c9461d74a0e172ebcc57afa32f97124c17c26b6d00b48
+DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST smallvec-0.6.7.crate 21450 BLAKE2B 35201ac343c2029d9ced9de0361d1ae9046913abc3701c5f6a000008eb7aabfdcb6a05b63368989f4f182b7f0ab89956d7d211a0760432887f2be975be9ce0e9 SHA512 2f3e45b27d8a1e02ff856e9690d982a8c785eef797f0e33beb8a832b6de5038d5ca3d285f49d67bbcf9fb2cb4de278dc33f2e77c615ecd333da014f56c8aec1e
+DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
+DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST structopt-0.2.14.crate 25517 BLAKE2B 7d7321b9abdb5bdf322c8170ea5bf8b8c3a995d9d8f6c50e5831f7ffa6c187ea11f0c8c2ee582b1b294b8eba2b09f37df708be157fefdbcc1008fd8a8c56e1f7 SHA512 785eeda171c384be44ce7780f6205eec7d5544867ee75f375cd7e23c799fa3e837308d4b41431380ca9fa2b8842d87a17066a81b3f498ad3f4c66c51284e5853
+DIST structopt-derive-0.2.14.crate 12411 BLAKE2B b29493467688d812113c595a8d6d8999976a4099dd43fbe09714496ba4c0c1fed4df9e081165c68195a6b57c973b7b528fa38935a7a4b457e2aeac969324711c SHA512 224ee21f11b9dd07754c8e6464cb14d25e56866e2a0c65ece46affb6dc905fe6f8268814999438dbceebabb475d4966ec2d0b3beb8418c9bd48a9e7a9eeeea55
+DIST syn-0.15.22.crate 146349 BLAKE2B 161ac0586b2ecf50b635cbf881820b1a28cbf3d52bdd5872eca7517eea6fcd4af321c8dab7f05dfc8d449a2744708143d082ffeeced934a25886a812e0ceff2c SHA512 78721f2925edbd0b3b0e3377833e7621ba66251fb92631f0295bbeaf15110a6ade2ffb89f1dfad847ac1cbb608f8d281459450b95940205a0058ed41e8ceaf0a
+DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
+DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
+DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
+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 thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
+DIST typenum-1.10.0.crate 30009 BLAKE2B ea68f463c2edd2cd7ace126571a88cead26ea37beb8a13ebc00eb033d9a6e9d7060bebcdb208830cea4944a2b2eae16e7ed7a60f0b9270868559292bf99df6c7 SHA512 9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449
+DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
+DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
+DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
+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 void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
+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-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+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 cargo-tree-0.23.0.ebuild 3215 BLAKE2B 053d6c2175b37f8dc3eb2fde333e0e687ac2772f2689a2e59900c5eca34c41d1a8d1798cf3e11a12bee7c74fd0c8bd75bfd52ca409e5bb636e7c9479c88fcc02 SHA512 4affbdcd74ac1ec015ce32ac87eef35c4c26903eac69682aa16804e1b7637cdeda7fa54f09256da22fc25a27bc5d7c0ed8c674cc4650ca14bd5eb8ebf89e870a
+EBUILD cargo-tree-0.24.0.ebuild 3041 BLAKE2B ba7383585015a44da1fbfa68ab9da4e7743478b053a4629e9bfda41889d21788f285fd3310a14404d29530c519469201820ef35cf794f395197c6b73dbd13657 SHA512 154a5711bd335553fb9a5afa9c21505291bec02fdebc4161d9a35affa472b0d2ca5705e514fc26ccb8489d41d6befe9292a6fa6616ef72cc02971d104c718dc8
+MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild
new file mode 100644
index 000000000000..360f71e835a7
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+arrayvec-0.4.8
+atty-0.2.11
+backtrace-0.3.12
+backtrace-sys-0.1.24
+bitflags-1.0.4
+build_const-0.2.1
+bytesize-1.0.0
+cargo-0.32.0
+cc-1.0.26
+cfg-if-0.1.6
+clap-2.32.0
+cloudabi-0.0.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.3
+core-foundation-sys-0.6.2
+crates-io-0.20.0
+crc-1.8.1
+crc32fast-1.1.2
+crossbeam-channel-0.2.6
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.3
+crypto-hash-0.3.1
+curl-0.4.19
+curl-sys-0.4.15
+env_logger-0.5.13
+env_logger-0.6.0
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.2.4
+fixedbitset-0.1.9
+flate2-1.0.6
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+fwdansi-1.0.1
+git2-0.7.5
+git2-curl-0.8.2
+glob-0.2.11
+globset-0.4.2
+heck-0.3.0
+hex-0.3.2
+home-0.3.3
+humantime-1.2.0
+idna-0.1.5
+ignore-0.4.4
+itoa-0.4.3
+jobserver-0.1.12
+kernel32-sys-0.2.2
+lazy_static-1.2.0
+lazycell-1.2.1
+libc-0.2.45
+libgit2-sys-0.7.11
+libnghttp2-sys-0.1.1
+libssh2-sys-0.2.11
+libz-sys-1.0.25
+lock_api-0.1.5
+log-0.4.6
+matches-0.1.8
+memchr-2.1.2
+memoffset-0.2.1
+miniz-sys-0.1.11
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+miow-0.3.3
+nodrop-0.1.13
+num_cpus-1.9.0
+opener-0.3.2
+openssl-0.10.15
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+ordermap-0.3.5
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+petgraph-0.4.13
+pkg-config-0.3.14
+proc-macro2-0.4.24
+quick-error-1.2.2
+quote-0.6.10
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redox_syscall-0.1.44
+redox_termios-0.1.1
+regex-1.1.0
+regex-syntax-0.6.4
+remove_dir_all-0.5.1
+rustc-demangle-0.1.9
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.4
+ryu-0.2.7
+same-file-1.0.4
+schannel-0.1.14
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.82
+serde_derive-1.0.82
+serde_ignored-0.0.4
+serde_json-1.0.33
+shell-escape-0.1.4
+smallvec-0.6.7
+socket2-0.3.8
+stable_deref_trait-1.1.1
+strsim-0.7.0
+structopt-0.2.14
+structopt-derive-0.2.14
+syn-0.15.22
+synstructure-0.10.1
+tar-0.4.20
+tempfile-3.0.5
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+toml-0.4.10
+ucd-util-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.2
+utf8-ranges-1.0.2
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+walkdir-2.2.7
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
+HOMEPAGE="https://github.com/sfackler/cargo-tree"
+SRC_URI="https://github.com/sfackler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.30
+"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}"
+
+src_install(){
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild
new file mode 100644
index 000000000000..ac198d100457
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.2
+backtrace-0.3.13
+backtrace-sys-0.1.28
+bitflags-1.0.4
+build_const-0.2.1
+bytesize-1.0.0
+cargo-0.33.0
+cc-1.0.28
+cfg-if-0.1.6
+clap-2.32.0
+cloudabi-0.0.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.3
+core-foundation-sys-0.6.2
+crates-io-0.21.0
+crc-1.8.1
+crc32fast-1.1.2
+crossbeam-channel-0.3.8
+crossbeam-utils-0.6.5
+crypto-hash-0.3.3
+curl-0.4.19
+curl-sys-0.4.16
+env_logger-0.6.0
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.4
+fixedbitset-0.1.9
+flate2-1.0.6
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-cprng-0.1.0
+fwdansi-1.0.1
+git2-0.7.5
+git2-curl-0.8.2
+glob-0.2.11
+globset-0.4.2
+heck-0.3.1
+hex-0.3.2
+home-0.3.4
+humantime-1.2.0
+idna-0.1.5
+ignore-0.4.6
+im-rc-12.3.0
+itoa-0.4.3
+jobserver-0.1.12
+kernel32-sys-0.2.2
+lazy_static-1.2.0
+lazycell-1.2.1
+libc-0.2.48
+libgit2-sys-0.7.11
+libnghttp2-sys-0.1.1
+libssh2-sys-0.2.11
+libz-sys-1.0.25
+log-0.4.6
+matches-0.1.8
+memchr-2.1.3
+miniz-sys-0.1.11
+miniz_oxide-0.2.1
+miniz_oxide_c_api-0.2.1
+miow-0.3.3
+num_cpus-1.9.0
+opener-0.3.2
+openssl-0.10.16
+openssl-probe-0.1.2
+openssl-sys-0.9.40
+ordermap-0.3.5
+percent-encoding-1.0.1
+petgraph-0.4.13
+pkg-config-0.3.14
+proc-macro2-0.4.26
+quick-error-1.2.2
+quote-0.6.11
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_jitter-0.1.1
+rand_os-0.1.2
+rand_pcg-0.1.1
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.51
+redox_termios-0.1.1
+regex-1.1.0
+regex-syntax-0.6.5
+remove_dir_all-0.5.1
+rustc-demangle-0.1.13
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.4
+ryu-0.2.7
+same-file-1.0.4
+schannel-0.1.14
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.85
+serde_derive-1.0.85
+serde_ignored-0.0.4
+serde_json-1.0.37
+shell-escape-0.1.4
+smallvec-0.6.8
+socket2-0.3.8
+strsim-0.7.0
+structopt-0.2.14
+structopt-derive-0.2.14
+syn-0.15.26
+synstructure-0.10.1
+tar-0.4.20
+tempfile-3.0.5
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+toml-0.4.10
+typenum-1.10.0
+ucd-util-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.2
+utf8-ranges-1.0.2
+vcpkg-0.2.6
+vec_map-0.8.1
+void-1.0.2
+walkdir-2.2.7
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+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="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
+HOMEPAGE="https://github.com/sfackler/cargo-tree"
+SRC_URI="https://github.com/sfackler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.32
+"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}"
+
+src_install(){
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/dev-util/cargo-tree/metadata.xml b/dev-util/cargo-tree/metadata.xml
new file mode 100644
index 000000000000..841547e2c570
--- /dev/null
+++ b/dev-util/cargo-tree/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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sfackler/cargo-tree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 0d4b3037a7d0..96adf587f27a 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,7 @@
 DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
 DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
+DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
 EBUILD catfish-1.2.2.ebuild 1505 BLAKE2B faa976f3a9b71d1e3c61e3ff34a6aa994572d0f5e948e0d8b12cd09a6bc078d9e4d69d3bebfca9acbb64fd7e9a85ec0f9389fa407b35966a63663f3240cc73d4 SHA512 ad5ae1955a0fd0607bc42c40d05dd0fe7442a57ccdee60e150016d9e6fea7c7b8dcebda300dbca14db701a0589feac2ff8a4a8917c054eafd4a76d113daddfe6
 EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 604b7dbefd52af2d03b84c3470f3d87544132a7ac2381b88d56e8240eebc565d5b45f10076976ec011890fb160454336d7e754555536caa0fe5f1cb891c86d6a SHA512 fa0c10c2b546fa033463782e125b47de71765cfb0ea34dea8c0a6469793ba68bc411c5d50255c81cf089aff8080fb0db313dbfd4dc99c4cb834175cfa9d4dfff
+EBUILD catfish-1.4.7.ebuild 953 BLAKE2B 4f4435e59d8e4001617ce367643a8595f5c98449adc3ddd1891ecbbb4bcad12556533a09e5f8b4f0521b339d92e178d2412073a57c2ad7946093efbf0e865a12 SHA512 f2018305babd9b7c9e8cafd5d02436f852dd1bd9e3baa2c8e11926671575e85b9ffab063646233eff0324cb2345fb942e8d7a7b4dbd4aef4d2e0a9f31fc85949
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.7.ebuild b/dev-util/catfish/catfish-1.4.7.ebuild
new file mode 100644
index 000000000000..cdd0e8511b7a
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 50ac77546524..23e8e814a1c7 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -3,6 +3,7 @@ DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f82
 DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d0189878e9ffe4ceab273ea377cd489df27d9d6c589641dc614d0c8982fb19d2452d4ae88609adaa9a6aebf70baa SHA512 d51d17765d705424dead65e4240c52fe93da731d5ac1cc76fe79e2eb68a42c26a7de58b08149cccd6806ee5bb189df8c15c3a532a5f857a65c2fd69c656d7137
 DIST cbindgen-0.6.7.crate 84579 BLAKE2B 6307bc70346acd1340393c07460198666b7133d3cc21c0d02712a017458e3a228ff6dc6f3cfda8d560e5cc8eb6d9a15e52309099dc7deb151bf157ed6856ef6f SHA512 1a2a3f2055b0527b878b78834e6c802a171ed5f3494ff4819622f8244821d9a1b23d34d0c9370bee10a9f334cdbdfac43cb513f61bd49d57614f66825cd78030
+DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376aefc8496a6b728eddce075a2aff9076867adfc0b6104a3317fc1e205fa4399b773211944261f8495265eba574 SHA512 ee9856e07ea55c03f4a715497167a4714e3d1297c1f52da2fef507b44d93f258ca2eda8004befb3915a9cfd783b44e6768706de5efa3cac6f7a778bf8ccb4e76
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
@@ -27,6 +28,7 @@ DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5
 DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea38e681a9b9234b0ab18bed183862178bec132d5ceef5d40a63d37a2fd872f16a509d7f6043b3eb27ef8a3 SHA512 408c785e6c6f7f63134a22c383f54ed8ab45d0521e1ddaba9204b21d1e0e56242e153377bd3ff67467816d581c91ecf663cbb814b1d6549a961e01f20b331482
+DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
 DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
@@ -39,4 +41,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.6.6.ebuild 952 BLAKE2B 5916e4bbb6e7d1b42be8d7488d1ed5a2ab078ff89a6449e0a0520f68bf3d05e30001b58a52080cd510b4cd0c75d48228bc47722c21188b2e7ea92eec3766a8ab SHA512 666ce07daa9f3e120fcedb67705a803ac43770d2f7c7915f7690f99c62fa8183ff16222b9ad58c0681c6fa86ab0689d02f2f615ef6fec10fde7e65a1fcd4a0bd
 EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58b4438c856764bbed32ee8cf5057530551d6c4a857ae9ee8a9f316b43db7f35d7ab1a5f07daeb98d3b1c0961cf SHA512 cf11bac47b5c4313b5ce328f1229eb14b9dff879ac887be66f607ff3969797f46bb1eac60b69df7ccd50074251dbacf96e598dd939db69d623d74e6af27c5bc2
+EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df2f53eb9384dd9446cb034916255f1afbce29a045553177daffe94597c6991dd30917f7a17ad86100e530121c1 SHA512 be4cae3e22bbe5f9ebd6e00627d626615a9e8a04118e080432d4415ca0fe201aa76b5553e6360fa3b429624bd6f3850540e9b348e6751b5a3ba8b58becb5fe75
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.7.1.ebuild b/dev-util/cbindgen/cbindgen-0.7.1.ebuild
new file mode 100644
index 000000000000..a970e9c866d9
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.7.1.ebuild
@@ -0,0 +1,56 @@
+# 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.10
+bitflags-1.0.3
+cbindgen-0.7.1
+cfg-if-0.1.3
+clap-2.31.2
+cloudabi-0.0.3
+dtoa-0.4.2
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+itoa-0.4.1
+libc-0.2.41
+log-0.4.1
+proc-macro2-0.3.8
+proc-macro2-0.4.4
+quote-0.5.2
+quote-0.6.3
+rand-0.5.5
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+serde-1.0.64
+serde_derive-1.0.58
+serde_json-1.0.19
+strsim-0.7.0
+syn-0.13.11
+syn-0.15.23
+tempfile-3.0.3
+termion-1.5.1
+textwrap-0.9.0
+toml-0.4.6
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vec_map-0.8.1
+winapi-0.3.4
+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/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index f8f982f1757f..bbaae59e9c01 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,9 +1,3 @@
-DIST cmdtest_0.16.orig.tar.xz 32960 BLAKE2B 61ada4e01007afd41766efb90ec3d9e2caa9453c9759b102a9dd5fb51652fa15a18b490840c9fefc16fbabcbae9964f97655f7b76ce8be36002a685e6fd8000c SHA512 5be73dc1d71706ccf220dc91944d353e4745cd214b54977f0a8093bd540114747a78cf9f65c9ed926bcc0749839e3d9252a23d1ff3c1d05fbe87eceb4915bc26
-DIST cmdtest_0.18.orig.tar.xz 33156 BLAKE2B 11167a16216e14bedbd35a129e9fa84d491a00d4b80acf83ea302172e31a8493544a7ed4d9f446fec22a966826e7b46084ed2f6c1daa7ef34d4d1a1a86a8b5dd SHA512 b5eb9d58401a93fa31cded35338e734a50cacc6af93423b020912a4b1c63d7bf9e35c588ad47678a0395aca6d4dfda76af7c92fbaf41884d542055a04f6406b7
-DIST cmdtest_0.27.orig.tar.xz 37088 BLAKE2B c9f3d898396172cf3957cf3bc13d13629da7074c4e4d80a03cb6c06b6816ed9f1b986a765185d30e49a80e0e646da27098edbf6efc6b04018732dd37b9718b0f SHA512 6c8aae6b60863d75bd1f57bd45589f3b201c7d2907fcbcc7c2a8aa2fe3bf766ab4d9688998046e36c76037e7d3fd2559c26c316216941a55a121f4a87299928f
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3
-EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
-EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
 EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.16.ebuild b/dev-util/cmdtest/cmdtest-0.16.ebuild
deleted file mode 100644
index be5040f8f4b2..000000000000
--- a/dev-util/cmdtest/cmdtest-0.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp
-	dev-python/ttystatus
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmdtest/cmdtest-0.18.ebuild b/dev-util/cmdtest/cmdtest-0.18.ebuild
deleted file mode 100644
index 658bc7c80668..000000000000
--- a/dev-util/cmdtest/cmdtest-0.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmdtest/cmdtest-0.27.ebuild b/dev-util/cmdtest/cmdtest-0.27.ebuild
deleted file mode 100644
index 005e6458d635..000000000000
--- a/dev-util/cmdtest/cmdtest-0.27.ebuild
+++ /dev/null
@@ -1,28 +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="black box tests Unix command line tools"
-HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/ttystatus[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index f3307782bb6a..5f3d7d289eac 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.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 EBUILD cmocka-1.1.1.ebuild 1095 BLAKE2B 4f7d129d14ceed9431bb912ee006c7bb5cb5b553a092db59e4f0c4db322719795c87bd4bbf55e8828a3fc3b690e7dd6b62fd9c7af2d93ac0a7623381cdb2545c SHA512 25c81f57cee7f851e84cdece68206b5fcd28604698622037f900438a5a740312928dbd75417b4b112759ed1f8f5fb7aeece936b0b7bfc63c5221016256f5996d
-EBUILD cmocka-1.1.3.ebuild 1224 BLAKE2B f1301f881a35fb74786c8802a490861af2361fd033ff78669ff6838ff69167a08788a660cad7859d5b4f63f01a6571087fdc16250545d0a936f8096c6f528dd8 SHA512 78b010b4468e36d61ff20238cf510788bc0636b844c94cb9dc518371ca607ee8f66ade6db2009a0f80f5eea2ecda95cfcf632d8fe6a5b8be7808035dbe32e606
+EBUILD cmocka-1.1.3.ebuild 1219 BLAKE2B 0451bb5201f4c28ee6ac5927bf9906eb333c7ed611d43b99f1070dd7ff6a9b8e23a9b90a225e4611554ef3d5eb7bac30a366a04469a310de159bdad5f9864491 SHA512 cd8cdb6a369b14a2da0d48876810a3ca7f0266c3620ced47eb3eb95e318eaaf3de626659f348417180ceb6d9eeba9823a404fd27fb5d1ca8af1c156716beed0d
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
index 8153e29cfdba..a0304765d7d3 100644
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.3.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/cunit/Manifest b/dev-util/cunit/Manifest
index 27e9dc43b927..af4597d2a472 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,5 +1,5 @@
 DIST CUnit-2.1-2-src.tar.bz2 349037 BLAKE2B 51122ae79f15ebaf3b4a4f46acc8f1e08e918097d1308409b02e722e6eb7e0147d14461dd834dfbdb95ad8bc230076c05b3700348781e2a9b31bf29898c61435 SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
 EBUILD cunit-2.1_p2-r1.ebuild 1369 BLAKE2B 657474b205f655405f4402a16da33a06f383f7593b73f281925d4dba1984aa46df97b51f145d540bcf96792af209f1d7a29fe477d0c425737eab437c6f9a7000 SHA512 103e1cce7157000d66370e883623039068e3734aa96a2c8df59c30415e5610a19865df88d8406aadfe09de60632512b465f03de3f02c2887c91da0eed0a27685
-EBUILD cunit-2.1_p3.ebuild 1384 BLAKE2B 7cbcf32948969a5669c8f17cbf428f19f848bfac875a9230cfa87f0dc703ba2547e97c4451a982320f7c6e0995d221869c076a1863a79bcceceb4e5e81b459f5 SHA512 62a6c3d04d65a41fdb3f9546c0455666411674548d63335be1e427f56471647dc5e956d26ca7116370dca804ddf8dc1e6fc301c7c40017a36c644a324805428a
+EBUILD cunit-2.1_p3.ebuild 1380 BLAKE2B 8ceea375f908db3c535fb2a7216623eea7b4ac1a83a2d8372f8e015a74466a0ff6dc5f5e07705d5c33722eef1977ceb7865284f90f902b4429928519c7a70ca8 SHA512 7c4115168dc3ef0e450231129054b016d231a95b495d30b4b5e6b300d89ef8a96a621a74036b7db71ecc281f35129509132f1c402d8f73ad4fc89bc0ecce00f6
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 297393113af6..53ef6b36d994 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.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 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 0c7af8ea54eb..5434d8b9a8c7 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,9 +1,3 @@
-DIST goland-2018.1.3.tar.gz 221579069 BLAKE2B 16ead14bc3401fe7b031576eb9581613cac1352b42933acc83af77946376017b6658fb04b556b028a6f89f86a65b60290e1f6f9b5febe2dc10c85b5c6004879f SHA512 24f1c384139276301a27a9df1056560f3ee89ef9817690c00626eb0522fed8a58ded3bd3632aeac8f25855dd2c031c40f937761625f6545504eb2f3e7d0d509b
-DIST goland-2018.1.4.tar.gz 217585781 BLAKE2B f4bdd554003b2397911cb767ffba558fcf06ab9cfd20c0017579cf82c6af93681e16c23db82c3cf0b47c4bb6a2c37c564be5ee9d6400cf91cb3a0938309166d5 SHA512 972c15d6636728e214b355ce4ce7174d08e0e842c6ca4e4385fbc4330930a2fae3a964b1b3753c38fe77ac2b8073fd7366fd0085d00fcf05b832c985d6243325
-DIST goland-2018.1.5.tar.gz 217591227 BLAKE2B 7a45497f8706c77bb8e729b1e6affc88e1b9230a396738bad235d55bb40ed5a728bc674d210b04eedcc4b144f60ac91f6216ed010940257227cefcb167b81aaf SHA512 cf861bed38f0678f9734632d988c37cc1bd5c596fb23dfd3f9d60642f82c5f356809de116a138888638ebd7f464201d0ea780e694f9f5c5c66d3245a2b15f484
 DIST goland-2018.2.tar.gz 236750402 BLAKE2B 54df8b09f4ae59323c4b8aa06d41a23753399d36fbdf34a0ecbb159d00fb5a6cf29fd4aeeaee9d853b54d2ceaa8f99ad5560128b4e50b4ad2720a2db81df7dc3 SHA512 f1c7ddb94bb918b9668d444e285f4ff82b45c9aa1e24e848f32bc219b2dd48a939d52f6c5c749fc76bfdd3f58e2f2a72ca2275a9291a7a5a5a3c6a30c4780420
-EBUILD goland-2018.1.3.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
-EBUILD goland-2018.1.4.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
-EBUILD goland-2018.1.5.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 EBUILD goland-2018.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/goland/goland-2018.1.3.ebuild b/dev-util/goland/goland-2018.1.3.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.3.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 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.1.4.ebuild b/dev-util/goland/goland-2018.1.4.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.4.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 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.1.5.ebuild b/dev-util/goland/goland-2018.1.5.ebuild
deleted file mode 100644
index d46b730ae466..000000000000
--- a/dev-util/goland/goland-2018.1.5.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 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/idea-community/Manifest b/dev-util/idea-community/Manifest
index 44f778eea62f..003cefd20ecd 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,7 @@
 DIST ideaIC-172.3757.52.tar.gz 442963100 BLAKE2B e44f924e279a5b8f2bddbe65cffa24306920fa0f5b85e23b823b1e51fd49e2de2c8953a010b66ea325c4b70ae60268639293b67cd6116f4315ded5e5f6130da1 SHA512 a0178c5ef10aeab527bb8064840c53fff97bf9be468a4e5248b83dba96c5114878f5ff1e20436a67ee488580affa3fb3a2ea627407ed57b87949f64fc1a215d2
 DIST ideaIC-183.4588.61.tar.gz 541751086 BLAKE2B 51a5a4dae10d8fd00a0c239f87af3d53b86ffa50f7f9c4f1554265b349d866d60a8994a96f184cc9993fafe12de3dbfa77e3931626436a5f3d3854710b52fb9e SHA512 3e5956353fc0fabbe91b3a946e83b0b3229766a366fdf782c4c017acd7de5a86b3e0cc870a17abe2bdb8b090cb5c58b6c170555f60ba5e6a9a8198073545be87
-EBUILD idea-community-2017.2.2.172.3757.52.ebuild 1918 BLAKE2B b7fc3cb59edf859c51d9fa674ebfcbbcf3f88399f3f041f792930b98978edb0caaf59c576333bfa9eed5b5735666cbfea6562c1464f96d597658c04685cbb8e5 SHA512 53ff12fab08f75925e1627e8400c27a7868e0dfb2a157b0f10b0feea34222f3e71e0eb3af274db1e3aa4a24ee96e15a8e11adc4bf083ac8fe4cf1673a8272dca
-EBUILD idea-community-2018.3.1.183.4588.61.ebuild 1915 BLAKE2B b30df4353a74ad65d597026140b3d6d7e6ef2da3182ff800f84c33af87f6f758cc3a7424ac354df6804aa46683eb6a3db2818993e46389354aca57041cdbff76 SHA512 a195e09938cb1ca9126b31be4d645074dc00049cff5e2f0eab5d1867d0da3c8f991e6d1747781c904b9928fd7dec9171c857cc2bc3679b7a54a1358b53f817b6
+DIST ideaIC-183.5153.38.tar.gz 541754349 BLAKE2B 541054736db09c8f0106d5588b224d3033ec21a1e2b566fbc95300fafd39acae5c7f6755082bdb189c5619ed5375ea9fc3e777440d30523a84f864be29e5ad85 SHA512 0bb213da8bffda7d63fa29905d01ee36c3839249dd6e2a58b3941e4317a01bd9315e8bf639f088657938c8197eb2f05fc34fb3e0c49f8c243043cb03f8443f0f
+EBUILD idea-community-2017.2.2.172.3757.52-r1.ebuild 1881 BLAKE2B 00ede33b80b65b56cf716c76236590e470a24ada2ce6ac6350c09c3e7bcf8f478b79e671fa000e8bcd35b280b1fd25914017cba43e50cdeaa9a1e1b81aaa03dd SHA512 69b217495ba22e12ed6cb5bb753ae0d7357c8eb7311f1faf511c7fb9c5cd07b6cd6baab51d957e44c926f8a1010860010d1913655fa6cd6fec1767aaa00d5e26
+EBUILD idea-community-2018.3.1.183.4588.61-r1.ebuild 1881 BLAKE2B 00ede33b80b65b56cf716c76236590e470a24ada2ce6ac6350c09c3e7bcf8f478b79e671fa000e8bcd35b280b1fd25914017cba43e50cdeaa9a1e1b81aaa03dd SHA512 69b217495ba22e12ed6cb5bb753ae0d7357c8eb7311f1faf511c7fb9c5cd07b6cd6baab51d957e44c926f8a1010860010d1913655fa6cd6fec1767aaa00d5e26
+EBUILD idea-community-2018.3.3.183.5153.38.ebuild 1874 BLAKE2B 4934885f97219f27dcce193cbf7a59c2e48f7eb4921f57d048e6c595823c48b7a99ba832612cc3f32044366e6dcf3a21d20e82a95da7d1ca556b89ac0e6947ee SHA512 884d0ceccf5a93568d9eb5af2f5115d7c8c882d4515e69686336a91d0bd0a6fb5393f1a3845b91189130beb6b9ca45ba7ae4f171a3075bd0efb35b4aa892b47d
 MISC metadata.xml 533 BLAKE2B 1c711c1c3f3527e91ac205b74abb70a8c163abe5a289837ed2a70dd7a37f510c3dae3e37d8540dad6bfa5d7fb7c82d7070df3dfd7e9ea0b1c85745d3eb66bd75 SHA512 b14bce0b72eb777929138e64a53b0069faf51ec4f1d8b3dbb24a9f2d7f9baf68d5e495e784c83c34c1190d52aea16de52485a815786de235091b75f2778d5e23
diff --git a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild
new file mode 100644
index 000000000000..bfb9c749e703
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0
+	custom-jdk? ( GPL-2 )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre64 ]]; then
+			rm -r jre64 || die
+		fi
+	fi
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre64 ]]; then
+		fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${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/idea-community/idea-community-2017.2.2.172.3757.52.ebuild b/dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild
deleted file mode 100644
index a4f2eb0c7987..000000000000
--- a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${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/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild
new file mode 100644
index 000000000000..bfb9c749e703
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0
+	custom-jdk? ( GPL-2 )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre64 ]]; then
+			rm -r jre64 || die
+		fi
+	fi
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre64 ]]; then
+		fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${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/idea-community/idea-community-2018.3.1.183.4588.61.ebuild b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61.ebuild
deleted file mode 100644
index cc1ffa36d7ae..000000000000
--- a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${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/idea-community/idea-community-2018.3.3.183.5153.38.ebuild b/dev-util/idea-community/idea-community-2018.3.3.183.5153.38.ebuild
new file mode 100644
index 000000000000..3811dacddc7e
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2018.3.3.183.5153.38.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 4-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0
+	custom-jdk? ( GPL-2 )"
+IUSE="-custom-jdk"
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre64 ]]; then
+			rm -r jre64 || die
+		fi
+	fi
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre64 ]]; then
+		fperms 755 "${dir}"/jre64//bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${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/meson/Manifest b/dev-util/meson/Manifest
index 2c962a524764..381e3b3c4763 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,17 +1,8 @@
-AUX 0.48.0-multilib.patch 2180 BLAKE2B 8201fe0c2e495671129653ae9fb9ff9135d28d4c49a02d97f0a5d78031272ce34733e95d48cb8b70bd933c939b96b068ab2189856c1281f4c606e9fce419988f SHA512 75facb5b8d668175c75313299ee570028dab266d1e0ce0e7d2d21cec3df1e2308b80008e2af801bfd63b931bf3a8fbc6a70f02dc1f5d371dddaea6365dca0daf
-AUX 0.48.0-test-u.patch 927 BLAKE2B 620c4a1a74f562259e3ca48e409ba7be973e487479bcc14b5e354fda9122bb4d4eca0711f9385b93d4b1b68ee6a890c3948b34d1d43bd2d8768cdfe3cfa86bf0 SHA512 85645439625174469529cccb34b1198c07975141900d63dad40a4ff678c3abbcca44e270ba05f6a9d0e9fa4fa92515f77f56545ca3a3794c9d02dd198d6847a5
-AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da790600537e623e6c95be03b73ac48dae0d206cd2b91d8226f857f13c2545f9250c64e3917e729d75 SHA512 dbfa0596751a117f428aff29fc0879b8ca37fcefff96dc2815164bde5cd60ff9f722359a6204bc509e4548ec11a69d9ccd1e1ac99175202434c41c183f045f2d
-DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
-DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
-DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
-DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b
-EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.47.1.ebuild 924 BLAKE2B 8d581fd6b067bac2f1df75966404c52965200621efaf1e9c2ba49f66370c19bc28808c7bfd1e8f425f8a3417f140a906bd1e4705e64bd3dd220e18768e37ee76 SHA512 d4f8e48e3cec8dd09663ddf9a85bfa4b2e4882633d68f0a4f2766938da90aed1bcf84cc4a167fe56782258f9d5162f0eb6d24a59af311daeebe9913d18b1a61c
-EBUILD meson-0.48.0-r2.ebuild 1205 BLAKE2B 6b7b273e23e9e28e8fe78d20948802ed6834d017930bd8ddb286a0c01af68fb9d91443bbebbf8c1a82433759a6b74be85c744fb1fd812d3e2b2b8e3bdefe2105 SHA512 f107c74333c075cccae7e91afb465ced0c7f8d21b5c13849b425c6581567d854a663f0f452efb7ba7ad6bc145c2d8c8e5bdef80a12770c46fc7fd9e038646420
-EBUILD meson-0.48.1.ebuild 1139 BLAKE2B 813a717e745a1adf42be7e66a7fda714b9244a80859b8983470ae34abaeb4c1e09c28d8538ca7a9560131609ed5408c7f9699f92200847341d06ec86b6e02882 SHA512 ca5ce3d1069263b4b4a88535c15e768ee7131e0a8a1155c39c614dee20a8eac7f598ce7daa270853fa968ad0e2ab84078bcbff251d4744c0de7e9f91c433ba96
+DIST meson-0.49.1.tar.gz 1340585 BLAKE2B 7df52f68948c74d4d713d57406a7b496e33740e43ea069b5cb6474a80b94800f8af7983413f3154eb2e6b7f0ea8df51e7359b8b7c6661f454dbb9a21ccf9bdc6 SHA512 cc955509d2c82b12d347f7a670a0e2abf5f6a4455dda3d53ec4abb0930b5f1c4a0ff996223ba5a5333bfec66e5d3fb3448a8187d4640e4b65397fc3e0e43dc72
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
 EBUILD meson-0.49.0.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
-EBUILD meson-9999.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
+EBUILD meson-0.49.1.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
+EBUILD meson-9999.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/0.48.0-multilib.patch b/dev-util/meson/files/0.48.0-multilib.patch
deleted file mode 100644
index 0b488f50cd5b..000000000000
--- a/dev-util/meson/files/0.48.0-multilib.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3bb300a76ed4d7a614c4a83ddefe86425040ec13 Mon Sep 17 00:00:00 2001
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Mon, 24 Sep 2018 11:08:19 -0700
-Subject: [PATCH] backends: allow running host arch binaries on compatible
- build machines
-
-Meson 0.48.0 some validation for using compiled binaries in custom
-targets and generators, which is nice. It didn't take into account
-though that as long as the OS is the same, some architectures support
-running a related architecture natively (x86_64 can run x86 natively,
-for example).
-
-Fortunately we already have a method for covering this case available
-through the Environment class.
-
-Fixes #4254
----
- mesonbuild/backend/backends.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index 0e7e8e0fe3..ccbbe173fd 100644
---- a/mesonbuild/backend/backends.py
-+++ b/mesonbuild/backend/backends.py
-@@ -13,6 +13,7 @@
- # limitations under the License.
- 
- import os, pickle, re
-+import textwrap
- from .. import build
- from .. import dependencies
- from .. import mesonlib
-@@ -731,10 +732,11 @@ def get_regen_filelist(self):
-     def exe_object_to_cmd_array(self, exe):
-         if self.environment.is_cross_build() and \
-            isinstance(exe, build.BuildTarget) and exe.is_cross:
--            if self.environment.exe_wrapper is None:
--                s = 'Can not use target %s as a generator because it is cross-built\n'
--                s += 'and no exe wrapper is defined. You might want to set it to native instead.'
--                s = s % exe.name
-+            if self.environment.exe_wrapper is None and self.environment.cross_info.need_exe_wrapper():
-+                s = textwrap.dedent('''
-+                    Can not use target {} as a generator because it is cross-built
-+                    and no exe wrapper is defined or needs_exe_wrapper is true.
-+                    You might want to set it to native instead.'''.format(exe.name))
-                 raise MesonException(s)
-         if isinstance(exe, build.BuildTarget):
-             exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))]
diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch
deleted file mode 100644
index 099d4686b963..000000000000
--- a/dev-util/meson/files/0.48.0-test-u.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001
-From: Masanori Kakura <kakurasan@gmail.com>
-Date: Tue, 25 Sep 2018 18:04:06 +0900
-Subject: [PATCH] environment: Use os.path.basename() when checking
- mesonlib.meson_command
-
-Without this, when one of Meson's parent directories contains
-"python", unexpected option "-u" will be passed to Meson.
----
- mesonbuild/environment.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 7a44f2fd..a0c2fda4 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -375,7 +375,7 @@ class Environment:
- 
-     def get_build_command(self, unbuffered=False):
-         cmd = mesonlib.meson_command[:]
--        if unbuffered and 'python' in cmd[0]:
-+        if unbuffered and 'python' in os.path.basename(cmd[0]):
-             cmd.insert(1, '-u')
-         return cmd
- 
--- 
-2.19.0
-
diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch
deleted file mode 100644
index af7b9834bf33..000000000000
--- a/dev-util/meson/files/test-llvm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 6 Oct 2018 21:11:36 -0400
-Subject: [PATCH] Disable testing of static llvm linkage
-
-Gentoo doesn't provide static libs for llvm.
----
- test cases/frameworks/15 llvm/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
-index e05fddd2..9b38a454 100644
---- a/test cases/frameworks/15 llvm/meson.build	
-+++ b/test cases/frameworks/15 llvm/meson.build	
-@@ -20,7 +20,7 @@ if not dep_tinfo.found()
-   dep_tinfo = cpp.find_library('tinfo', required: false)
- endif
- 
--foreach static : [true, false]
-+foreach static : [false]
-   llvm_dep = dependency(
-     'llvm',
-     modules : ['bitwriter', 'asmprinter', 'executionengine', 'target',
--- 
-2.19.0
-
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
deleted file mode 100644
index cabc6b2b4e6d..000000000000
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.47.1.ebuild b/dev-util/meson/meson-0.47.1.ebuild
deleted file mode 100644
index 6a61d5bc6660..000000000000
--- a/dev-util/meson/meson-0.47.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
deleted file mode 100644
index e7fe15297da6..000000000000
--- a/dev-util/meson/meson-0.48.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/test-llvm.patch
-	"${FILESDIR}"/0.48.0-multilib.patch
-	"${FILESDIR}"/0.48.0-test-u.patch
-)
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild
deleted file mode 100644
index 882072a2fad7..000000000000
--- a/dev-util/meson/meson-0.48.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0.48.0-multilib.patch
-)
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.49.1.ebuild b/dev-util/meson/meson-0.49.1.ebuild
new file mode 100644
index 000000000000..6149ebc1ee51
--- /dev/null
+++ b/dev-util/meson/meson-0.49.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	if tc-is-gcc; then
+		# LTO fails for static libs because the bfd plugin in missing.
+		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
+		# https://bugs.gentoo.org/672706
+		tc-getPROG AR gcc-ar >/dev/null
+	fi
+	distutils-r1_src_test
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 31b02901a507..6149ebc1ee51 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-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
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 39553279985e..69983011a40a 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -3,10 +3,12 @@ DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69
 DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb8b139da45bfb047cb1fdeacc9b64f17982edd237ed0633c391c15326ecaed7d9e599b3f87c0a16a2eb1302ceb37dfc1e0329693d0 SHA512 8d1f418bd97d8249481ad63fa699c141e498820698485b74c6f08674e4b0eee6054e9ad1e59260342fd615a5030ed932d1177ed8173ab9cf6026561c10fee9d8
 DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
 DIST pycharm-community-2018.3.3.tar.gz 310740450 BLAKE2B 53552c228c81b17833d02a18f21838e768fdce3de8595a32fa832938208520306c1858d1e3ca509671e0412f2ec3b70acdf802a8af38816d91970f0c08b93147 SHA512 f1e774633718361fa623cb9810cd23be5da98f1bdc6cdfb01ef0980aa1163e0dea1e6c4ebbd1496ff903d81fec744f022a7c7854e29302c19d503541565dd1a0
+DIST pycharm-community-2018.3.4.tar.gz 310736836 BLAKE2B 2d43955b4d4299026c3fccd00c42e71b98c314d33857b1f81a84f365efde4b89d29b8c20826a3f89b6dc36fb293d867874edc75d68f5070516a27ccb68034cd2 SHA512 35b133b0db3b7fdbc4f08d0070de5aec8b3f170657c932e5c5c0af2e8c4be8b9e408558a0595794acd73e2ef5085295929b2a11013e6e72b852fead4ce572f60
 DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
 EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
 EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.3.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
+EBUILD pycharm-community-2018.3.4.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
 EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 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
new file mode 100644
index 000000000000..476b12dea206
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild
@@ -0,0 +1,54 @@
+# 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-professional/Manifest b/dev-util/pycharm-professional/Manifest
index d62509e93982..bc426f63a985 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -3,10 +3,12 @@ DIST pycharm-professional-2018.2.4.tar.gz 343705704 BLAKE2B 69cb8a57f8daf8d986c2
 DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48e16a8c047751a88c6ee6e4862c6dbb8df12aa3e0e57a3d0d61c2cccb5995f2763e0d99eaaa967c19c884c40a350a7148dae71a66be0c SHA512 9324315f865bce9b379ab9f698eb6e97917aa3cb4ef90612b22d33516c18cfbed9fb806dd9bd4884ead6e7a72e2b481e5636956630ac7da75234ff8ba4975878
 DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
 DIST pycharm-professional-2018.3.3.tar.gz 398193313 BLAKE2B 14445d3c3cbd7be865569971d37943caff56a14198c9e81708d692110e4abafdaf10700c842f72f54fe252b2e211b46aa4336f583ae548e0d65ee3ceed4ce95f SHA512 ba8807491a78c0da2e772724c15c9aab6e48383f5407adb98a34d5196e2a1015f52f3eef9fb20c0da9115e3d283ed115663a732fc930cbc2bfc8f63d4ce0af5a
+DIST pycharm-professional-2018.3.4.tar.gz 398325518 BLAKE2B 27ff339d2e8e3db0c94f7a1d8d9e1c740380f62d4b132dc37afb2e1cb4b6ccacdaf29e6caaf25aebd25e650c7a4d1a089b74b3cf1ee8d492722604b11644467a SHA512 34f2461e0af1c18364e7414fe4f92fc34b1c82e17dd2db0c46b812909febb30e9aff26c1c363072f36facb6bbd6d186497fc02b6a7916c808dded63fc7350696
 DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
 EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
 EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.3.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
+EBUILD pycharm-professional-2018.3.4.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
 EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 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
new file mode 100644
index 000000000000..4b028da13f8f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild
@@ -0,0 +1,57 @@
+# 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/re2c/Manifest b/dev-util/re2c/Manifest
index 2840ac3464e3..aa3de4f165f4 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -12,5 +12,5 @@ EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
 EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
-EBUILD re2c-1.1.1.ebuild 771 BLAKE2B 8b6c5f3db79b40022be96d26636b890c24effea4a6acbe33d5f3d2d357d02989b769b1934c5792cb679d9f0f4ddea4a1d395bf380218712de6079e8475a5deba SHA512 0a2226ff6760b1eb1f5d72bd5d92f3a080f18778cc9729b3f90196f87e9f24ffbff3f3a5fb664282093410a0b9cdb734056820f17f9c3101f2838f03b4f44dc7
+EBUILD re2c-1.1.1.ebuild 770 BLAKE2B 3038be326dd6862d856d577b996aaed944fb8e572f00b0febd095244fe606589bdfe7df96a3154a2883af736b9bd1d326a1f339fa72ad1b86d8a80a7ea3c96d1 SHA512 59ba1653743014498fb91943d4a8567e58c9831e6615dae9a1d3081a12f7e4fb5645e77fe198a02419851fbd227e6765b36f0ef5f14109bdb5c333a261c1da7d
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index 3806a51a7ef4..7bfebb4e719b 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~m68k ~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"
 
 src_prepare() {
 	default
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index b4d7d7e0432d..49ddf63df5fa 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,9 +1,5 @@
 DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6bfe4a2b278e58828781217c203d2dfc9c39a19bdc3b9fc6bc7f4d9ca85b6d0019057a2841d8b394cc39bdd84 SHA512 0baa10aac65ad78c05d6ecd180327b8752a31bbc51f3b3aa6060f4d2adf9269de83c6481767d9abc8a599e231f569c0496edc6c47f43d1e2892c4e98de6ccd85
-DIST rebar-2.6.2.tar.gz 210775 BLAKE2B e06a6fb0c29397dfcfe83de60cdcfb8e89f4a8e4287a41e0102ff972a93c8632d760c7bb6cfe669d98d324bf3afa007198eec773fde9991daa9964a452b5613c SHA512 410129defbf98af00f5040f9d3956299a70a0a1a21d28c42db32350b922e207f8af5830d8c322e9d3cfed8697ddcb228d5a98b983995414ed32662659a5c4c96
-DIST rebar-2.6.3.tar.gz 213146 BLAKE2B 1e74281de629b7f007a718af3d9f5afe7bbef72562f07e7df8f4ee996593b428d84030c8ef50e0a8f6b694b104fac01783175b5f3c6a0c113e263d3de3d8852f SHA512 451f18cec02f9b23ab1e522d4e9bc2a43cf5ace5fea6a7543874a76615cdb55e3d705ad2be94e7c28e6e1acfbc519eb3452588880f0846b928f8a28369623dde
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
 EBUILD rebar-2.6.1.ebuild 631 BLAKE2B 767d3538242b6c7165543ab2030fa1af1d16779dcabf35d745e5702fc9a9ba58517e116fc623b287d128a4e1dd983b3d926112081895839e4f46a6d0e2e21b08 SHA512 f6e545bd98f66499f9fe846c19bff96dc121748fb99d6e6b9c5b74adec066e1d5b035ed4df9da3577d93c68c0b72713070fab19ae48ec4c8298d5005d3366da9
-EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
-EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
-EBUILD rebar-2.6.4.ebuild 626 BLAKE2B 5c7f65683ba78b63f10b388ee8f4b275d46feef079e812156c59d959649d4dc565402a0d7df138114c636592063d6281aabc1018ca385374c328d73a653f48a9 SHA512 f65c8a717ff9d5874a902873a8c4ce28aa1ae68fafede6f031f88ee772ccefbdff97e52831c927425675f62e8711457864bf314a756664437bf7b90cdd77ecb1
+EBUILD rebar-2.6.4.ebuild 628 BLAKE2B c8b961179e05c6d4a393336772342f227fbfec9ae6b70bc2dabfe798cfc656003329edd96c3b139b6116c5041b314dac050f9047e77b36908e4c4a0ba2d988e5 SHA512 e511d5f6eda6646fd8b15c786c766d76e436d2ff6046fd9283c2e85cbc3e344d70595a52825be43e1c74f96d86e66d333a21c511241b70ccae07379e2baaeb5e
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.2.ebuild b/dev-util/rebar/rebar-2.6.2.ebuild
deleted file mode 100644
index 3f512e87afde..000000000000
--- a/dev-util/rebar/rebar-2.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rebar/rebar-2.6.3.ebuild b/dev-util/rebar/rebar-2.6.3.ebuild
deleted file mode 100644
index 6e91c65845b5..000000000000
--- a/dev-util/rebar/rebar-2.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index 76adb5658e10..788070faa47d 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 99ff25b5f511..d9df2fd0ea3a 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,5 +1,3 @@
-DIST scanmem-0.15.3.tar.gz 243150 BLAKE2B d9a218815163da31c191884268698ea8f4e12521c9f512deb850327fef44b0590d977906b4e4d48b8f15b5958523951a90fae2ace1c3a9db3f677249c706ced5 SHA512 7f14e8a129321d7e58651d7e98ab71e58926465c98d256226ef7803fa7e42ba8bbe0879da8173ad2659deb655c73338db27d832a264b429f740331aee1f6d4b7
 DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
-EBUILD scanmem-0.15.3.ebuild 953 BLAKE2B d194393272643c6161875cf8c1d51dac45804eafa60c9e487b8fb201ec852670d71bd262de6d4bd29dd8cd894f0bf09696348ae4327d5e449b86c9417519e408 SHA512 58cef753e1603467e1f80544fad0c4ae0fe124a49c322a46c4c4efb31d30df082ba171eca2685533b5969b93371cff25ad4cba2724fdaebbe62d09a8b7ea8eef
 EBUILD scanmem-0.16.1.ebuild 989 BLAKE2B 7beff0a82c896dfae227c5081c69df3e4420c022a20322b27b4b0a2a2a1b33d4657cb8a11d64fc23240d3662ba2c19a2a9476b6052312619e00a20d5fd9d3a54 SHA512 3771f6c6fe69ac354b16dbc3bb89ed40ba112070dbf6a689b5100b400ffd5ac8611115728fc5dc43dbdd53c62232f4b9c725e3ab70cf569d35c0081fe813b95d
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.15.3.ebuild b/dev-util/scanmem/scanmem-0.15.3.ebuild
deleted file mode 100644
index 036313e7dd56..000000000000
--- a/dev-util/scanmem/scanmem-0.15.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Locate and modify variables in executing processes"
-HOMEPAGE="https://github.com/scanmem/scanmem"
-SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-DEPEND="sys-libs/readline:="
-RDEPEND="${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3
-		sys-auth/polkit
-	)"
-
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i "/CFLAGS/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable gui)
-}
-
-src_install() {
-	default
-
-	if use gui ; then
-		docinto gui
-		dodoc gui/{README,TODO}
-		python_fix_shebang "${D}"
-	fi
-}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
new file mode 100644
index 000000000000..43ba8ec63af5
--- /dev/null
+++ b/dev-util/sccache/Manifest
@@ -0,0 +1,290 @@
+AUX logrotated 171 BLAKE2B c97738eba7f311d563476eb462b05facd41b53b87f7918bc543b4b87f1b1cdd6f61a39661748f8e098752c0337b392c5924db10d1bba87df65dd966a8d278a14 SHA512 d5b0cc5e60626b29f9e7385fe4b37d59108f042a24bfd1edeb9a994de68496b4802029ca48d59a7e45276e18e97943a4a21ea0d7521171207f7b29781fa881aa
+AUX scheduler.confd 768 BLAKE2B d5d6f1a1fa7883e858bbc81891e27d0e519af590dfee0295f39d7005a4eb8af7f7626a880ddc2658080e2d92c8b973031c1ee0cabf351e3984f25148bb2755c2 SHA512 6893d3b01939a289e02f21397c9d522ef924987c6fd16bb56a91f4a0bb37bf1d0878c98225da0fe7ba13bbbc4340afbb9303665e32d66b5d652110bd7020bae2
+AUX scheduler.initd 592 BLAKE2B 5ca446d0b30655562292b37c2bdb238abfb0390d7b59ff2740925c58f3cb7d66cc9b867e5260efde51bbcb0ade24fc19cccd20e255bc3b9ca349fc0cc3217c12 SHA512 9b383ab8f07eb75b38f40d9db4c70c6342a399cd0e6ce2f3c48b5bb41d1590209932247c0c735264cb5f5129131ec8af23aa0e4d007e0adc33517fba2d7b48cc
+AUX server.confd 750 BLAKE2B c4e44555c40d7dfd691f3fc3def3daf49965fbb946e8cd08f2b6bfc3dec38f85a68af0bb99ca071c1de7bb5a5f444977cb830fe74bb237077817636652293f02 SHA512 397d39a7464e6b8caab6d908b3e7a101c3d5bf3b532ab764417fc37f00cb3a18ef3a2f9bd6abd532d9e4120bd86d54ed68fc86b7c25dc3ee52a581869127e483
+AUX server.initd 558 BLAKE2B c218d37dab6aa517a48d19516a0ac4183e3b46db8cf8b98624c720be14f7e3a3a641e6c4d48809a0ff9cb7144b9770653c8f172199bc1f20d24788471c7be48b SHA512 3e8e5a8e8ff804c2b283277d0480821645871ffff9ec36f4bd18022410ca5b1135d7c75e333aa8b3f95310a85353211e014a14e49af794d59b4fd97ed375f0da
+DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ar-0.6.1.crate 13383 BLAKE2B d52fe70cb51dc473a7f1947628db963fd52e0959b60bff684bb466509cf9f3f4867a47ce06fe6b82887f8175dfb2f5d36bf3b48c46f16c2ccb625a4a1c7de7b3 SHA512 38f1863cb1265ab4de71b2b9dd8e9de35cf0da9af5a6276704cdf10c596c92c43e0128c334f6f4a1a94d4b39ee04770f99dbd4a8697b2e47abffa8ff7e1577a5
+DIST arc-swap-0.3.6.crate 41603 BLAKE2B c340a43ce48a7e0b418dbfd9957e840c8e51f65fef4e08fbb2759e6ef8c29f36b4b74b75d0277c8b774311c6ae798497139a944e585ceb8734c3d7c4b6e0126a SHA512 6cdf0fd63c813c9c11ae5587b4a681412873f71531054e119b5771a29089e344d44d2a4cc8347cefa76b33cb7a313308ea069251f66fc63e85f38705191d46e1
+DIST arraydeque-0.4.3.crate 17884 BLAKE2B 7c104ffc8c3fce4664a21240ef3e921ed07205ad2bf204c0910ead05231ecc64e6ebd2ee832ebef2aea10382433309ea10153f1466e970f1949543ff24b2cf3a SHA512 3fde1697f1b64a9abdaa996b36c45c64e67d9f081807d95c0ca9c262382839f10a527909cc99558878e21a9e3a4463dff2fe2734f62dde67df55d508cc34e342
+DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
+DIST ascii-0.8.7.crate 23773 BLAKE2B 52a81c714d4478af4298bf96e376c48bff248de825d1bc1f69d58380ee5b5e09ed76db713dffd0f8697f74f694775deb754b91c7b11595e526da11b877299693 SHA512 255efb6df7a297db6ada9571749e62bf041f5e777ba69dd367273db76282f244244e0c9e4c002f59e8d542a4c1f75a6a26a618d5962fe051ffb16349285186bc
+DIST ascii-0.9.1.crate 25317 BLAKE2B 4cbb9afe82675c5d4419bce5dcb640f56ed168aff32b39bafd6f4539729159eb44130ea3802800357c8a618278f824f71a5b5c6b3d8724d04372fcbaa34828d1 SHA512 3e74dc12133e4530453daccdffd2fce2fc48d41b93509d3153f3d58803a7a00cde0543b96089d637539b97a5ad859270dfa4202d0b11658a51a6b6c88adb2f3b
+DIST assert_cmd-0.9.1.crate 17844 BLAKE2B fbdb8c2e0a185d9d4f275021295e0edb74ca46f41d278e9f2fecb1ac115499b6a26729b31e0538a8ea82136909b073ff3a8f8cbec9b795c6c035de949b649bc6 SHA512 761d43b5be35eba9ca5d49f6ec32e1e37f25dda18469b22f8d2e9efe78fd23ab298ff28bf1239399e4fc783659665969762a529e69db96ade3392a155b39cc61
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
+DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
+DIST bincode-0.8.0.crate 71632 BLAKE2B 4aa94a42641a905069701955ce23717f75c1a5a91b743e44e574d1f0f9b4fa693fd9a8541dd618e2cb03aa88b52642269f2b8bfccd897bbaeda981e0f5c76bf3 SHA512 fa6bd7a7670d510cb1ed422a49bf30e77760b333899bec2b2af2c74f6cc6429b0ea1b630fdf24c490d121ae03183d3e034921a98d3f562a00e9cd9e234b38a99
+DIST bincode-1.0.1.crate 14071 BLAKE2B 99edd46decd97925e2af882411c9cc986311e936a0e8c05ffb29e49b44460cb6fe6cf17e75301743cdf02d5b30bba7ea1efaf70dd1d3b770061c7fb6db4dd459 SHA512 1294b89089b457ce2bc4d9471ae677d6d06e64eaa01948e9db4ab49fc23638ba79e7aa1d6ca3a0df5fb61bd90cadc811df724053a321ca99d16b8ce650abbd59
+DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST buf_redux-0.6.3.crate 16159 BLAKE2B 13ac3c513ce794e52b73ebfb5ab5deeba5bc9169988464d05276384a548cd7fb8b1c0f8016cca11a8ae1e771a15cee647943fc2ad3a563599b1475f3939aa201 SHA512 1c8adc5b87248b6e6aa1405ea3b081aab15cd7aa3ef24926dbcf76540f91d261468d19e5e83fe9b96b02fcc330dc500ca3df3a9eeaec9deaac1662d877e826d9
+DIST bufstream-0.1.4.crate 8741 BLAKE2B ee8913b2efc3b0b507d8abcfb86ada7924e4f30554907f9cd690b42616ddae7644dbf9f69d6d0ad599f6db1d4ce3ffecff1c8cdf5900fff110871f76a1417b0a SHA512 bc5029c826280e51231e2893474a964762fa6456a7fee043ba32ce262ea4f0240056e352267c5e66510e737217c8841061672336631b5eb763212a6e5df5ac9e
+DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
+DIST byteorder-1.2.7.crate 19640 BLAKE2B e5225871a7b55be755a28878f330f165092d576e4e4447816d4908998d4c6103eccd7f1d962c06709823331143ec8279c5cb1ebc9ed49f7bc30b20586568cdfa SHA512 166bf831dac44332fb05679add5ed8c54d692a582cdb8584486dee8295080a625d12eebe40de6f3b82ef98a1f4c65503da9c84d570b14d58dd5e31a3cc6b7391
+DIST bytes-0.4.11.crate 45988 BLAKE2B 617fa9bdd07bf22a6f0089e8acfc44cd1444af07174b7a02a00f21438405620cd2cafb9574d04811464316108a05c60e6066b8d87d6662a5791ecd17a7f8f8d5 SHA512 3a0354981488c354b2aaa664f320b18cfb09ed07a5f74a10f8fc120279d660dc7899306bd01b1b3405fc92eec5de3f6f8e9d6c1e5d4a2374da865d5a8a8405d3
+DIST case-0.1.0.crate 2629 BLAKE2B 065ab6572d90205f031f3a01f83ab3937d9c9556d649b05f31340c997b3fa63aab03702c03e7a70a78faf7271cc92b4d89b6f263a233ead2448c366cf655cfc0 SHA512 6c12254cd2274ddd28b2da55d78d3306e0f3b2f6a495d7aadf9c86f82366e766fef2283eab407a6273324c80305cc7d1cebad4dc1bd0a28319c69b0fc1cacca7
+DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
+DIST chunked_transfer-0.3.1.crate 7730 BLAKE2B 5bd1fff872af6efb54ccf5f4597ed816d87154340dee0e8295d40db7d9f28979d32ac3ab54f2e83327014900a26f91f34badbb81499401b4b0863a61020667ad SHA512 9f3ae572c75203a86602596434ad2b3fdc443ac9eb50330f57ae3050ad355897eb22feecff537e7c01c871b466cfbe57686906729f5ee0914bbf6bc71ab24638
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST combine-3.6.3.crate 101445 BLAKE2B 9874d0f456e752941ee6d57f85c3a87fc20590b437b0c3e33097aea170f40b515460a3f39acc48932595da5b88efe9af1b3185ea0f058fd672b7eeded2b3519b SHA512 69a7cf4a582bb4cf6e00012b4590630c2da7416a23cd9de40fe88f8b9a375bfb33ffee59e51207349d08141e09191a2b5b5a72d10a1c6a0d6aab9dda0a6a8e7f
+DIST conhash-0.4.0.crate 3548 BLAKE2B 4d1f8ee3689bbff8cc8a070f15733ca05f23f4ce30584965a2d8727473b67112fca2ee284c5662eddb9c8988a633bf1d173a3d15f0fa0c8681edccbd100d9476 SHA512 f5bdd628966881ca17f04b22d4cd73821575c74efaf19069028b814bde6d1ed1f931f88955c9bb7435f10c9223a1a72ebfe18d681939d9c488f92c313d6d6f4b
+DIST core-foundation-0.2.3.crate 8323 BLAKE2B cf848a8345a2d2952b2646772bdf204b56e4406a4ee6b5820424b3d633e0eb3993fe0269aac0fedfebe84221a9693b7bc53f60e85a7e95a6da19178d24a660fa SHA512 e14659d440f2ade3d4db9b307d649a4dffe7dfd7dac5f0e7df5f391531fc94f66e10fb5a22c2ff0b95d44d1fb539d6b11c4088beff43632dd6edca270c5b1719
+DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
+DIST core-foundation-sys-0.2.3.crate 9128 BLAKE2B edb0757a904b40ae5b403af2d3d396b50ec70dd918ca9e03e90a9a40b71ec8de6c70cfbcc20107549ba5be7ae4de57f0cd2b6373256201b54dae1ef9398c4197 SHA512 bb650b13251288fae1f83998684aad7869d9a6aaea4cec8e1164e626d4cf4833337ccb9d3ad3a84a7ade711cc650fa03f1d945e2e10d6cbcb7b55d857cd46ad0
+DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
+DIST counted-array-0.1.2.crate 2959 BLAKE2B eef6d7175447df795e3cd7da7ff91649232eafc412a7e4f637fc3060c69a379b5a5250d800b75da6c53eab1c3cf6ed3519c2e6d1d8b79f2b55fbd7a52f019470 SHA512 91d088b07c9a21880b2ad813b7395d5135f9697f5beea22323155fe0276a7bce5a8b8364326750355b8ea45a10b9be16cefe1b29f4b2673688d1d97605db65e3
+DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
+DIST crossbeam-deque-0.6.2.crate 14037 BLAKE2B 28276d69b715b6ebd620256ac81a5dc0dbb148caa465a7efd3bd545bc7bae913f8eca4619aa289565941d5fb5a18b72b2b14b4113df03dd3d61ae7e7d3d68ccd SHA512 f010545e12dfecbb5004d91846a7e41d2142d2194b3671ae2ae383a74e6f2cbb80f3d086109a8fbd3c6c88ac187d7ba45c97cce3ac91e8102daaec59853ff930
+DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
+DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
+DIST crossbeam-utils-0.6.1.crate 13987 BLAKE2B 89a08fe3aee4b709fa87355bf18f8f80ae8f32975c152d319018fe762a233a2bc7037df6fde08d6b9e55ee6d68d56fa65ce66d9d4c0166d62f4a48196ee8aa22 SHA512 49e02da3d2bf9451048363faf59fe06a80b5b9590935971d39fd903c09d72bbcb7e8a70aff36dbc9467246c18a2608e32ec9d5460e085a98f2c359c728db732e
+DIST daemonize-0.3.0.crate 14236 BLAKE2B 85b6d55065ec0b3e97d958183f88681ff619dd210371bb58e5e98bc0634ed82adf5dd45b30bf96d19147d042e87e6fe13c3c37f091e21c94b148bfef9367d709 SHA512 9d6b34417c469b1ca11f3da7fc2525d625977b01bb86549b9b24aad152900ccc14a5fd239b1231d65991a06c241703991dca32a8e7c59b0096ccf479c68ab4b5
+DIST derive-error-0.0.3.crate 8406 BLAKE2B cb17f0c30e71cd5fb86d6cd4ab706422915fb1067cfc0374cd1781ed2a4548dac50949b6ba0476123dfef007cc4aca1a72a037f97a5d80e91e9a9dc36624f99c SHA512 b15e17f89062fc8e2a477828d46d34b353ab64ea9fbb6620f1cdc929c7f759c14623f94ab243d7e5282f4ae1a242e369cdbe3701d625524eeb8e6a7ad258fff2
+DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST directories-1.0.2.crate 16020 BLAKE2B 76fe417487118cad8dc8a6a64b07f62d83550b00fa230f06902d9252dfe74134bcf722d33967d65131cd1e036bd1b4b117b8f56a3f96a073e24509ee0add5410 SHA512 6b1ed06a66e43115c5446ad19d6960ae6ed7956982b23727422ed49e285ba0b86ec9721a83a7949772faf7d1db28abb499f0983c53e70da529a54ef7fadb26f5
+DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eeea4549198df1ef3dbce05888ca6f34701b27dc5e8c0748d99e03a14af96e4901be740bc98ba1342589ae6 SHA512 e400efb07317fd605e93fad6670bb4569f52abc66139042649a4112ad1eb2bbdf4b819ac5771fae133a60248da7a440e30109e68e919867d3fd29853618d7315
+DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9fb95914e519542367f9f87986358b4ce0f34e261b31c204af532ed962b2ddee2e6fee9ab001e7f372371711 SHA512 9dc046f2c27bf12f57413443586171cb1d7574e5de76e02af892f9027bc66c2cab840180ad85af3833aee61d5fec033c77a15809492e8c2a78b541addbc81df0
+DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
+DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST error-chain-0.12.0.crate 27056 BLAKE2B a6d699ae63838d3b0d40a63977642fc464558fd45a46c2da9c7a57889450f7ce183c43dddfbe325c8cf6db2775c1a41f547bfd3802cda5b46d4a09f6e0a91aa5 SHA512 7e9fd94de9f0f8e61039766953d85b3cc5f87be2b8c37016295031ea3234dbcbccd111f521ddaaf97dab7f8ff8c30828b8949958014ef1e13a02544b6143b9e4
+DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
+DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
+DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
+DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
+DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
+DIST flate2-1.0.5.crate 65990 BLAKE2B 81a21446ff62d000b4ced19cf54ca5e10de59a2df290999f77886c222f87df501e7496534f49fd21d8eb317a2f0d968336129d9b1f9c51d712ef3410a1bb1e1e SHA512 95bb4857a8a267c67e34e12c711b56794643ed39ae6320ebed1c75c225d80da4482a2ca800301d439dbf08a592dc93681dc230035bae14e9343e2cf61adcbed6
+DIST flate2-crc-0.1.1.crate 8985 BLAKE2B eacec2d0f07bd97d8de530ca9250ec10867d06eb3974527735ef5fd50e857e2ad3812f36ae8e15bd64e3232ac790aad15404359f773d06100f7a8b2ac5d999ac SHA512 dad46e30c81aa31f3efc92e6a1e5da77a124b1eacaa2c7a049e11c981bc3e0bd7cbd3ae8bb5af0762304813e9afb6dff14e0240d74d7dca32453c0518993abbe
+DIST float-cmp-0.4.0.crate 8774 BLAKE2B d8c4854b7147e938565d68e8f4890f0a0c25a886e78a2f61dc7fff595488e3a2655b2f942586546466a10087a0bc415b18acd41dd828c26427adb655c1fbedb8 SHA512 62aa5623affe11bc65f3153f8d0b923cce82ad6ce38dafb25ed30fd9d2d239fcd09baa10f0f4f9a58ea1a84b12688ce43e48c7e57c9751e940d32e9719c54a63
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+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 futures-0.1.25.crate 158626 BLAKE2B 88b8f274a4cd5673760ec57e0d6a1d92eacc34346b5b81935a1ae8a5f7067c12438af81ce3cc30c57891047683fe9cc395f6dbb8f89e8c2568259448644cf188 SHA512 5bba3ed715e5ecb40450b3911d2f3d469bfd93935c94a526d70c2b6604de7953f8b1e4ed80a276e42870771f581d3c7f0b40dfb9cd076bd215a3dcffc78136b3
+DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
+DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
+DIST getopts-0.2.18.crate 18416 BLAKE2B e90b0cd8fb5dc33076e98833a03713c35b50cae6a5dfc542e4b28627221fb40082bfdefae61888d7856a3b684d4ec4c2dfa55c961abadbbbf035738926215741 SHA512 68236eda2645c92e09fe4f7408dc8fc07d7f143bcfc179d297b307ceea0420dd999586deb37fa4600e929228db5cf2c6f1217aecca500b4f5534ebd934b6dacc
+DIST h2-0.1.13.crate 140232 BLAKE2B bbf7477e6ae9dc307301895c296b67c6872f173c4e3f15554f435da9733e0d49224ff67a5bbf9b72a750d2eb1482b625c90f99fe77d3f9845957869d16609386 SHA512 10a9333a2f4b968b238bcc966a2a9ac775043d1803bcc0adb8856a658eb5880442b6f6aa36f21d279f228a5460ac71402bda0ea0cc8855acb5b7fc6889b017c2
+DIST http-0.1.14.crate 97027 BLAKE2B 02f83c006d6a9fd4176ad7d564688b81505d8c75cc1ccb7655ea33dadf72f1d13be81408f57626d96752fd53be5819ea197d846b730d3cd36107f2c9e9fcea58 SHA512 7cfc8fe2e3890a0cc430e5bdc8a88afacb185462381c63670acba59607bf89952f823a16c627010bc17e037881b14be5fe2f2ffddf85aeaf781a31f516bcfcf5
+DIST httparse-1.3.3.crate 23689 BLAKE2B 17aac3985a19a3cbcbf1072e134cfa15644367d15186ed924ff7f76205bca42ffa0fa96a46236d7387d599a0153e31d9727d40bf177736bf1ed116adda120225 SHA512 b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087
+DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST hyper-0.11.27.crate 155617 BLAKE2B 56b7a1b60b1b900dd7468cf623f48cb2af9d939660ceb62fa1167bedd50d8db563ce6cc7e27e65cd51935a46874eecdddb3f621562b9313538af4bcc3ba671e9 SHA512 912713166f601d086a7aa68507143c143ac69c31bca23948e0446eeab2c7eac09fc75c5f2e61aeeed312f2ed54b91b0f212d8e46e30ecccd3be1af60dfcbd59f
+DIST hyper-0.12.16.crate 111412 BLAKE2B a3161814bc0928227e305bc66b1b7fbb17b6d5ddadbe8590f4c12e7c10822cef5b6bac4ba819a66c69fa6fb31ef5df85b07d10d2571e7475e116b222c6990864 SHA512 6dfa6e96a2664f1fc505b593ad281858e43cdde8e08c6d5aee00b6268383e27d9b7fe6398c521957db5d027b8ac405a20622c52e6ccac3054fcef47ba99f4219
+DIST hyper-tls-0.1.4.crate 8137 BLAKE2B 92e9f0c3f852e80b69b977d313f4c6d74d9bd437ba1d1e5d1966acb5d768f8cfd73c9d1b9d2a2fceea22b36fb8296f14ddfbbcb00fd39264e8f639c3567275c3 SHA512 3cbcd0048e11d33aede6c27a816d9adb89abad9c29d09c62bf8a6b0235df3698a632786f53aee8ea4d539d553e0eb1862b54e3b547f753fd4808bdabeeb04a0e
+DIST hyper-tls-0.3.1.crate 8836 BLAKE2B c678f9ecb89f51d1beca7ebfcc258162dd6f87d444bf83f6c5b82a28070320bfe9d4b118571b3762ba3803d4fdfdfef70bdd780116154ae95542547ed08abc87 SHA512 3094057eadabd596ce7909c45aa24f6ed5a5dbbce4773fc20293ddf95c712234065253d38422a17e24c3fe674ff94d0bffb95e4034a97dfc46d4402b9add396c
+DIST hyperx-0.12.0.crate 80997 BLAKE2B 20441f370d04eae79f6fbe5988b9f63806ac4c9e7d93af998f7cc322c2c9963cf7f536139a552a251a8567070e311f05a926262a9aed1ff8a179ceddea6e44b1 SHA512 85ea65b3bbc7c86af5cb97948674b5aa41a3277699334f07a6d072c28f53771059d4ddc8833e83fe3a525bf41c2773f5957601dc445d75b8fe97f62ae7021234
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST indexmap-1.0.2.crate 38255 BLAKE2B 78d99087e4f282fe4e4789c131621bfe5d873be801cc105629aa8932a3e4c8a519180560b0bd83463d808eb3b75194b551e39166260a1b9056e822fac07fed94 SHA512 cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST itertools-0.7.9.crate 78365 BLAKE2B 484565266bbaec5373654bb22f64d7071d6f4a0326f33b0bdde87b2d98019e6c19cde7023f5e87f3c5e0b892fdf6fd615c523ebb0b2be22e2a079da171236c6f SHA512 07543ec2c9bcda6c9a0f24d8be5e0add1ab8cf4182156a246822dbcb9fcdfa74aef194aa5b308cfd329efa04cbe87a6847e6aaecffcc0bc2e293d431342d3fa7
+DIST itoa-0.3.4.crate 9921 BLAKE2B b2cc97b6b50164bfab0ccf3afb53ec827ec3247a8111814f9e2e3181394515abda1f452168d11b518d771701f6ce9a2936a0ed69e9b82e1a842c51c1e74df536 SHA512 1cecca0c6c6d9602e692e16cb6dce850c0f7c7ac5ec1defe1f5b8a17ed325abe41eaba56c1d973dc63bc476b52d436a90b266f6eff99c618b6581cbffcaa278f
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
+DIST jsonwebtoken-5.0.1.crate 16414 BLAKE2B 4df3357a76a8ce5666a05ee2e9bcf836677b47a8ef49026bcc688ea316ec4e622b912cdb1a10911466d32bf15d6675f8c866c3317d1d4bf86c731cfa8d6e9dbb SHA512 a031fdbe2778f2447746eeabd29879ed8e1aa178a5df037e25735e984ac84f46d5143b3d05b8c5dd6af7c813340d9bfb0454c165b05bb9c2e7879648a32272be
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
+DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
+DIST libflate-0.1.18.crate 35142 BLAKE2B 59fbc83847c8cf2a0a5c68d242764a85ba440967b16205a225d9cd8b2e26859fac1989fea5d99520edc70f6177b0f66039d6b33cb59b775196fafbacd97f0fe9 SHA512 921c3650de299bfb52a5f4375cb16ea43bb0ef0722f9e9e4522fc2bd6c2b43f88dcc88033ace7ce29699245daf70c875cfbae3fe95d582b2570487eb894c0f22
+DIST libmount-0.1.11.crate 20894 BLAKE2B b33cb52058c8ff542242be01f0a092b2794cba35bbf761bbbc035330e192cd5d064aed6deb35ec6b8960b36c153cae81f70ebccefe1b105a1071af67b4f1dcbb SHA512 4a24807c0fc5785ec91aed7881dcd9684bbc85d68280b629af39ae62a02fe6f3c2ee29138e3810e1d4c6c8cfa9bbb783b1e9a6971040c006049f0a3d339a5a3c
+DIST linked-hash-map-0.2.1.crate 13672 BLAKE2B 76ea32f13ba113656afb26f41155d0d4c41a1190e809a070608bfc116eefdf8d79f605e4e13d8bf0be5fe6ec8dd34c3d9e24146008626ad87837356eb1730e3d SHA512 3e18c9e1cfb90ac3c6b65a57d63eaf3b0510e70d3b046043dab0a48b57fd83f2b11c98d474d4779a17e7bf2fa3a95ed92919634b1101ee0190c5209e2ced4182
+DIST local-encoding-0.2.0.crate 10531 BLAKE2B bff98eabd71a70643198ce82ca0131228a6266d21c24fcec7fd4c0ac2f46aef71275891e85a9669a611f76ff9206d0a193b346a19e5c9e3b760c4710250a75f2 SHA512 d27146411d059d71a83a88726238ac6ccac775c806f8c6621ec91bef70042045ebe398da76d1b6ff14a690383b92a7893274710cf5a4da2a98096c2efb6bd9b2
+DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST lru-disk-cache-0.2.0.crate 10160 BLAKE2B 2a5e9316f72446c7d43893ceadf463e5081f04372565045fdea17cc0fb7ef501e1a3fcb54ae22c75278c49384e4aaac61bc1b312b74a1a8f98d6935c925bec8c SHA512 ec21cf5c66151b14cb0330d4c240a88856016a4235060b2b58f184d2da175900f2a3a16e0bd03f4fb66e164c81e7d55f5603df911022ee528a10b6d6822593c9
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
+DIST memcached-rs-0.3.0.crate 19015 BLAKE2B e50bfe0f85ad0706fc90aa46c1f36f6291377e5d4ce0da1e242a050420ac35e53cd5f5dbe21659ea69b0077bfc248ad2b9ae8bff05ae7bbf54d5760f31a0c8c0 SHA512 bdba069d806d7d032eec08c0328f9bf8a388746d1072e7a654b9c4ca2fce34f164ad1ffd1d91239eaf8e34c821b83bfe6a46ec5c81f7768874627a26183b24f5
+DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
+DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
+DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
+DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
+DIST mime-0.3.12.crate 14815 BLAKE2B c4d3a50b93e8f240085610135395d3d72ff15b4030d6338e08577e83c1a5e8a83ad25717b6a5a33800ee8ad3974d2dc6a6e559329b9688efd1a4dbb831d5ce07 SHA512 d270cc42029e50ac00f20c468121e05e614ff5b5a21d599414cce07244ca888a3bcd7eab4c8f2233a28d5d832590fbf39281573c14b14bacf59c128dd50a43e2
+DIST mime_guess-1.8.6.crate 17437 BLAKE2B 13dbc6521fed028b3c3c2c9fc92da0a70782866c904c770ccd7b8edd83d4b58151fe8e0d3c30285d028b1c2281bc05d0f7b9bba9b8087762bc06c0f050883d34 SHA512 4835570090ae40031fa36f98f1461ae11e488690bf291e65b1416234cb6170b51f9fe054df866fce70838c013cdc28f471cc8991c884655c80f55968832b2e37
+DIST mime_guess-2.0.0-alpha.6.crate 17579 BLAKE2B b480910ab11e5709e428433c2ed7b462530fa709cd1fe241eff957b4e337901f42f678c9e5468016a643c0f79755a6158d371eabd9ae8f4a7ca0d852ed846442 SHA512 b32bdea0942443aede186317a7e3b3d2e36e3bda56e43794c040aad6ddc1fb847bd380f514299800e449f188208c218680d4d07f16ab30c9c7cbab02c5245733
+DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
+DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
+DIST mio-0.6.16.crate 126174 BLAKE2B 34e8634e11959b61abc52842b1c0afe9034cdfbe9923f8a0e65e9d4efdb0c13c46ee5d7272e86595ad8a1d3d9e987dd9b47e1074d7c66cee3f9d889401fdee64 SHA512 ca9290edfdbd4659c686a9f47d7bcd2177001fbfe02ce1fcf6e8aaff4c6e4ba52abb0d698b103337e4587789e7e31945886a90f5e334651d27ac7b109f560c95
+DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61
+DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST msdos_time-0.1.6.crate 8445 BLAKE2B a9d2b0f5b353895fdd48ba9a7112b9d030964a97a17a739d0a079a3a4a2b594163bccfce423ab0ba963b0fd3cc4afcf76da6084a301cf9b1e487e2a406b587b6 SHA512 c6e053673a9ebdf442ff064b5353b7af9c660f1a498f487da7893d31cc7a0b6debff4ee9e134299eb94e3fbebfd16d7561940b302b1ce976ea5c7bfd5cc19fd3
+DIST multipart-0.13.6.crate 46966 BLAKE2B 9451ced730f74d77b114014cba065b935e2ecbcefc0a3fed5f3ad7c1c547b18cc552114261a688710a8afc90ad558e1ebcde9ddd0941d12a93ea6a8700d890d7 SHA512 751ccde3727b6c54d87a54111972c03ec397e2fb66f03958ebaee1ddd9d6d297e285c93c8fe8161d469aa281d52a46088eb165f740de3a110dd20e752fb94769
+DIST native-tls-0.1.5.crate 24838 BLAKE2B 4e24ecaa32f7f5c64e7725325296836a56b2ddf7a5ba4fdc8a246df618140e718a6784bb4b54555e6f8a1284563f9656dae403032f4c6e9f8eca570d6259399c SHA512 867b73e360625df1a803c80c9b89cbfa5d0ae09a82b1c041d3326b3d73e04821a22eb2ffa25ff6876dcaf50906012755d7712cc3049c15b70d135852561577de
+DIST native-tls-0.2.2.crate 29238 BLAKE2B f8407b3989be8c24181cb5134838b2b9532c6e00f310915cb8fb7d92721d3c9ba29c8b92d12d71c02b9862f064a0ec8c819981513a981b47132f7498a3d41f9a SHA512 4bff0f1e1833e46d069818ee53a74eed8d792430d222cccc9aadf28ce57246b3b9901f095d97e3567eddff85f59739ec02e1662955d23bba8060febcd7eecdc9
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
+DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
+DIST normalize-line-endings-0.2.2.crate 5299 BLAKE2B 3d0cfdcf94f7beaa24bfe5b332f952b96bd915ecb4943b912cdcd20e02b4ee6274c7c3fa9bb39743a0a09990901cb8406b2a6a583ad62ab61800f33df48ad32e SHA512 d1581fce8b99e2dc6ac187255722e8aa07c6d03daab536b41d483fb961afdcf043c8fd92843ae3a0835c36c39e403b6bf263d5fb6bc0342d88c4be0e9a4fc1c5
+DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
+DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
+DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
+DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST number_prefix-0.2.8.crate 5493 BLAKE2B 4f3a159e1805030887d912016ca5af654dbb976bef9ac9b3c086c8c18333840c1405d06ba907a0dedd04c39d3a8d773749447162eb15fe52b0f9d857f3babe4c SHA512 7b8745e6bf91cdfdd11dac33187359272149981d2b25a960316dabc2f34c162fe33ab2755efd82dc22faa0f208b1fa4046989e887fd93b8630b37239b6b59974
+DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
+DIST openssl-0.9.24.crate 149235 BLAKE2B cb5c1d735aacea51e7cfcdda283a3466cace755a50282ea43e648dd09d37bff066bf9b6d8c1688a5415ad1d2bc2f11aa64d891fa5770b3e79c8a3502cb36d505 SHA512 3e969e0986b820ce83afa49ad38402d5d56591181fa3d01100ca5911b040949c5344afa3f78658a553dbf77d61eaf302cc35c901b9d160dd782015e08b6add27
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
+DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST phf-0.7.23.crate 3841 BLAKE2B 9b5b3305687626f79c3846f4d24f3d2e8bda91af4284d61ae397ab1fbac1611725f7dad42aa026f6c7c57e23482ffc2e217df5b6736081d3552eec91257b3285 SHA512 8bc773f2c8993a1b2aa3d555fa56cda736b6574b602a3eac5a48faf3d937ba99a140d9d8d98b998caba432d8346364194849947a84df52bb86eb1bead31da8d4
+DIST phf_codegen-0.7.23.crate 2866 BLAKE2B 40260597f05867b579d4d96fa686774a1d7e2e0d59d1adafd1b21c9403718f0c42aa1cd77c6266b7c9805c76ba1bdbc47a3f20bf4db3912df89d569a9c2504db SHA512 64142b8403f5b966ac17dca51bcb52a89cde6d365b5475c3e9aba5e6a808efa6bc9d5eac512dcaf9648ff02af0c2c06aba22b5ea8614b7c32a9a50cb630dfe23
+DIST phf_generator-0.7.23.crate 2219 BLAKE2B 40ed4a207e9eeead6e243911682471a896d75b55cc31f38a508e16389533a4b5ac209557b595331a0cf0f9521f9f8874d2afa44447e406d79a204c3ef4c0a6ac SHA512 0837d40f937f11c2902112f754003fa7465ba710ad86d397b3c33cf949d0b50ce3693030d40a5e1b7bbb21445983cdc63f2f8be615a7d4bdc33ee4d970341671
+DIST phf_shared-0.7.23.crate 2084 BLAKE2B c9299cea4778e0931268a669a558d99a242bc8dc4ba1f558d143e9690509562d917ae4e9cfc86ef7c7a90d73cda00f8668f0c77c0ded473e47d9caaee8f56403 SHA512 ae5036273bf2c724fe7661db59b3b537073b9291d1e20e0e8dc055fb144ea9d19fa769887cc7c6576c52eac47b7cd7075ffe7dbaaa83fccedaf4576223736a25
+DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
+DIST predicates-0.9.1.crate 24557 BLAKE2B 3559f5108a622d022f2ef4c0a99f7b41797e6d7b543810414b0ed86b1ef1b91c454e0153528c7b381c43dd9821614974a98054cfc3a7e418697d184345299ac6 SHA512 bd0dd5bddb524f669658b3670238b2dd87ff2d1c0620cbe8e17cd6e2d0e6b3b3e1bb8cef77968d106beb576b6564394a1e205fcc9286d87299c4f40afa4085f1
+DIST predicates-core-0.9.0.crate 8053 BLAKE2B aa05c5b838b4e419cd094cb1d920c4f0d1e817598c1cf22546727c1df1d1e58f179296a32d59b7ad9477684598f9ea007b67d26b620f25b5c60d527f467c1118 SHA512 d24fd091f5dadde6c3b3d9ca36f638640b50b194dd50ad6b7f8aacd53a51c08b4e188256596fdec5342ea6ad20549f046cd4591e2c7336c7b7fd01df23d71777
+DIST predicates-tree-0.9.0.crate 6240 BLAKE2B cf972038b40a5f3a6d970ddd53ab80d6e814734dbf7c59c341dd77bca6dbdf2fce1f673e3f44068d316e2b2b4d19c8f5e03662ef8c6fd392829b8f2bc415b377 SHA512 254dd3d05f17b9b72d7b007041176ac1732c76fab2cd67f7653c6a3f83fae48e466d04ad45a77b38098b807c291f14d56f02694755cfacb5e559326c067d7ed4
+DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
+DIST pulldown-cmark-0.0.3.crate 44672 BLAKE2B 89c8545c930ecc50ca23569d29cf7d69aabd3c33b877077db2a8d84510c03d46eb473e354ca124e9df8f2acaeeb802f68d9482c80db9908f82faf62663efd4fb SHA512 522f75fff95e80a2db5a86bbb7d1dd89f86acaedb87e4f95634862e1b4d58e0717318dea85613eef912208e097a4a59a914da211e9e77bf904c062037267fb67
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
+DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
+DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
+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_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
+DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST redis-0.9.1.crate 52038 BLAKE2B 6fbc116442e0489c3b033a96eba2d39363a0b9e2b34aeaff6a52355cb2c2c5162a3707901d09b255aaf45f634a44b44ea0d14feea6285651e61908f2d6e19193 SHA512 b4f9a0c442268e1637aff4b65e11c6d23f3889b0aee9ad3d42f63286def2d470cfc99c2c2c525b7696493f99b6d73c5e9b47af633d5c86e0b0ef431e7a2b901f
+DIST redox_syscall-0.1.42.crate 14962 BLAKE2B 5a2992cb131f4750287148eccb0920584fab3e0366b2d5a486dce1b9400a933a9a53342815a4c75af4cf529f40163c41817009f76780002fbb108048109e136b SHA512 63747e029680b889aecbd8d3bd5c1e12e0218322a7384e090702e0c3d569dd7fb7c411b3e75f2a6b71361fedb1d5d0fc559248d1b8b826bba92595a591fabfe0
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
+DIST regex-syntax-0.6.3.crate 240173 BLAKE2B 03e33c25c9e7fb90cba231e0ab655bc35135c0f0602de9f977f967de7a9a40a2aba9a48a30f49eb98dedae4277a03b17a64dbd59f0b14023ba9df764d0c9e721 SHA512 95e8556d13337ec25a9baff923528c0d1af10ac3e88cfbb6f5bcc40fb90f962cb473c88a8e3a7007ab9fa36cb063cc2348e79368296baedcc6053bfdf6bc7b6c
+DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b93d9eed645ec4eed5dad9aa96b14b439111107901ae45c9bedf341b55afe3a72cd4298704223dd97a030551 SHA512 3bd09864fd1bacd2d5868a25745c586e4287f24497338b74405e617faeb11ea6d132e222d10f9d3b36010708a68e6ce4d80dddadf6b44a9f9bf2ba53044a5ca7
+DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
+DIST retry-0.4.0.crate 3875 BLAKE2B 2484122c3aeb1cbeb5b6152a2c3e9d329945530d3c7f01a8d4b9b83bcb7466ced9b0052acd523872192f7ce63c9b4f9d01dc7b86739c1e2ed0e44fab609397bc SHA512 e7581bf4b3d6217246a9fad57a3af5225c3cd0ef7916ab9cc4b4cd78b040ba5e708d04b0315237a7cbc61f644c5435e24006346f43016cedf1affded1b839be2
+DIST ring-0.13.2.crate 5422395 BLAKE2B ec0b8f53e63447d7702c359c260cfbfd201ae3c9773c62ccfe64d24675f5ac41a05aa650c7d0e6be64e9e4222b439ec7db133df542161cbb55b5d9a131b37718 SHA512 0b2fa741bb9c3b085c74ca0daab3f89814178934e9bd4bb1522b8f2fd3bbccf70909667cc22d03d8ad113e714ccf04aa695231bb8c890b20ec72a9ad9252ef86
+DIST rouille-2.2.0.crate 71003 BLAKE2B d6ab434e666e471f019533ca394bfe66a1c4e23ea3c66dbefc7f5e8c37d9651ad013c0bc25d8f8c0742819b28fae028606a666ba741e0b424062acbe3d549c42 SHA512 b9b105d59f24773f9a29ddd293be671b8544790cacf83e6e53601d186c7f8b14f5f52556fc5424c1d060e54ba1c8dc1ec492f6a9b698404d7a4c41839bb6ca56
+DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
+DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
+DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
+DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
+DIST sccache-0.2.8.tar.gz 229658 BLAKE2B 95a9f7f3adf72dfc49e344de10e374e80e09d0d0ec91fa913da06f8c068a3e4632aecf30a3349ae02ebaa5d3984d5342258842656133fac77db33e0aaae7f75b SHA512 3469a50339892ca2495f5655a1bd9fcb21a60bd01384c6851789e806902d95d605a941b1a09e0172eef663bddbc7d32fba3afc9ec76bd2a27f32acb1b7b0a35f
+DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
+DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST security-framework-0.1.16.crate 38648 BLAKE2B 73b1d36e8c977185485d21e5c13eeae034137e1e3d9c1db193a893129229ee10ee4e7103aafba5772467d6d751c59bd9aded0c6f828ebd937c18aff677348f25 SHA512 c7c51d0bc54255f02945d970f918a3e378adce2563b6a5ed81eaff1c50fa6610e17ce18bc3491c74e1481519f5b9007d9052f476602a7b96b319637d92672c42
+DIST security-framework-0.2.1.crate 39220 BLAKE2B 271e0cecf9bfb0fc0aa305d96e9bee753c6dddaba201e40beed76b3db0471e170dad447181068994b0fd8065604133fabcf88588a1a7a1ecb20049f4d97da635 SHA512 877f432af0e531d98028f01cdc3bf3efb4747c78b447face9335ed5039ba16da1b893a5bec77705cd1e5b2151f4d6674f6c6baeddabe46180b67a031031ed82a
+DIST security-framework-sys-0.1.16.crate 7754 BLAKE2B 713b72887d95a85182052b1706706551b6d11279647fb55cfeabde1377b2940fe9ea680a6977873ce96aa7661cd17b3d793ee292cb0a0f4ef94cb1da5636eb24 SHA512 5a5084bd0b63e831a13882723a7e7487460c718c871552dea09d4c6bc0a0535c3becb535260b7623a7e009aff026a49490b7dc0bb4699f2f69d21fd929938709
+DIST security-framework-sys-0.2.1.crate 7790 BLAKE2B 20fdafdfb5ae59033fc6b893f35219d84c758658f1f6b5a376d23064dc8ea357778b2c3c856bb43aa751b08f5ababf289b6882b4dab71b062ff9ea3d94e4d94f SHA512 ca18ddee68178f49cf8b50f79391dc43c6269dc879d14950b13fa510e5b46959a8af78cbd007f8445fd510866d79570f25eb0dddc0a72b1f7b4390285cd93f84
+DIST selenium-rs-0.1.1.crate 6546 BLAKE2B 7fe5ed7e62b7d6ead066ed2e6a731a9da16ee6accf466b81a7d2661e54f36470f648aa0fea00b5655638f080383e8cd50f679d96a3eb586ab67466b510f56983 SHA512 bd31dcf5fee7aa64a5868923329e4bf4c4e39d1b87c90bc7704b8f961b67b11001377a6288239e70a3d523113f37cf2b37552465f9e3365f37ac96a11cf7352e
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
+DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
+DIST serde_urlencoded-0.5.4.crate 12552 BLAKE2B b4f7b852afdbc961a99100838745948b1e61032b171d78f9c80f39a78ef0d40ac00ebc147b63e378b7b7ec1e4b28ce2ce6db6467e6ac2c1093fae0363832a425 SHA512 b32c2cf86c9c023b18ce5627992692e53a0848a1d44508c510e553731e6a4fb1ad30aef8f2cafac6ab0cf3faa45eb5f1df42cf8cbce36b673d2aa6754d3ef45b
+DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST signal-hook-0.1.6.crate 22576 BLAKE2B 92f667610fbfb62eef7ecff2f920828ab9497f9185dc3008f385070064bf3753baa4436cf46ef0b97d05b65d938bcd5b581f2f640519b4d3033e293ce0683cac SHA512 5cac2cf5220846ff6bab848d00735ee714c12ed9dea2e9868041ddd276ebfab9f37a93a682bccac21e0de73dc75a0c95a7f94102b4200b3a55dbad6aaa4c7cdc
+DIST siphasher-0.2.3.crate 8717 BLAKE2B dc5f80933bf9a172dc3747d702ecc47827c18543a1955811c22ab15a3bd21ed8ff1bb6a99f96115231daa2184526fe6a12cd9f73d91655315077aa6b9c3fadd5 SHA512 7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0
+DIST skeptic-0.4.0.crate 3166 BLAKE2B d6a8dcd04896e3717469bdf407869e8dbed45fc1c2c326532e623d4283caa8c8bb0b48300e237c691a247cdd15b72569eb92f658152b70beddde65e10d0cfee5 SHA512 60eec263eea294a7b6bf2df43f3aa09141399f18eca90855f4f8caf05d8d87f489dfc73fc2a8aa330419ca0520935df7b61b0da2e44a8ac404bde8a255ff82cc
+DIST slab-0.4.1.crate 9479 BLAKE2B 3695c01f8aa9786edc64d2566abab20be6c155bd479b3da08e9c405028a4021e1ca8f937f1f29714b6f26513a0e753a602469c1e57a2bf84098e29c539551786 SHA512 ff8a967579f8d91548c03002f05f6612c6660796cd6fc35b325994f9bd48148ae124d58d9b991fe0b1d7bc111e9a6e43d4ae0be7a31a9faa126ef96ce82a248f
+DIST smallvec-0.6.6.crate 21395 BLAKE2B a3fb3dca2ccacce5e88deaac19ba5e01cc2d78194f0b3ee35a7ea60e1534785845269eb742dedc11d5340bc8224e12cc280a4e16e643d1a63caef70a7459ab04 SHA512 922e67f2b6fd9b27ccc68c4a7dc2c99d5622b778fbd3723503f5a840956eb3b99528d9beee66425a4cce949dc867d675a8071b17b7b98df729ccf07637fac2c4
+DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST string-0.1.2.crate 3989 BLAKE2B 56fe4a944186fdca6d0c1153f179f20ae1be7c052f3e984e48df5b5c064c1f3d2610eedc04cf2e35f3a8fba18bd43ba8d5581eb234c6eac12df40168ae424824 SHA512 1c147d5f0be85e9b0821411864e3f4b71678d9b910506f98376108136cf4b6a3f65cc7d2a34d132becee33216b7cd4215f83023221a7863df3e8ef9cc3219881
+DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
+DIST syn-0.15.21.crate 146845 BLAKE2B 843c3d7a4853c50be188f7c67a329220cf8e65a467e9a63b3a28ad88fe89063bbde3873f10bbf81357cc5f192756c0c4b43162fe4412471edf914d7e5d0509e8 SHA512 606ffd4bcd74920e7023b2fc83a83087f4a559a9dec0a4a0d5fb6667b9887f98c413191a84b81ddba68e869dfc9fa7d31a3018f90eaed0ad96a039fc46074391
+DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
+DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
+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 thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST threadpool-1.7.1.crate 15756 BLAKE2B b3451aa6cf8f8f1b86e19c91370fe48f73d02c9552c91fede4f6440b0b29c4d180ca8a3d7d95fc6f6e6ab6eb04113813c767367d64e171be7633545a4b966118 SHA512 e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275
+DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST tiny_http-0.6.2.crate 36408 BLAKE2B 00844e26df97404fbdda1ea2988e953d914df32b57622c5aaeae261ec9e9eaec6e41ddb441db0f27af691e76992840482fc4681bd8302360aedd96a652e4f9cd SHA512 bf7136a217d23f379b69429c07a47736e0660e9ffae3514f7f77adc43b9a28d2e732e6850e549429246e21a3f6c8a00e86e49d5d37bf13857478fa3c2cb62673
+DIST tokio-0.1.13.crate 79248 BLAKE2B fb2b76385c2ec8e05ff2e321f9c09fbdb4ea8589b80a5688ea155fee1c9b06342dff40e5aa9446b69cb7c6ae7804621ec4938055472c644752003a56bc3730d9 SHA512 9014af3d1cdd9f63790318f5a71d4a1b991c7721f453adfb067eede32e4d8f410f38e28109ac3f42de93013a46885808026102b134ec89e53580e64c46ca73c4
+DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044
+DIST tokio-core-0.1.17.crate 73933 BLAKE2B 055028a3c6fa910bb94f3a40c445b65103f87661655489c3e40e24cad0040c2e2c11e28cd6e14ba61269eb7bd091e93b68e718c9343ae09325aa320e998fbf48 SHA512 ecf3a38f88bcce8003cd334292217efb406e31e9cdeea115fd2b2c79c126cfac615aa6c975d5b08be30ac449e5bffa552e2b002b1b9a5e2f4e3969cdfe19d520
+DIST tokio-current-thread-0.1.4.crate 19400 BLAKE2B 1eadd257b7e6da5cba623f6b9365cab7f44864c344564d90b073f6ee32ad7a8f7176d2e8072323781ce1953a3a5f53a97c2305caa0565fd99dfd44ecefe16a98 SHA512 2d6c0af55470795b3ad237a2fd3e59b3d75831b04841219f57033556372f2d31af71500374022359fc661f7d606967c6b922a06c1e71e5bcea0759eea7c0ace3
+DIST tokio-executor-0.1.5.crate 10540 BLAKE2B 34a515a160907a64e177880e5d319e191a79c92a30dd12616d23b7e0b33a342651ae1943c4ac8c00658b64f1d4c2076f8ccc48adaf62ebf324bd2232069546a2 SHA512 488b75570e1f07c521972bd33b6313926c0e763385872f50858a58af1e738f2ea1a276e8899263a25a4788f641ba94f9280ad55c32978a97af9337bb0c8af987
+DIST tokio-fs-0.1.4.crate 12706 BLAKE2B dc09d985a2f242c00283cddd93842a1d9566953af60fcd389f1c574655b572c06b9ae93c8c483782076c630ff5ba4a3d86b31476a09fde46ec4089578771e860 SHA512 aa9393f9f9cf32ccba258821b22d6f3a7297ff2b4a84db934abfc66cd421239de581ad3d756815e47095435d045dcfcf6897124e0414f1fca7452f28644844d8
+DIST tokio-io-0.1.10.crate 33143 BLAKE2B ed90d1aa36a90469fcdb95f59e0b9a5817945207002bde1cdd43adde936c854ce04dc60d62acb94955c4fcdb2669e7975e23ad5c3ab60880fb7511c8f381ddd5 SHA512 6e5327e5d555fa5b84bbe361219e2a1cf3c47ae8ca2f26bf38b258176e00af6e4c3602bbe0dc2636241730e0735482189edc5ac5300bf411c9963546f103792d
+DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604
+DIST tokio-process-0.2.3.crate 19886 BLAKE2B d1ba991041bc306d87b93e686da5f1a70d5f16a877c6b4c14ccd6d9aa2b795b120e2f55cfbe468240353d465ab248a727fd7dead085e0c74a810faaf28a33ea2 SHA512 d3fdef06ec7517f0ea708c3d3d17c63fc3bebd772b93683e1e09ea12a5b1d996774dfa8881d45ea77ba27d94d4149a42b455547a5c01402958a5dcd892bee232
+DIST tokio-reactor-0.1.7.crate 23740 BLAKE2B 8a8f499ae181809c0988d2baf6f843474ef884fe56c4e25f6786f524307845bc18c808f58f4299850402020dc3ccd1ed3e8d997169410a8e465323c85f8ab3ea SHA512 4859751a0eb2d423ad1216c0a63248b6dccfcd987e3d9c58cf4277d47c5123e9ae2e9a0e8a4f3178d83b46fd4d89c14a0e09a4ef3b7b10a3ff3a662be794077a
+DIST tokio-serde-0.1.0.crate 10150 BLAKE2B cd8a6f405e3ea4e6723001b6e751317a493bff497666e35004df5a9c2f3b39276cf496882a1afd4de1a0fca68f0f8b557bc9378eab0699594c893074d1a603b9 SHA512 3478bfbdcac2d3e88fb7481c6ecde0f93e4ba41ae2c9d939e59b9aeac3152fa5313067c22f78eeb9e58520da6cd87057de3be7f1a08a9028dcfc00094b09be41
+DIST tokio-serde-bincode-0.1.1.crate 3216 BLAKE2B 80075d235e91b9b68bc69fc175170cf7dab8264114c7d9c6ac182dcc92e774b4f3e4f2a9ba4d6493ccc78b47594c7c776e1780a93f86009eba5fd6ac23ac44f3 SHA512 56629c475cf6ee98bf5edfba4516f18926684fe8ec0dc5224dbd224d28f36de66b23176329604ba638d0bc29c1cdb0ba8d8e808fb3879d8389d096fcc1f3bde8
+DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
+DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f
+DIST tokio-tcp-0.1.2.crate 10633 BLAKE2B 0298c8831f44500640f5362cb7a426e7215878e63376c05ff24a726fcd745e1f02678c0047b6525b55b3b508693388b1e266a414cb732d5ff12e49365af5993b SHA512 d250eeff3a1e8133cf20201dd3c54ba2a6f057407f051cda3da195437d0cb8eb0592e9467343145d85f916276bc76910434a5190af476cc845ff6e7e0e66e8b1
+DIST tokio-threadpool-0.1.9.crate 48778 BLAKE2B 3bb9d6ae52fc7c12307e80e3af203cf2732180d8c013a8440be144c3ea70f10557d6ba10817e67906e889cedc7550e660f3746e441e388fa18bc7d53c2cbe141 SHA512 b2f4f2951bb581d6e1110f6c39fee1341dfec6605717e93bdd9fa1958c4ebb2b849af0e068521478b07f9fadb7384807d6f8922a4be4637c18d4d4e47793c13d
+DIST tokio-timer-0.2.8.crate 36835 BLAKE2B eb154c609a0d9a58794d90e4429775ca7a0f1f4752853825eb1fe0b9f75b86ec01b6bddef442e28cb5c85449534ed18b130ac5af03483b217713dca38a530c63 SHA512 5542ffdabb01f3d64774b87e2bfb124e09e3c0ac0edcb3ec5ba9dede09f26a6a43cd0266cc8e1b3e7c35892d3497a1916e9caa7b4119781163e75dc24f742030
+DIST tokio-tls-0.1.4.crate 25780 BLAKE2B 5d643d0cfd8d8093e61224f6be23563d955188735b7c98cf53c7a162a64e3bc2d1f14c11575f1cfd69133e1b02aceba090f3061eea842a97627398ed11be9e4c SHA512 d1308ffaa7ff1f2fe59e4ea9484d79bdfcb09d19c01d9b4599613d450ca304d27117ed535806394fa219fcd6ea4a859ffa1491b5905bb419c7a8478664e29cc3
+DIST tokio-udp-0.1.3.crate 10227 BLAKE2B 8080306c695b694ba9f25252474a9370279f7ee28dddee14575f73d36cb5731743bf0101736624eafd97f55e6f83f6be9806b8ad748411eaa382a2f90d7e874e SHA512 a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2
+DIST tokio-uds-0.2.4.crate 11837 BLAKE2B 2419656eaa25c41320f51660a6d67134824cb3a1001c6164c440483ed7a002ca5ab59df8388b117b9a5a3addca3b47f5e450d5733dbf2b9eb2e741aa3aef62c0 SHA512 d59bcecd7a92c847cddfc5e5624828a7063dc1bac5515771a16e0d6987ad6a8777e779b45ed6395abb7588bad807695704c2d600e93f6617e09dcac1ae83d472
+DIST toml-0.4.9.crate 44116 BLAKE2B 079db18da9e3dd6ae448179f2e4d676ad9e8c3169366afdaaecc27b599c0ae624419014a52cd1237eda8e36fcc43be2fbf9a3e0bc502c12054638fbf30cd5b28 SHA512 3dc96d2f8ed72372bcbce960cc07391a674b80a9b40264ce0f8fd3feb05ea0eeaa81f7c0c85b4e1bba5b1bca89278e321f6e78328bbbf9321ce401b78d606b19
+DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
+DIST try-lock-0.1.0.crate 3195 BLAKE2B 70a97d35322f488382ba0bca516a672d464f963ea9c91ed0696aabbf3a14fcd759fa3b06dac4005026213cff1091326e57f25e9df919cef48794c1fa5c679690 SHA512 bb00cfa02cae996fab0d94623c71d261a73d6f8b189b75ca9c1636739c53b700e8bd915311eae54851b5f184f0999209bb45ab748828666b2cd2a9b4d3803d1f
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST twoway-0.1.8.crate 31774 BLAKE2B 68402b15e61212c986c06322851985201e4a24dd3f06eae607c2581940670c476b330d61d48cc5edb54c7622590f2e75139f0d4460873262d8efd958dd21e5d4 SHA512 326a7954891ef399b85e4e7bf1a0afda0cc9057883e7a19c4590492921ef3570916fb50929071b2e3825e57282482525f4adf2f6b49ee12dc0adf8186ffa4629
+DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
+DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
+DIST unicase-2.2.0.crate 19587 BLAKE2B f83ab62d23aaec93555ed1c342c720bbcadf9d6b14a443bf956c8b8a930136ca55fed66a7f412ea39c6a936e8da535fe20f83e564c08b924d7290b39cc32b86e SHA512 7aad01e881c18536d1f758303661d9ddeaecdccd13c7e41ae2f11f7d1030fe36dd164234aa1b4a9ef3c0e4dd847f451423a80b68e80c17663286b9c803de20c7
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe406f75e6b366a29a807f6981973fc84560ce83f8483743ad31bc0c53d8be40f215f7cf0822b7405195bee474e79b SHA512 dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST untrusted-0.6.2.crate 7526 BLAKE2B 6886853aa5a9152a47534ff6ceb419782163d3c57a06b2f592cb7d00d07eebfee38a87f198c25bd3a4ad3b9f406afbed1993b4001c0af179d099723a07d5b779 SHA512 45ef8c556a13868a13d5bc6aac26281677edc7bc647b03b51a1294cf83d7699c712c1bc0a1453dbea643207f9aede11550aa7b16750d83048f88ac7a8c93b574
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea486bcfa619c361ab925c630ca8dd9b28d8400da40eb967d64879aac6ef0fa59bfe3d4097e79daeb07915 SHA512 e69530284377ded546f9face98af6fe312664a152fa6a8aefaa4030b978e098ba55ff8ab8fcd2d54abf344e9d45a8f2188c4d7d4092baa213c11f74491f79d80
+DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
+DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
+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 void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
+DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
+DIST want-0.0.4.crate 5357 BLAKE2B 499a5394eddfa50f4fce288f6155c1a6fe664d3d52a2a23f623087655f33854ab475f67d9f748c17e437218b7c029a0ece4d3c32d4bbe061348a50fe537b4600 SHA512 4d6fa1a8c194081efeb6188646ee764da3a3de4374529a6b0af70cd5ff001491b6a87d4281f6ca40d6640308f0435f6b4b838b52e20afe3944ae58c885b6134f
+DIST want-0.0.6.crate 5434 BLAKE2B 46cc6ffc8c5edc4c0b7e48475a82e339e1ce746941823fedb3bdcd1942bfaa9d59800f465470002fa7cebf4d88614d1236cd92736c10690e04810e85aad2c1d2 SHA512 65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86
+DIST which-2.0.0.crate 6590 BLAKE2B 4a937db99477dedabe135e9b39ba8483a5c2ad9cb71208c4ea1aedc3a3ad132e431c7ea6325e1caf0aaa6fed4e13bc84867507bb924612caa4db6cb680eadf78 SHA512 4ec91a8116c624b5edfac0c051b015e67ba71160fc5294d4f6d06909ad7261b107eefa3b3930564bb07506b07fe73a882f641b77b4917abf4c1f69be15c2c84c
+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-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+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
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
+DIST zip-0.4.2.crate 25852 BLAKE2B ea5e0e32ec66bc0b5bc0f3cfec4c81aa1c8c9dbf714ba024b9d609c2fe9b2cb0b11f9f788e74eb03a1764cf819c51cff6a637ab0580b52031841c00785b9d010 SHA512 84bf51fb83db91d0f6151e7ed4fe59cfcac5dacaa4da58ab09e226a48b14287275f121cf6302b29c693dbcb16e720fbccce7d6d986364ad5d403715235ed98e4
+EBUILD sccache-0.2.8-r2.ebuild 6419 BLAKE2B 9c0405202cc4146003c4852188b365689d25a2c23703131d9114bd2f83817d83d925c384916bce0c49077b0442ecf010f793dd48c1305f79cea49937f47b8c94 SHA512 3e1ab2fc36197abffed8a8e9d646055fe1e459e3659efa2954c82516fb4a3ddf2dc5ff6a6517f7c127a4d63189f96d424f9d2ea4e7f7edbd204d0e3103037acf
+MISC metadata.xml 1054 BLAKE2B 13d8f1062d23ea96ec26e52b27c8a3b4a47b3e3f48e06b2b4ae39bb068604556ecb76f3319fc2578babc10cd235ed0ab5a28722b9cbb0a776b8a35d60dead4ea SHA512 2f8a4161a99a060d4651f195eb459173f0e02bf3dd72371611b94408c8cb2f8e7537004a0b9d90cae461cc0ba8e1531a80823db6734cb8241ad57737fd50b5a5
diff --git a/dev-util/sccache/files/logrotated b/dev-util/sccache/files/logrotated
new file mode 100644
index 000000000000..83824277bd4e
--- /dev/null
+++ b/dev-util/sccache/files/logrotated
@@ -0,0 +1,5 @@
+/var/log/sccache-scheduler.log /var/log/sccache-scheduler.error.log /var/log/sccache-server.log /var/log/sccache-server.error.log {
+	copytruncate
+	missingok
+	notifempty
+}
diff --git a/dev-util/sccache/files/scheduler.confd b/dev-util/sccache/files/scheduler.confd
new file mode 100644
index 000000000000..a70327100fca
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.confd
@@ -0,0 +1,21 @@
+# /etc/conf.d/sccache-scheduler: config file for /etc/init.d/sccache-scheduler
+#
+
+# Full path to config file. /etc/sccache/scheduler.conf is default if not set.
+#SCCACHE_SCHEDULER_CONF="/etc/sccache/scheduler.conf"
+
+# logging is off by default, see https://docs.rs/env_logger for possible values
+#SCCACHE_SCHEDULER_LOGLEVEL=info
+
+# plain file (preferred), change logrotate file as well if you change this.
+#output_log=/var/log/"${RC_SVCNAME}.log"
+#error_log=/var/log/"${RC_SVCNAME}.error.log"
+
+# syslog support via LOGGER(1). Note this spawns logger processes per io stream
+#output_logger="logger -p daemon.none --"
+#error_logger="logger -p daemon.err --"
+
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/scheduler.initd b/dev-util/sccache/files/scheduler.initd
new file mode 100755
index 000000000000..fd4d616a6bd6
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SCHEDULER_CONF="${SCCACHE_SCHEDULER_CONF:-/etc/sccache/scheduler.conf}"
+
+depend() {
+	need localmount
+	use net
+}
+
+description="Starts sccache build scheduler server"
+
+command="/usr/bin/sccache-dist"
+command_args="scheduler ${SCCACHE_SCHEDULER_CONF:+--config ${SCCACHE_SCHEDULER_CONF}}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${SCCACHE_SCHEDULER_CONF}"
+start_stop_daemon_args="--env RUST_LOG=${SCCACHE_SCHEDULER_LOGLEVEL:- }"
diff --git a/dev-util/sccache/files/server.confd b/dev-util/sccache/files/server.confd
new file mode 100644
index 000000000000..5bd110a3c2b0
--- /dev/null
+++ b/dev-util/sccache/files/server.confd
@@ -0,0 +1,21 @@
+# /etc/conf.d/sccache-server: config file for /etc/init.d/sccache-server
+#
+
+# Full path to config file. /etc/sccache/server.conf is default if not set.
+#SCCACHE_SERVER_CONF="/etc/sccache/server.conf"
+
+# logging is off by default, see https://docs.rs/env_logger for possible values
+#SCCACHE_SERVER_LOGLEVEL=info
+
+# plain file (preferred), change logrotate file as well if you change this.
+#output_log=/var/log/"${RC_SVCNAME}.log"
+#error_log=/var/log/"${RC_SVCNAME}.error.log"
+
+# syslog support via LOGGER(1). Note this spawns logger processes per io stream
+#output_logger="logger -p daemon.none --"
+#error_logger="logger -p daemon.err --"
+
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/server.initd b/dev-util/sccache/files/server.initd
new file mode 100755
index 000000000000..0c37ee400b05
--- /dev/null
+++ b/dev-util/sccache/files/server.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SERVER_CONF="${SCCACHE_SERVER_CONF:-/etc/sccache/server.conf}"
+
+depend() {
+	need localmount
+	use net
+}
+
+description="Starts sccache build server"
+
+command="/usr/bin/sccache-dist"
+command_args="server ${SCCACHE_SERVER_CONF:+--config ${SCCACHE_SERVER_CONF}}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${SCCACHE_SERVER_CONF}"
+start_stop_daemon_args="--env RUST_LOG=${SCCACHE_SERVER_LOGLEVEL:- }"
diff --git a/dev-util/sccache/metadata.xml b/dev-util/sccache/metadata.xml
new file mode 100644
index 000000000000..03f5309e9e44
--- /dev/null
+++ b/dev-util/sccache/metadata.xml
@@ -0,0 +1,26 @@
+<?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>
+	<use>
+		<flag name="azure">Enable Azure Blob Storage support</flag>
+		<flag name="dist-client">Enables distributed support in the sccache client</flag>
+		<flag name="gcs">Enable Google Cloud Storage support</flag>
+		<flag name="redis">Enable Redis support</flag>
+		<flag name="s3">Enable Amazon S3 support</flag>
+		<flag name="dist-server">Enables the sccache-dist binary</flag>
+	</use>
+	<longdescription lang="en">
+		Sccache is a ccache-like tool.
+		It is used as a compiler wrapper and avoids compilation when possible,
+		storing a cache in a remote storage using the Amazon Simple Cloud Storage Service (S3) API,
+		the Google Cloud Storage (GCS) API, or Redis.
+		Includes experimental rust support.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mozilla/sccache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/sccache/sccache-0.2.8-r2.ebuild b/dev-util/sccache/sccache-0.2.8-r2.ebuild
new file mode 100644
index 000000000000..21a6f2c2688f
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.8-r2.ebuild
@@ -0,0 +1,358 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.12.0
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-0.2.11
+lazy_static-1.2.0
+lazycell-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+lru-disk-cache-0.2.0
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+num_cpus-1.8.0
+number_prefix-0.2.8
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+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
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.2
+rouille-2.2.0
+rust-crypto-0.2.36
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+which-2.0.0
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+	dist-server? ( dev-libs/openssl:0= )
+	gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	dist-client? ( sys-devel/icecream )
+	dist-server? ( sys-apps/bubblewrap )
+"
+
+src_configure() {
+	myfeatures=(
+		$(usev azure)
+		$(usev dist-client)
+		$(usev dist-server)
+		$(usev gcs)
+		$(usev memcached)
+		$(usev redis)
+		$(usev s3)
+	)
+}
+
+src_compile(){
+	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+	keepdir /etc/sccache
+
+	einstalldocs
+	dodoc -r docs/.
+
+	if use dist-server; then
+		newinitd "${FILESDIR}"/server.initd sccache-server
+		newconfd "${FILESDIR}"/server.confd sccache-server
+
+		newinitd "${FILESDIR}"/scheduler.initd sccache-scheduler
+		newconfd "${FILESDIR}"/scheduler.confd sccache-scheduler
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotated" sccache
+	fi
+}
+
+src_test() {
+	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+	ewarn "${PN} is experimental, please use with care"
+	use memcached && optfeature "memcached backend support" net-misc/memcached
+	use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index fc0f336d88d0..3c22fc0cba5a 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,7 +2,7 @@ DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
-EBUILD strace-4.25.ebuild 2292 BLAKE2B c135074cdb4b9547196c9433824fb9bedc9385e0c9d0cbf64ac5bad057c562e62c58e4a8c467908ee1d0d96744eda5dc5590e285f3bce889ba1135b3797dd0e7 SHA512 c79165e873c1a029349a07ea2132d1050173e649ea6fca1429a1d6e659cdbbfd0c6d75eaa6d26ab406496edcb769fd9d04e825d2686a7de12ade6e0ccd4f73c0
+EBUILD strace-4.25.ebuild 2290 BLAKE2B 38069f4bb849f47f1367ef3ee8c9ca5a305301fdd793add6d96bdf82d186e3b33081b006ae01c05378acf4f908081fcc7c90d241ba86f9efd700aba3c7270aaf SHA512 ddd1654ab65a55ee789788aa4aeb570fcbcacebf9009e6d39d6cd79cb46128e126c2eab0ddbca67bf48aad0ecf9fd995b8fbe45e8243fbc6cef415a709faac6a
 EBUILD strace-4.26.ebuild 2301 BLAKE2B e082ebd9683bda40d46e8438ca7d6d3dd533ca5db8882e3e301b2073795bd1067037cf052e434ca002d7f80d0c7c174a67fbd30bf2e9763e3ba2eb88bad68bb5 SHA512 14afc5fc20b55812801485d2cfedc9c49c9b5a8e3855ef08b1bbd7b799f05dd2b35d6714ec9d2af4d5ffbe740bc7f359add9df4d66af2f745809f4ed06a2f2fa
 EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.25.ebuild b/dev-util/strace/strace-4.25.ebuild
index e2ead1dc7a54..d50519061e0d 100644
--- a/dev-util/strace/strace-4.25.ebuild
+++ b/dev-util/strace/strace-4.25.ebuild
@@ -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/uftrace/Manifest b/dev-util/uftrace/Manifest
index a5b84d4787f3..1de18c36f3ac 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,5 +1,3 @@
-DIST uftrace-0.8.3.tar.gz 894263 BLAKE2B cdd303eb3bb488bee24fcb8ea852b27cc1c8c8de6483d95a65618f8af7aa8c06af42b561cee3b18c5d58378fff49538f88bc9debb6e2452ebade23fc7f4a32ce SHA512 2c7155ef2053dddb6b2abbed28a0374b1c1c69898ecb85cd918a1e426b27f45a4a5f9dad4be512592c72ee80c2e131e2def2a9c7a45c3bc93d4cc0b13b0c2996
 DIST uftrace-0.9.1.tar.gz 967083 BLAKE2B 2e381f5cda92fadd963fc7e0ccebaec6b6796acd75d8436b66f9b6ee4257141f704471832e224712bb65e7570fe4997f953458455b2b0f257ead7f4093140313 SHA512 a906664f883e08f19063229e7dd43aebc9115b08829d866fb887dd281a0375a5684332920c3f7307a4d62baa14e982cb7535bdfe454ab3ad5d8ec7fb5792402e
-EBUILD uftrace-0.8.3.ebuild 458 BLAKE2B 0f215e5ecb97f0dcef4cdc799459cca23d206b05e8ecd147572fdeca183c4093141f60884d331b74b9b23990163ad4dd8bf1c6cf9999442788adb2cdcf876b72 SHA512 3e8a8f696a1ddf4ef4c74bcd80e993f3d105d463d3987419d0dafc4ccc65e5a0785b0ce6c58207ed0e9d87a73892fe8848afb5ef347bf20d468acb0b1f8a5018
 EBUILD uftrace-0.9.1.ebuild 569 BLAKE2B 1cf7567d53eb11bbbc78fde2486090b4a6d99c24cf8f1165887c986efd40bf948bc3dd163b372bcbdef6c8ffd7d3a75aa29fa6c5cc8cabadeb8fe00f76b2e2b1 SHA512 b7f361630c453e0cbc1282f18bb2c97e7da54ab825f1b0437f134ffb39747da82fbde61e81c79bf845142aed1a7fd72138b3bf29d488af4837841755abe7d6ea
 MISC metadata.xml 248 BLAKE2B 839a984864aeb89b07996cf03470a078ae558a5b832690c25adea12868e54f82b950d52e391262da8649e40b97f400a7a45040d54365ee581743e5b61e85fa3d SHA512 047ffd8442624867a708f2a0473700fc91ddcf36aa9a0617308c7cdf956a63b8fc21e7d5a77779ca76ea6abafe89a9d8b7a1fba521f9ccb5b966ea1b5e716678
diff --git a/dev-util/uftrace/uftrace-0.8.3.ebuild b/dev-util/uftrace/uftrace-0.8.3.ebuild
deleted file mode 100644
index 6e00f70cedd0..000000000000
--- a/dev-util/uftrace/uftrace-0.8.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
-}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 39f866d061f6..8f51ef57f841 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
 DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
 EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286
-EBUILD vulkan-tools-1.1.92.0.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d
+EBUILD vulkan-tools-1.1.92.0.ebuild 2267 BLAKE2B b147cedd8c564ca9572b531743d28d00c630966c9d10ad09e4004a0b718af4259421b0d436152925862353ffb0d6e0f097400cfa3313f95e63242867e809c036 SHA512 7d8ef8cbb05901fd4ec95d884d98bb404d2e4b16208bc51d03d69759bb1e350689eedd21d4e599638a33e5e80c7866cb2d2324cbb06e895c3cb29dda6159e596
 EBUILD vulkan-tools-9999.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
index d3d1c9c446ff..a23ba1cb8bfa 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.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 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
 fi
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
index 08e4b805b08a..b5567cbe29fb 100644
--- a/dev-util/waf/Manifest
+++ b/dev-util/waf/Manifest
@@ -1,5 +1,3 @@
 DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-DIST waf-1.9.8.tar.bz2 620795 BLAKE2B d7c3ad5cf0c1b16aef84b311d7fe2d26e7e6fe0438373e19387cade0356469100063059e6900398c7bb4993d9440f79933ba59d1bdd1b71e41364d1659b18d55 SHA512 a86d29d32257ee5b82db28f20ef3056a995c4a47404ee47f216899c76332c6586bde83397db907b51c8d3d38efaa3e2f4befbf8f27d17d1f58e6b0808f070fdc
 EBUILD waf-1.9.14.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
-EBUILD waf-1.9.8.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/waf-1.9.8.ebuild b/dev-util/waf/waf-1.9.8.ebuild
deleted file mode 100644
index e37a34205025..000000000000
--- a/dev-util/waf/waf-1.9.8.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
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="piece of software used to help building software projects"
-HOMEPAGE="https://waf.io/"
-SRC_URI="https://waf.io/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-DEPEND="${PYTHON_DEPS}"
-
-DOCS="ChangeLog README.md DEVEL"
-
-src_prepare() {
-	rm -v waf || die
-
-	default
-}
-
-src_configure() {
-	${EPYTHON} ./waf-light configure
-}
-
-src_compile() {
-	${EPYTHON} ./waf-light build
-}
-
-src_install() {
-	default
-
-	#point waf binary to waflib dir and strip payload
-	sed -e "/INSTALL=/s:=.*:='${EROOT}usr':" \
-		-e "/REVISION=/s:=.*:='${PR}':" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "/^#\(==>\|BZ\|<==\)/d" \
-		-i waf || die
-	dobin waf
-
-	insinto /usr/$(get_libdir)/${PN}3-${PV}-${PR}
-	doins -r waflib
-
-	if use examples ; then
-		dodoc -r demos
-	fi
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 258a13ca3497..afec3286729a 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 0632d8113774..9072995a227e 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,11 +1,5 @@
-AUX bzr-2.4.2-no-pyrex-citon.patch 1203 BLAKE2B f76b90e609034169b7bb39948ab3a04a2c64244e4521f3cba182179a6e1c6e513981ac7a55eec7d5380d0e8199f5d08c610bdc2cd116e31e5e4c72dfb228b9bf SHA512 e71eacf2881260739c2104ca30db16ff51d30ce9971b9887a1d9730f8bf020a33300079acb1e644e5d092cdc1c890956551e581d447ff2493a92e9645899b08e
-AUX bzr-2.5.1-sphinx-test-failures.patch 1028 BLAKE2B b35dd061a9d5567fc3942df136676bd0e59eea6dc82914805c47d4a377449c6da98b4e20544dbe546b8b54ceb48182354a5514b30424c43fa32b2437f569f29a SHA512 2b5738b36c8b83c238fcb51f20d9a96589f848d4c2c56a4975e615e8cdc3dcbbe8457f426d67293ef0a45d22cc4172e69ca8155e114c83b00237eea2c5048749
-DIST bzr-2.5.1.tar.gz 10451513 BLAKE2B 00025c5db2d9ad94b39fb450c83c917b532c4804897a064b4fedb02ba7e9243027f105b8b5613e5f62e17e2209c6eef7b92fe3e7c24186edd35fab257ffa334d SHA512 40700d0f4f61bb1609d85772812249114c9e7af619143aafec97163617cb58828e63bda22abf576704848b479463bb85c0b2dc7e5bb49108f48fa397c7bfe85c
-DIST bzr-2.6.0.tar.gz 11301124 BLAKE2B 63a45634e3da53b06208c96726a399edd08c5a4c43ae3e431501aa15dc8060096fb13a390d5f1a6c7cc5cf5a9dbd5245760c21ba29a060a53f74c886fd69424c SHA512 f40d4380a837321c2ed168d15b0b5d31e9de6df93c0f8f2fd9b16c9351524b0afac5b8744740f587e9704efeb4cc004cae7f35aed47f73b5c796cbe2526af980
 DIST bzr-2.7.0.tar.gz 11586410 BLAKE2B 9d61d5efa1c02667fdb93d66fc4290f279c74bff2fd0174149243563bc5013085438410221fb6565f986ef17e957b680a1bdd3142e23843b4cbc39c7855dbd98 SHA512 c39ad3715d865788da74d8de8b469e1dc93d18b6cbcbc569464cdeb9bb2173bf8d7f4f8ee8f7599fbcbbe322817a4c72e785d544e622753699c425c32597d9aa
 DIST bzr-2.7.1_pre.tar.gz 10964137 BLAKE2B d126730d782f232d6c486e31ab465a1a295de456eb59fc1db4d215529ec38e78826da1bedbe6a80af0e874188635c83742c5ae5b07c42dd968f1d0d88596a35e SHA512 b65c63dff33f1646e6db84d9307b870140c2c7b3b16cef69eb4bfb5a5a94cb1721ed74c26e6ad78232fffb4b5055cb4096d9835197db9b97f91c16e8a79658b3
-EBUILD bzr-2.5.1-r1.ebuild 2459 BLAKE2B 45d564c149ed3d5cf18c8a851c83867ba23f12b030664b261c3de2fe035316b1a8e1c94956929f0f9705bed95f3c13f7799da0a0856242e83462df051739258a SHA512 e06a318b5c742cfaa96f43ca161b80c4a8ea8d1597f85511f29882799f187c7a0e2853bcb5427f882b3274c4b2d9d58b035db772827ad257e41f2d8518937971
-EBUILD bzr-2.6.0.ebuild 2620 BLAKE2B a657288486403d51dedbc38c84160964e28259a83e3024e0e1929a81180a04ffa20cf3f5c6c9cbbcaec996711db1ec11b895c19918893371a33d632e13d63283 SHA512 10b98ec974074a78ca19ba62c1028becdf4370b86565855d8dbaaec97a2c7f1b54baa4971bfc8c8c0593f089b6b8b5e4cb7bfb978ac871d105c185ec1fbbdb6d
 EBUILD bzr-2.7.0.ebuild 2611 BLAKE2B 8a05b594dad05f945eec856e496109cbbf76de7a0597aa377c21ba0885312a59cbf689a115bfa7205e5354d5b16ee1f217c5b17b9d8aed058fda0782c197ebfa SHA512 3f60cd5bdaba84b1003ffee1b69061bb372c379befebdfdfc77ea739f40792bd1d35d4f6b3be79c46dbb8e9881de5ea27a3ecd8f566a5a2d803db43746ba01b2
 EBUILD bzr-2.7.1_pre.ebuild 2596 BLAKE2B d3a44f37fa78c3dc7d0aeb4303577e23af17fd23180f22e1997171cb689cbce5b8cab58cb99cdaae99ad992918c6eea71d0c4cc7bbfe634ad6f746ba6725b93a SHA512 aacd53a54c4a9427bb458f177dd93d1b4abe0b533e382a207eede33b9e88576c7fc5545092586a16f95ed6f0ac612de22f579c04e41dc05cac52bd8227718369
 MISC metadata.xml 772 BLAKE2B 8f1d371a225b5b6702748efc93dde757d88a39c0a8124abc898eff891a4867c92dbc19a356b4c0726682e5304b80be333e12a981d04b0ae89e480cb2f6b6c3a3 SHA512 cc63dba9888058f60521da2fdc43697f1fc8bde194782346279560b50ceaa555b464599d28641350cd25f67aebe2f449cbe306dd651620bc891271acf8aaddac
diff --git a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild b/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
deleted file mode 100644
index 7aaa0aa22229..000000000000
--- a/dev-vcs/bzr/bzr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,90 +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,ssl,xml"
-
-inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator
-
-MY_P=${PN}-${PV}
-SERIES=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bazaar is a next generation distributed version control system"
-HOMEPAGE="http://bazaar-vcs.org/"
-#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-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 ~m68k-mint ~sparc-solaris"
-IUSE="curl doc +sftp test"
-
-RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
-	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		${RDEPEND}
-		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
-		dev-python/subunit
-		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
-	"${FILESDIR}/${P}-sphinx-test-failures.patch"
-)
-
-python_configure_all() {
-	# Generate the locales first to avoid a race condition.
-	esetup.py build_mo
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/850676
-	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
-	skip_tests+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
-		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Fixup manpages manually; passing --install-data causes locales to be
-	# installed in /usr/share/share/locale
-	dodir /usr/share
-	mv "${ED%/}"/usr/{man,share/man} || die
-
-	dodoc doc/*.txt
-
-	if use doc; then
-		docinto developers
-		dodoc -r doc/developers/* || die
-		for doc in mini-tutorial tutorials user-{guide,reference}; do
-			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
-		done
-	fi
-
-	dobashcomp contrib/bash/bzr || die
-}
diff --git a/dev-vcs/bzr/bzr-2.6.0.ebuild b/dev-vcs/bzr/bzr-2.6.0.ebuild
deleted file mode 100644
index 9ddf9d73ddf5..000000000000
--- a/dev-vcs/bzr/bzr-2.6.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl,xml"
-
-MY_P=${PN}-${PV}
-
-DESCRIPTION="Bazaar is a next generation distributed version control system"
-HOMEPAGE="http://bazaar-vcs.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="curl doc +sftp test"
-PLOCALES="ar ast bs ca cs de el en_AU en_GB es fa fo fr gl he id it ja ko ms my nb nl oc pl pt_BR ro ru sco si sk sr sv tr ug uk vi zh_CN"
-
-inherit bash-completion-r1 distutils-r1 eutils flag-o-matic versionator l10n
-SERIES=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
-
-RDEPEND="curl? ( dev-python/pycurl[${PYTHON_USEDEP}] )
-	sftp? ( dev-python/paramiko[${PYTHON_USEDEP}] )"
-
-DEPEND="test? (
-		${RDEPEND}
-		>=dev-python/pyftpdlib-0.7.0[${PYTHON_USEDEP}]
-		dev-python/subunit
-		>=dev-python/testtools-0.9.5[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# Fails tests bug#487216
-# Upstream is not exactly keen on fixing it
-RESTRICT="test"
-
-python_configure_all() {
-	rm_loc() {
-		rm "${S}"/po/$1.po || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-	# Generate the locales first to avoid a race condition.
-	esetup.py build_mo
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/850676
-	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
-	skip_tests+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	LC_ALL="C" "${PYTHON}" bzr --no-plugins selftest -v \
-		${skip_tests:+-x} "${skip_tests}" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# Fixup manpages manually; passing --install-data causes locales to be
-	# installed in /usr/share/share/locale
-	dodir /usr/share
-	mv "${ED%/}"/usr/{man,share/man} || die
-
-	dodoc doc/*.txt
-
-	if use doc; then
-		docinto developers
-		dodoc -r doc/developers/* || die
-		for doc in mini-tutorial tutorials user-{guide,reference}; do
-			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
-		done
-	fi
-
-	dobashcomp contrib/bash/bzr || die
-}
diff --git a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
deleted file mode 100644
index a5128a03d628..000000000000
--- a/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- setup.py.orig	2011-12-26 12:42:40.308882969 +0100
-+++ setup.py	2011-12-26 12:43:38.861854988 +0100
-@@ -178,28 +178,8 @@
- from distutils.errors import CCompilerError, DistutilsPlatformError
- from distutils.extension import Extension
- ext_modules = []
--try:
--    try:
--        from Cython.Distutils import build_ext
--        from Cython.Compiler.Version import version as pyrex_version
--    except ImportError:
--        print("No Cython, trying Pyrex...")
--        from Pyrex.Distutils import build_ext
--        from Pyrex.Compiler.Version import version as pyrex_version
--except ImportError:
--    have_pyrex = False
--    # try to build the extension from the prior generated source.
--    print("")
--    print("The python package 'Pyrex' is not available."
--          " If the .c files are available,")
--    print("they will be built,"
--          " but modifying the .pyx files will not rebuild them.")
--    print("")
--    from distutils.command.build_ext import build_ext
--else:
--    have_pyrex = True
--    pyrex_version_info = tuple(map(int, pyrex_version.rstrip("+").split('.')))
--
-+have_pyrex = False
-+from distutils.command.build_ext import build_ext
- 
- class build_ext_if_possible(build_ext):
- 
diff --git a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
deleted file mode 100644
index ac1fd0212d6b..000000000000
--- a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream revno 6523 ((vila) Avoid test sphinx-related failures now
-that we don't have direct sphinx anymore. (Vincent Ladeuil))
-
-=== modified file 'bzrlib/tests/test_utextwrap.py'
---- bzrlib/tests/test_utextwrap.py	2011-05-28 06:44:01 +0000
-+++ bzrlib/tests/test_utextwrap.py	2012-04-17 12:18:27 +0000
-@@ -171,16 +171,6 @@
- 
- 
-     def setup_both(testcase, base_class, reused_class):
--
--        if (features.sphinx.available()):
--            # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed,
--            # we can't run these tests when sphinx <= 1.0.1 as it breaks
--            # textwrap.TextWrapper.wordsep_re
--            version = tuple(map(int,
--                                features.sphinx.module.__version__.split('.')))
--            if version <= (1, 0, 7):
--                raise tests.TestSkipped(
--                    'sphinx textwrap monkeypatch breaks utextwrap')
-         super(base_class, testcase).setUp()
-         override_textwrap_symbols(testcase)
-         reused_class.setUp(testcase)
-
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 4b8c699e1ab4..89c18ce8a42e 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,5 +1,3 @@
-DIST cvs-fast-export-1.44.tar.gz 512435 BLAKE2B 2dfcd34efbf400c9d9a726933a18504a8d241928646d73f54f1860d1580030fa0328df4aaf5b57f1fbdc4b7b2c0a988ac903c8f9f03384515fdd5241fbf51c06 SHA512 66209589c692d2b0b2e60494386cb4dbae04f5f6676c89733d3ad6e5ce8b76d3cb70d7b03430be643e44eaff5848fdb7413795e10716a9ed8b4f2a4043f822a5
 DIST cvs-fast-export-1.45.tar.gz 517917 BLAKE2B 47d0debe2ea4d5674630065ee320c5db71f7ab6e4b17b7850d28c1951359ea98c639639574a7c3a25b9ec4e09ff53f1c5db566bff070e6381061fd828e875061 SHA512 f3acadabdd74f2099003a0cda29b021ea2173127af1a358bcb855397be95edaff2b1f30d3cf31dd6c08e79a8bad07b80b826c374d9b5e43555ec60d08dd577e4
-EBUILD cvs-fast-export-1.44.ebuild 936 BLAKE2B 9e127e6c4aeb2990c431cd0730c6d639d3becbadbb89dc879d48763fcf34450b899f6668de986ae5698b62afd80d5c1b0d4e52a8ed8aa76f634592cf407987fa SHA512 613e331d0054271bb3f2f6e67e16bbe2561b2e7e2f202662b71145f08fe4055657fd6621358a953b0772dc04820e86259630014a9f845fbcfb76754cfcb080a9
 EBUILD cvs-fast-export-1.45.ebuild 936 BLAKE2B 3edd1b15e04d12db47f0fbb6462f39f0d88ffbde284cbe65036207bd3543f65191d3ab6b4abeae1af4197cae2e60f5c04b44e396d07c9c0f1128ff0013408d40 SHA512 4f741abb002bea0dc0181351633a01df7af5935193e6314a690397f3ad5b9311036a715961f5c2d678a90455940844f5927d83ff8fb742f9dde3cada741c604a
 MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
deleted file mode 100644
index 37967a3e1452..000000000000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.44.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast-export history from a CVS repository or RCS collection"
-HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-text/asciidoc"
-
-RESTRICT=test # upstream does not ship some tests in tarball
-
-src_prepare() {
-	default
-
-	tc-export CC
-	export prefix=/usr
-
-	# respect CC, CFLAGS and LDFLAGS
-	sed \
-		-e 's/cc /$(CC) $(LDFLAGS) /' \
-		-e 's/^CFLAGS += -O/#&/' \
-		-e 's/CFLAGS=/CFLAGS+=/' \
-		-i Makefile || die
-}
-
-src_compile() {
-	# '.adoc.html' rules can't be executed in parallel
-	# as they reuse the same 'docbook-xsl.css' file name.
-	emake -j1 html
-	# Allow full parallelism for the rest
-	emake
-}
-
-src_install() {
-	default
-	dodoc README
-}
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 3831790e8c94..3944cdce7f77 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,6 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r11.ebuild 2984 BLAKE2B 722d554d0c47634755f07c7931a7397d07bda684eb301134c6257c76e7412e85a37e8c3a4e16aa1d5ba792711b057418b9d2ee87c7fbd4b253c4211ed579efaa SHA512 af3615d49bdc9cca776efaf8e05cb682710ef815a8dd319fac74964e7d5aa25e59814dbb962882a2acf0adec671e387012455edb340b9f4cfdceb3314a1773a3
 EBUILD cvs-1.12.12-r12.ebuild 2979 BLAKE2B 963559a287c19354b0b0f050fac6c04480e97e58e7a8b896447eed70918be2789133a3b4c9e5d68eca9b733fbe7d45b5ab04f81cfb8201bdb69f16ffd17d7307 SHA512 3406b3b1edf52d8b481fd5c3f43445a0d9221480e9c18e2f3b29a75f5afcd9b56c0743f18378333c402ea5ad79a671625f4f60c12e8d14e5ffac353ea2110dc5
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
deleted file mode 100644
index 79106939bf1a..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam toolchain-funcs
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://cvs.nongnu.org/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="crypt doc kerberos nls pam server"
-RESTRICT="test"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	"${FILESDIR}"/${P}-openat.patch
-	"${FILESDIR}"/${P}-block-requests.patch
-	"${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
-	"${FILESDIR}"/${P}-install-sh.patch
-	"${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
-	"${FILESDIR}"/${P}-getdelim.patch # 314791
-	"${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
-	"${FILESDIR}"/${P}-mktime-x32.patch # 395641
-	"${FILESDIR}"/${P}-fix-massive-leak.patch
-	"${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
-	"${FILESDIR}"/${P}-CVE-2012-0804.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-musl.patch
-	)
-DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
-	PROJECTS README TESTS TODO )
-
-src_prepare() {
-	default
-
-	sed -i "/^AR/s/ar/$(tc-getAR)/" diff/Makefile.in lib/Makefile.in || die
-}
-
-src_configure() {
-	if tc-is-cross-compiler ; then
-		# Sane defaults when cross-compiling (as these tests want to
-		# try and execute code).
-		export cvs_cv_func_printf_ptr="yes"
-	fi
-	econf \
-		--with-external-zlib \
-		--with-tmpdir=${EPREFIX%/}/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server)
-}
-
-src_install() {
-	# Not installed into emacs site-lisp because it clobbers the normal C
-	# indentations.
-	DOCS+=( cvs-format.el )
-
-	if use doc; then
-		DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
-		HTML_DOCS=( ../cederqvist-${PV}.html/. )
-	fi
-
-	default
-
-	use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
-
-	if use server; then
-		newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
-		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
-	fi
-
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-pkg_postinst() {
-	use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
diff --git a/dev-vcs/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest
index 1e41f5f9d2a7..2200cc530b45 100644
--- a/dev-vcs/cvsgraph/Manifest
+++ b/dev-vcs/cvsgraph/Manifest
@@ -1,5 +1,3 @@
-DIST cvsgraph-1.6.1.tar.gz 114337 BLAKE2B 5cd68521e596ca610e9c9b87d6f1ad75b8e77519dcddc51a8e717a280831967021be62e8da3f872dee7911d3a5853ac328339eadeb0446262e0a8404d40a5625 SHA512 6548d43784cd6e2e85777e0158371c6332f96f72fc8d1827dcece8aa54d77139021586e468155ec003d371eaa7095cd57a5004a1ed76bc55db325c3899105e6b
 DIST cvsgraph-1.7.0.tar.gz 202678 BLAKE2B 589195f3642b0bc181a581a8f832eded3e6add44b2c9ee5c76a1a4f347384fbd59cd1f7f22c37d56810636dc13bad900bbe7973f9bfa061c37baa8becdaf35d5 SHA512 b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab
-EBUILD cvsgraph-1.6.1.ebuild 989 BLAKE2B 9f151ae777697e7dbff6a32b11c00369f8964cffbb4b0a588579ea053b136d0e5f2fd06ae2bcde4b5105538db87cc2d8835b60532e07175aeb8dbd308c65d9de SHA512 dc1f9f05fec2502bad47d6dc15a4095cbfeb70135f758243f11ab2ecb256d6e16ec21e0d4f9a9ead01780c2c572b685b1bd929076ea743be04b4b20e84e3b0cc
 EBUILD cvsgraph-1.7.0.ebuild 996 BLAKE2B b8b1296b3b212f429cdf8986d03aef3a44870103d816f9a341862c9d812581e399c97639ef7c6167e4769f8a4ee0acd95492393a81194877bb1424ef9fcf077a SHA512 99f8bad8da445143ac4e54e875b04357413fa3013fe8f5a510d5a2b9039d32d56ea34d428971bda2bac4ffa62ad44cc50152da986985bb78dda95e867a2bd889
 MISC metadata.xml 493 BLAKE2B 0e09276d91cc147bcb1b5eef8b13d9941cc1940a24e98413a9a5ba6d76bb98183fe55594bdfda4cb3787a73a32d893169a46924d61ea4b9030046005927d4a71 SHA512 8f12f7ce3e9039383476cb5802de8ab3e8ac01cb61ad25510e2c4e4ff3f075da0373197745365074c33fcafb33b680f121dc07a77499075e98896f8b4f5d26ba
diff --git a/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild
deleted file mode 100644
index 564e2b19c8f7..000000000000
--- a/dev-vcs/cvsgraph/cvsgraph-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="CVS/RCS repository grapher"
-HOMEPAGE="http://www.akhphd.au.dk/~bertho/cvsgraph"
-SRC_URI="http://www.akhphd.au.dk/~bertho/cvsgraph/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 -ia64 ppc sparc x86"
-IUSE="gif jpeg nls png truetype zlib"
-
-DEPEND="media-libs/gd
-	zlib? ( sys-libs/zlib )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	truetype? ( media-libs/freetype )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable gif) \
-		$(use_enable png) \
-		$(use_enable jpeg) \
-		$(use_enable truetype) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	dobin cvsgraph
-	insinto /etc
-	doins cvsgraph.conf
-	doman cvsgraph.1 cvsgraph.conf.5
-	dodoc ChangeLog README contrib/*.php3
-	docinto automatic_documentation ; dodoc contrib/automatic_documentation/*
-}
diff --git a/dev-vcs/cvsutils/Manifest b/dev-vcs/cvsutils/Manifest
index 07509c50e235..4cc66d7fdea5 100644
--- a/dev-vcs/cvsutils/Manifest
+++ b/dev-vcs/cvsutils/Manifest
@@ -1,4 +1,3 @@
 DIST cvsutils-0.2.5.tar.gz 79596 BLAKE2B db3a701e378892ac9986f981c5fc1f18cf1d75903741c74cbf0936682412b46c6292e00bd2962ef597c16f46fa256835b8ab5e272246ca142583ac90c6d1a459 SHA512 7ad840ebfdbc9e53bd7463bc523108381ad3d5d474e166e7dd0d8f1ffb5c6751d027d19b93743c412001ba63a60a6d4bb63a05a735d2f0b2246e14141ef638c1
 EBUILD cvsutils-0.2.5-r1.ebuild 410 BLAKE2B 7847406e36ed1b8d3aed9f93a068fe13e402d4457069419e2ba5e353da0cd2b1617e7d788c2d395d7a49ccaa673090d483c954bb0d346c569570923aba419ec6 SHA512 41d7976d917b2a6b67e54000ba18d83f2dceba5ccd84debb0c47e40233e7ddfc7f4e36ee04192a52e190d4a4ba313f236acc94f054b6bdb1e089c9e94d1a1347
-EBUILD cvsutils-0.2.5.ebuild 520 BLAKE2B 7b2873f0d0f391f244a770bcc16e0489829f0b826af16c9e62afc79061a473c7361e0137e4159180fa622b56bb0106345d57821e5131e3e289302d8649480335 SHA512 20c7226d24da154fa7af221a3aa4e0dcd79b0c7397a09bad17ab80711491111151d8b276445d205617c94ddd16f84334b1e509c2522b782ee6804109888d03d0
 MISC metadata.xml 451 BLAKE2B 53f90d74a7d07779fa1ffce52e44d1b4b46ee65a0dd8dfd660c8693014064d770ca150dee11115ca717c3bb8a9001f4c6477cec19a83d5f188485379b6ba004f SHA512 226cedd069ebfeecf6258c413eb2315b103303fb767df8ff102b97d2ca5ff0eff838cb9c328ca96439bec2100eb3a07f59c02ef44edbf3d4d070556673d4ce59
diff --git a/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild b/dev-vcs/cvsutils/cvsutils-0.2.5.ebuild
deleted file mode 100644
index c34b4efd0f12..000000000000
--- a/dev-vcs/cvsutils/cvsutils-0.2.5.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
-
-DESCRIPTION="A small bundle of utilities to work with CVS repositories"
-HOMEPAGE="https://www.red-bean.com/cvsutils/"
-SRC_URI="https://www.red-bean.com/cvsutils/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README THANKS NEWS
-}
diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest
index c2bb7ab279d9..245488fcbb5e 100644
--- a/dev-vcs/easygit/Manifest
+++ b/dev-vcs/easygit/Manifest
@@ -1,5 +1,3 @@
-DIST easygit-1.6.5.5 283019 BLAKE2B 77d81b193a9dbb0d75df9aa66dd549418c9249a4b073528d72e770bc1857ee1165b33adbefcff94621cedf48edf8b551e065678b0a64166305467e2a01d2076c SHA512 2e639ffa40ac6ea8619abf5d8aced57a9fb203aaf96e259b2d3905b1d6d040d3d64adf14dad0552bd710808e3c23b63e859f1b5b02bd13aca1ad232fe05c2bbd
 DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec
-EBUILD easygit-1.6.5.5.ebuild 517 BLAKE2B 36e84d7bbc2ac2263979b81226df52f0ca44bdd3eeb3aee6cdb55b7d7f440d7b4d15dcfe836658a875ec868e2203532072bdeadbb72e6e6e06c41ea1441f83f9 SHA512 bc29b551e3fc1dd6f2aa6c75483a96cb258815e9ff809fe9389455eda391ab51a069c9fb4148dfe9830912a33c9317fcffa17be6249ca26bd7c9e99086cdbab7
 EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72
 MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
diff --git a/dev-vcs/easygit/easygit-1.6.5.5.ebuild b/dev-vcs/easygit/easygit-1.6.5.5.ebuild
deleted file mode 100644
index 0989d901a4ad..000000000000
--- a/dev-vcs/easygit/easygit-1.6.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-MY_PN="eg"
-
-DESCRIPTION="Easy GIT is a wrapper for git, designed to make git easy to learn and use"
-HOMEPAGE="https://www.gnome.org/~newren/eg/"
-SRC_URI="https://www.gnome.org/~newren/${MY_PN}/download/${PV}/${MY_PN} -> ${PF}"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-vcs/git-${PV}
-	dev-lang/perl"
-
-src_install() {
-	newbin "${DISTDIR}/${PF}" "${MY_PN}" || die
-}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 8799af3f776b..fe18b8e281fa 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -12,7 +12,7 @@ DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
 EBUILD subversion-1.10.3.ebuild 15403 BLAKE2B 3b64708ed206c09b91ba8c637c0a56f0b29f30992ab215fa4b496362bf86be83137165b1f86843ef06a76db0837e1a5472827714069f8fa9ec225f6b36f0eab7 SHA512 be239cab2cb71159d875c0d7a8e92d0a808b3f570c45586ec1c45e9f10c4f8ff90582d07e3385fee8442cb4562c05f6ae670a4dfb3a895b6f3f7d8bdd4355309
-EBUILD subversion-1.10.4.ebuild 15407 BLAKE2B b707fc18b9207a6c8d56010743e7794a408a26fbc5fb54dbcd2c38d701d6a05ee610dfb0fe9180fe9c2f2bc91a990ae6a56c9f46e7d55c3f09553285c78c6465 SHA512 f957dd67c64bc4c5bddd059ea5ce24efb1d4306846cbdabdc6e9eb35b18faf412457c32eaaa3b826e9ebdfe6d7b54290911fc765a38bfa2249241fee39cd038a
+EBUILD subversion-1.10.4.ebuild 15405 BLAKE2B 604a058d296f4a2ad603914a30a0e1bf06015486a0c63eaf330d77cde13741cdcd9701fa7d898ad5e5a09bbccfeaaa3bedea96df24bdd33c0c796caad1adc388 SHA512 55f05fa4184b05272078562eae5b85c268af4215a88201aa72d9bb21a2815c1f8f963477582df41398f77d4f9e52ee5f764e10dfed7db1cc2eae816938e73510
 EBUILD subversion-1.11.0.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.11.1.ebuild 15400 BLAKE2B 48a0c2c41995eb70c26bb875d0568bfa46987593afd6a0dc0a72c887e91cc668c8b176e1a2fe7dcb572ba51720510fcdbbb71be4fe59eb188b19adec24bffc57 SHA512 21b758cb2e8d5dd0288dd5e15c194991369423e38b4710290825faebdc9371e696a7ced51b702e19cfea70c9c6fd72ec0c321823ea6baf9f65fc0c3d4369e921
 EBUILD subversion-1.9.7-r1.ebuild 15859 BLAKE2B 0e057b982dc5c69823580408b77e3961aed8f57f262034fdbc5ca5df53de038f7cbb4a9a51bffd50406bc386887da3482ea542a614f997ddfd3b27bbea2a85cf SHA512 3de363cf9407f1525cfd30655740966a641f2252d4b0d65ba997252cf699cafa951327d886f181370ebb53cfcaf3cd7d3bbfbdd4e9a8248ea0a332f4b969fe26
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild
index ef55999b2c52..735264320a53 100644
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 85077a075aca..39ee9ab0a296 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -3,10 +3,12 @@ DIST tortoisehg-4.5.3.tar.gz 7929645 BLAKE2B 95b867f372d636ed84eda918a707e24f4b1
 DIST tortoisehg-4.6.1.tar.gz 7947844 BLAKE2B 68d0e8672febb9bfdca763e77cbaff8de79c2de79b61e0096c3ef7370cf9d9287a5fd65fbe3c262e13f185bcf5e384ece5d8365979bc05188e74ccfb49f43543 SHA512 adf5ebfc7a76843b62f66feddfde42c0f915c970a951e037f082ee4a6b393822b023f116dc650d5242838d006dc572235a4089c3805929727435588c24ded480
 DIST tortoisehg-4.7.2.tar.gz 7948303 BLAKE2B 9439b86cfd004aa78fc39941cee005b3fe7fcf3a7a5d5dab4c0e0ac12477338000f07105fd7ee6c67def731f406313280acb6af7d5f1d70c51331d7339b21038 SHA512 d4d3c2bb097d12f69594d25c0029bf347f6aee7e4eb3fdecf3d49f3c679b11112376410a87733bb5e29ffdef2c6837e47f7af18121cb5b14ccef22f27a55ebfe
 DIST tortoisehg-4.8.1.tar.gz 7950273 BLAKE2B 91babad30d7fc34d6115babe86a6cf3a2a8afde73719bfec7220633f7824f953f3b6f6128a0f2956c0cafa568e3b12a4fd92d4a955f3b729c47a375c90ed500f SHA512 6ee1efe504265a7a43cae88d6fe25777ffb9109f4b01056e6248b6df1a0214a6f9eacc3121c458e6e0ea051dc56faf48acb2bda73f6e89fc3f686026fa0528b2
+DIST tortoisehg-4.8.2.tar.gz 8961094 BLAKE2B 3230ccd1f5fbfe44e1a656c5942592023d392816972663030df4d7c604dbea79a757b1695e60c450637d74aa53e0a821fd1e159ee9f1560ea6e48c766fd13dcb SHA512 46357dd982bdb1ecde419b63ae845f60523769e1be8145e883fcd6928008bac63a4c206423e764d4e6723049bd7ebad5fcd8027fa11beea485287fe3e74be566
 EBUILD tortoisehg-4.5.2.ebuild 1954 BLAKE2B 39ba4dcab7e5adc52259be8fde3759374be41a5b222933f12c1fba2214e47827187164fe63342a59767e75d37ccb888deb45c329943698bedb52a39f813c24eb SHA512 cd6906236863be316c45f0208ef174cdaf03a7075d148bf1cb573fc4620f051a81ba764c8852109ed2365da15c8395947d0622feffd0d6831069df0c4634e6bb
 EBUILD tortoisehg-4.5.3.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 EBUILD tortoisehg-4.6.1.ebuild 1956 BLAKE2B d50b774f17318c1cf54b28ad6e4af8df223505ca784679f9ddef11c8a22a1b814f38ee285c6f825745c0076f37bfa3c5104c4b36cb6e138822880418d8a93c52 SHA512 6b6e0868b76709c25461777c13af1c65c14ac6e843aadca60246bf831366395a2b0169caac279a8d7ea48120101550ad3647640759be8d97b89955cb8b72b737
 EBUILD tortoisehg-4.7.2.ebuild 1954 BLAKE2B 1d3c090f6041b99c8029b3550641836b326e85ffb3198501592730ed65fc4106adb76d74297323151595e08d19fbc06cbee07afe67ec8abc0d865a1ae6b92a69 SHA512 6f2f0ed76fb574a7b1edd3ecb0afc45bbef15967d37e3c45db8953e0e71b81eb3705e801564c5e9af882cff9885e7d5b5a94b406f8a698921db678bba22bfe32
 EBUILD tortoisehg-4.8.1.ebuild 1954 BLAKE2B 1e666f788f120557593592b3ce03ba805f4034082777b973caead1afd26be2d9e418dcab62a50f454c49322bbc5a73b31d1c0d783b872bdd849af8a6f1e185bd SHA512 e7f7741d1946ceb29fe0773197b03d5353d3d1b403dfeed1e7a0833be608ce29acda444a367c5bac1e174bd3bc9becae2a174d81ddbe1b472559cb13d534a029
+EBUILD tortoisehg-4.8.2.ebuild 1954 BLAKE2B f9d216665c4096ac29672635363b759f52e17503c0b62d4d208a44c7da31107bc16be3486122ade24a0b3a45e11ad27fe03d0116412364bf38b894da5e5b4237 SHA512 e87da39e030e65be2df13fc830f183b98f6a105d885c991868cc224c40a1a102dc8d75765dff8357b3464dc08b4b3eb131946fa1fdc868d521e00e56e9fd55de
 EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.8.2.ebuild
new file mode 100644
index 000000000000..c13880f7663e
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.8.2.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 )
+
+inherit desktop distutils-r1
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.7 <dev-vcs/mercurial-4.9"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 0ad622368d7c..76f9b322f4c9 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 0d252cc0ff4b..7c134682db5f 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -586,7 +586,53 @@ toolchain-glibc_pkg_setup() {
 	[[ ${EAPI:-0} == [0123] ]] && toolchain-glibc_pkg_pretend
 }
 
-int_to_KV() {
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+tc_glibc_get_KV() {
+	uname -r
+	return $?
+}
+
+tc_glibc_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+tc_glibc_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+tc_glibc_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+tc_glibc_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(tc_glibc_KV_major "$1")
+	local KV_MINOR=$(tc_glibc_KV_minor "$1")
+	local KV_MICRO=$(tc_glibc_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+tc_glibc_int_to_KV() {
 	local version=$1 major minor micro
 	major=$((version / 65536))
 	minor=$(((version % 65536) / 256))
@@ -595,7 +641,7 @@ int_to_KV() {
 }
 
 eend_KV() {
-	[[ $(KV_to_int $1) -ge $(KV_to_int $2) ]]
+	[[ $(tc_glibc_KV_to_int $1) -ge $(tc_glibc_KV_to_int $2) ]]
 	eend $?
 }
 
@@ -610,8 +656,8 @@ check_nptl_support() {
 	just_headers && return
 
 	local run_kv build_kv want_kv
-	run_kv=$(int_to_KV $(get_KV))
-	build_kv=$(int_to_KV $(get_kheader_version))
+	run_kv=$(tc_glibc_get_KV)
+	build_kv=$(tc_glibc_int_to_KV $(get_kheader_version))
 	want_kv=${NPTL_KERN_VER}
 
 	ebegin "Checking gcc for __thread support"
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 41aa3ef43da7..370f0a9c59ab 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -339,6 +339,7 @@ _unpacker() {
 	a=$(find_unpackable_file "${a}")
 
 	# first figure out the decompression method
+	local comp=""
 	case ${m} in
 	*.bz2|*.tbz|*.tbz2)
 		local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)}
@@ -353,11 +354,10 @@ _unpacker() {
 	*.lz)
 		: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)}
 		comp="${UNPACKER_LZIP} -dc" ;;
-	*)	comp="" ;;
 	esac
 
 	# then figure out if there are any archiving aspects
-	arch=""
+	local arch=""
 	case ${m} in
 	*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
 		arch="tar --no-same-owner -xof" ;;
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 12b0e5c3444e..934a30fa0618 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 6eb3f63e63ce..9192d2fae3af 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -7,5 +7,5 @@ DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259
 DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981 SHA512 177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
 EBUILD pysolfc-2.0-r5.ebuild 1447 BLAKE2B 52dbd8f9be1d8946d5b8722ffef214a3f8ba6d15cb4f078be36164f120de1c47f883db8fc55c13526576e8aaafa22b1ab43b1aa1e0c2c1a3d53092be66bad6e4 SHA512 05f48c1db7ea2a2ab19bf30a9cac66289d95af96586d75d481e369391a83f809bd3d008aa9729c1800bbb51a829599b5d6de6d7be543b2c1ed1305a7d7cfd6b5
 EBUILD pysolfc-2.2.0.ebuild 1815 BLAKE2B 77f72a385ad1b7afed250236ede43d92c28af7556b9d7800c0de09accc3ee265df4557bf7202b01571e25dacd58a6be49a8afc0f8b9df7a88aaa41adb49fee8c SHA512 518766c0fcc0cccf849046c8d312cbfcf795d2ae2945838e23c00d553bf8d0c10c4d824c8d7354e35cb3b88859a6e0dc78af55514de92f60d43a617493db1479
-EBUILD pysolfc-2.4.0.ebuild 1815 BLAKE2B 77f72a385ad1b7afed250236ede43d92c28af7556b9d7800c0de09accc3ee265df4557bf7202b01571e25dacd58a6be49a8afc0f8b9df7a88aaa41adb49fee8c SHA512 518766c0fcc0cccf849046c8d312cbfcf795d2ae2945838e23c00d553bf8d0c10c4d824c8d7354e35cb3b88859a6e0dc78af55514de92f60d43a617493db1479
+EBUILD pysolfc-2.4.0-r1.ebuild 1825 BLAKE2B a7488487632615898cda6ee8d460414d4e33d24e6e13562ae7054200a3e04e0b58fe49903364edd6002885bf0e9309ca50524b82226023a13f0fd942d0a1f672 SHA512 be5383e7444a0eb60fe3a07877ea171c4037a0173fcc9f0eddcbce9caa730089434d42673831154f1f732870abf48561b532a300237796dc71eea204dc25bd9f
 MISC metadata.xml 505 BLAKE2B 2ece0bd1f9e531449fc33b4515e89959270d74d6bbf9354a9405ea08cc6c163080a4406c92dd7d158faff445e6d0efd08c48ac52959c3fcc68055560bcf62fc3 SHA512 e7bb917b63c06fd17dd5e863e354ae147bd5aa7ef3f360ec848b3ea20087a092d8b7450cfd7ce1a615a6414d6d618f32b60f299cb5a50f0e852205c3fcf4d136
diff --git a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild b/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..af1ee2777085
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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="tk"
+
+inherit eutils distutils-r1
+
+MY_PN=PySolFC
+
+DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="http://pysolfc.sourceforge.net/"
+SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
+	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+S=${WORKDIR}/${MY_PN}-${P}
+
+DEPEND="dev-python/six"
+RDEPEND="${DEPEND}
+	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
+	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
+	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
+		dev-tcltk/tktable )
+	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-gentoo.patch" #591904
+	"${FILESDIR}/${PN}-locales.patch"
+)
+
+python_prepare_all() {
+	sed -i \
+		-e "/pysol.desktop/d" \
+		-e "s:share/icons:share/pixmaps:" \
+		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	pushd html-src > /dev/null || die "html-src not found"
+	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
+	mv images html/ || die "mv images failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
+
+	if use extra-cardsets; then
+		insinto /usr/share/${PN}
+		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
+	fi
+
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
+
+	doman docs/*.6
+	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
+	HTML_DOCS=( html-src/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/games-board/pysolfc/pysolfc-2.4.0.ebuild b/games-board/pysolfc/pysolfc-2.4.0.ebuild
deleted file mode 100644
index 874ce3fcf38b..000000000000
--- a/games-board/pysolfc/pysolfc-2.4.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="tk"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${P}
-
-DEPEND=""
-RDEPEND="${RDEPEND}
-	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
-	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-	"${FILESDIR}/${PN}-locales.patch"
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	pushd html-src > /dev/null || die "html-src not found"
-	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
-	mv images html/ || die "mv images failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
-	fi
-
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c0e94efa925e..63d34e721886 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 279d284a9a53..869fe7cd20cf 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,6 @@
 AUX mgba-0.6.3-qt511.patch 975 BLAKE2B 3fdafdd9a10cd643fbf29a76baf4e49db50142a2f1b096f8c8b962e38166756016bf663b53dd6cf3a2e33f2f28313d477463d8807d4ecb3139bf7a0943ae0274 SHA512 41e0ea8568d8ffddac2b9020933fd4a21562049b82bfd95bb0ae372702b3312c7ee3f03e03a36fcaec723d999f7820a785a730354825cee1a737d6c2accbfb29
-DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
-DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
 DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233
-EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
-EBUILD mgba-0.6.2.ebuild 2367 BLAKE2B d9b9d7779b6bcdcb82d883a0f1a6156111037603b04e7e417b7808b30f16f9ab6564145d56fc9534f54d591cde9229adc4e3fc47a34ec7ef41b4b01eb2783ec6 SHA512 97daec41ddf7d211c8ffcca2f6c5f53e7adf44cc02d7f7d35717a7fdb1c2d7d3f448f7df194386b0c168f6d63cbf85443eccddcdcda52d9d6b2384c5af3b56cb
-EBUILD mgba-0.6.3.ebuild 2470 BLAKE2B a00e6509643d0eed1ea8b213f3503791477b55c059085a9ab314f374e1a6c24ddfa1dc313b331fa9779659f76aab8458c22b6b83a5455c2d4d5824c64434a379 SHA512 66ab4004d8d4a22874030438c1bf1b9a02fe95be18f9bbf668cdd3cd111ad335641e2812d2e85485f9cd701f7e7702b3295ed79a7e99342af794697429139e31
-MISC metadata.xml 339 BLAKE2B e8edd01de74aa69c33c51ca095668dd89c74b83bd0c1597baf75f34b839cba3e74a2723b96acad0aef00b7a84628d54f70526f336a2d9880c32403cca153ca1d SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03
+DIST mgba-0.7.0.tar.gz 10767992 BLAKE2B 75ffd02443f95eba2f82a0f6d2171263bfc7fa3c2c57d246e852964ed52a9cd3c6fc08d39ad349fd6b9cef189feb25d1d9efdcc4b000d07a96d0cf4cbd5cb34f SHA512 68eac18f6e411c60ef6c6dded0f2b293cb4831c4c6f15c4cf3bb7f8dc6a5de65000d7d904ff5bec52aef8714fae3a77d7ed7b43cbccba528cc05b56546802010
+EBUILD mgba-0.6.3.ebuild 2465 BLAKE2B 257defb779b5ce3a166ea07bbcfe4b44c53093009dc135af27d2d6a80e88ff7c51edc6e4442be491ba52c9606fd6abd53037d2693b0fcf86dce808e32c830b4b SHA512 5c610cc8db0c57f8ee670c547879134ee8c4dce86c4c6c325e5af5aba2f5176b41ec470b0dc94eb568d9b0cb8d6a961e0e032172ad22d1832a5e0ac85e94953a
+EBUILD mgba-0.7.0.ebuild 2464 BLAKE2B 0916ca523a783aa776a08dbdbea01ac5b52e61add7cd46c90aaf873d88fc1313f5a720801bb57d5e40b37edbe595e503a4f68ade4f33c78d59ff12009d6edd12 SHA512 66d2bec94b835cfda764fdb0df1ab3c4d6d62619d8f95999b20ff8c9b1558b87b453765f25840840932c7a7c86521577061e460228ab7c725752ee462f8ecef0
+MISC metadata.xml 445 BLAKE2B f8083e3c7dbf76e1f8e848e5d46c81acd0178c9ee5fd20ad01b6a0f82c203b19ff0682b3808dbaa943d38bef8b3f7c73a959d0976cdaf9b5135d1cece9f9a04e SHA512 18666c378ed81e5b4b8d0c7764fe3bcd25be4251449dc7890eb99194e17591755dc67eb12f1260a375008a75508b57ee57b187c668a8d595a20829ac315e633a
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
index e4c99df19a2a..ef2909f744e8 100644
--- a/games-emulation/mgba/metadata.xml
+++ b/games-emulation/mgba/metadata.xml
@@ -5,6 +5,9 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <use>
+    <flag name="elf">Enable the use of elf utils via <pkg>dev-libs/elfutils</pkg></flag>
+  </use>
   <upstream>
     <remote-id type="github">mgba-emu/mgba</remote-id>
   </upstream>
diff --git a/games-emulation/mgba/mgba-0.6.1.ebuild b/games-emulation/mgba/mgba-0.6.1.ebuild
deleted file mode 100644
index 9bd4dc4f28c0..000000000000
--- a/games-emulation/mgba/mgba-0.6.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A new Game Boy Advance emulator written in C."
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r "${S}"/src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES=OFF
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.0)
-		-DUSE_SQLITE3=ON
-		-DUSE_ZLIB=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		for size in 16 24 32 48 64 96 128 256; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		dobin ../${P}_build/qt/${PN}-qt
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.6.2.ebuild b/games-emulation/mgba/mgba-0.6.2.ebuild
deleted file mode 100644
index bae8265e6962..000000000000
--- a/games-emulation/mgba/mgba-0.6.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r "${S}"/src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES=OFF
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.0)
-		-DUSE_SQLITE3=ON
-		-DUSE_ZLIB=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
index c4859e9bec53..fa5245675b20 100644
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ b/games-emulation/mgba/mgba-0.6.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ffmpeg imagemagick libav opengl qt5 +sdl"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
diff --git a/games-emulation/mgba/mgba-0.7.0.ebuild b/games-emulation/mgba/mgba-0.7.0.ebuild
new file mode 100644
index 000000000000..2c61ea8ae6af
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.7.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="Game Boy Advance emulator written in C"
+HOMEPAGE="https://mgba.io"
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite"
+REQUIRED_USE="|| ( qt5 sdl )
+		qt5? ( opengl )"
+
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib[minizip]
+	elf? ( dev-libs/elfutils )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Get rid of any bundled stuff we don't want
+	for pkg in libpng lzma sqlite3 zlib ; do
+		rm -r src/third-party/${pkg} || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_GL="$(usex opengl)"
+		-DBUILD_PYTHON=OFF
+		-DBUILD_QT="$(usex qt5)"
+		-DBUILD_SDL="$(usex sdl)"
+		-DBUILD_SHARED=ON
+		# test suite fails to build (>=0.6.0)
+		-DBUILD_SUITE=OFF
+		-DBUILD_TEST=OFF
+		-DM_CORE_GB=ON
+		-DM_CORE_GBA=ON
+		-DUSE_DEBUGGERS="$(usex debug)"
+		-DUSE_EDITLINE="$(usex debug)"
+		-DUSE_ELF="$(usex elf)"
+		-DUSE_EPOXY=OFF
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_GDB_STUB="$(usex debug)"
+		-DUSE_LIBZIP=OFF
+		-DUSE_LZMA=OFF
+		-DUSE_MAGICK="$(usex imagemagick)"
+		-DUSE_MINIZIP=ON
+		-DUSE_PNG=ON
+		-DUSE_SQLITE3="$(usex sqlite)"
+		-DUSE_ZLIB=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use qt5 ; then
+		dobin ../${P}_build/qt/${PN}-qt
+		doman doc/${PN}-qt.6
+		domenu res/${PN}-qt.desktop
+		for size in 16 24 32 48 64 96 128 256; do
+			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
+		done
+	fi
+	if use sdl ; then
+		doman doc/${PN}.6
+		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+	fi
+
+	dolib.so ../${P}_build/lib${PN}.so*
+}
+
+pkg_preinst() {
+	if use qt5 ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use qt5 ; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5 ; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index d2ba57dc0235..2a87149de4a8 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index e23f80dd6ecf..6657fba2f409 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -8,6 +8,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20181010-7067.tar.xz 14710088 BLAKE2B 7b2ed7d1c8b81b1b53699d1cb6898525896a534577ac79827b508da33e334dfab3b390323b051a53139c0860ab3ff3b1965015316a81a340d406e66d1d5242ec SHA512 f858d39947dd1f07363c003cefa0289f78f8c37a95019b13e8657769a1bd814399a5b137b0b601aa1330055ebae017dd1bf06db7ec2bb647121628d5187a55dd
-EBUILD eduke32-20181010.7067.ebuild 5920 BLAKE2B fdb0f2dac48024488735f9c699a081e574dadef8b7747049cc6dd661e190fd17521ad020f57c3113fe1de97ee4d1e82b4d5be9f7c2f3e334a160917bded42150 SHA512 5191e9a577cdb9889139fcdfb6482d1f4505eca885a6a406914fc64803ad3224df08aed73331b520beed51f85949a29b29cfe7b19039ee7cdffa6ff2f12cb83a
+DIST eduke32_src_20190123-7318.tar.xz 14728924 BLAKE2B 3b6bddd12675029c3a92d1de58421ee48ac5537104bf990d9e3e10c8e3e22264eb433a61ab79ed472c85304f59904fb5fe2a2c3df765106f96734432e41daf74 SHA512 c6b275a8a0b611f6c42f3fa63959e9b717a25b45a86bb8f385873d6d6d1833893c0a2e16993c955d73c3e44887845c192d1f93b5649bd78ce07760f801e48914
+EBUILD eduke32-20190123.7318.ebuild 5920 BLAKE2B 00a79d1be248ea9a576e167dd645d04bd9c739e41734e1b8e836d29cc1bc3f8020900d6279db73ef0ff27ec9b37be834a922febba1b77158f76ea292af1dcf54 SHA512 785b4cdd06fac0c79e0c1d82ad06b40f5cc5da878e62aedf3e41ff0d5cacadfae0bc56340401b7baab0534da6f5a7178991e2b0ac86faea2b03279c1cf9950c6
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20181010.7067.ebuild b/games-fps/eduke32/eduke32-20181010.7067.ebuild
deleted file mode 100644
index 07b68e2de18b..000000000000
--- a/games-fps/eduke32/eduke32-20181010.7067.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop eapi7-ver gnome2-utils toolchain-funcs
-
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
-	http://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )"
-
-KEYWORDS="~amd64 ~hppa ~x86"
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
-REQUIRED_USE="cdinstall? ( !demo )
-	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall )
-		!voxels )
-	offensive? ( ^^ ( demo cdinstall ) )
-	opl? ( ^^ ( demo cdinstall )
-		!sc-55 )
-	psx? ( ^^ ( demo cdinstall ) )
-	sc-55? ( ^^ ( demo cdinstall )
-		!opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )"
-
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
-
-MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X]
-	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
-	sys-libs/zlib:=
-	flac? ( media-libs/flac )
-		gtk? ( x11-libs/gtk+:2 )
-	opengl? ( virtual/glu
-		virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	timidity? ( media-sound/timidity-freepats )
-	vpx? ( media-libs/libvpx:= )
-	vorbis? ( media-libs/libogg
-		media-libs/libvorbis )
-	xmp? ( media-libs/exempi:= )"
-
-RDEPEND="${MY_DEPEND_RDEPEND}
-	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )"
-
-DEPEND="${MY_DEPEND_RDEPEND}
-	app-arch/unzip
-	x86? ( dev-lang/nasm )"
-
-PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS=$(tc-getAS)
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=$(usex flac 1 0)
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_VORBIS=$(usex vorbis 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	if use tools; then
-		emake utils "${myemakeopts[@]}"
-	fi
-}
-
-src_test() {
-	# There are no tests
-	# Instead it tries to build a test game, which does not compile
-	:;
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-	if use hrp; then
-		doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	fi
-	if use offensive; then
-		doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	fi
-	if use opl; then
-		doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	fi
-	if use psx; then
-		doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	fi
-	if use sc-55; then
-		doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	fi
-	if use sdk; then
-		doins -r package/sdk
-	fi
-	if use voxels; then
-		doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-	fi
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
-	if use hrp; then
-		DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	fi
-	if use offensive; then
-		DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	fi
-	if use opl; then
-		DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	fi
-	if use sc-55; then
-		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	fi
-	if use voxels; then
-		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-	fi
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20190123.7318.ebuild b/games-fps/eduke32/eduke32-20190123.7318.ebuild
new file mode 100644
index 000000000000..70135dd19c0d
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20190123.7318.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver gnome2-utils toolchain-funcs
+
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+	http://www.eduke32.com/images/eduke32_classic.png
+	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )"
+
+KEYWORDS="~amd64 ~hppa ~x86"
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
+REQUIRED_USE="cdinstall? ( !demo )
+	demo? ( !cdinstall )
+	hrp? ( ^^ ( demo cdinstall )
+		!voxels )
+	offensive? ( ^^ ( demo cdinstall ) )
+	opl? ( ^^ ( demo cdinstall )
+		!sc-55 )
+	psx? ( ^^ ( demo cdinstall ) )
+	sc-55? ( ^^ ( demo cdinstall )
+		!opl )
+	voxels? ( !hrp )
+	vpx? ( opengl )"
+
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
+
+MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X]
+	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
+	sys-libs/zlib:=
+	flac? ( media-libs/flac )
+		gtk? ( x11-libs/gtk+:2 )
+	opengl? ( virtual/glu
+		virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	timidity? ( media-sound/timidity-freepats )
+	vpx? ( media-libs/libvpx:= )
+	vorbis? ( media-libs/libogg
+		media-libs/libvorbis )
+	xmp? ( media-libs/exempi:= )"
+
+RDEPEND="${MY_DEPEND_RDEPEND}
+	cdinstall? ( games-fps/duke3d-data )
+	demo? ( games-fps/duke3d-demodata )"
+
+DEPEND="${MY_DEPEND_RDEPEND}
+	app-arch/unzip
+	x86? ( dev-lang/nasm )"
+
+PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
+
+src_unpack() {
+	# Extract only the eduke32 archive
+	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+
+	# Unpack only the documentation
+	if use hrp; then
+		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+	fi
+	if use offensive; then
+		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+	fi
+	if use opl; then
+		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+		mv readme.txt opl_readme.txt || die
+	fi
+	if use sc-55; then
+		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		ALLOCACHE_AS_MALLOC=0
+		AS=$(tc-getAS)
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+		CLANG=0
+		CPLUSPLUS=1
+		CUSTOMOPT=""
+		DEBUGANYWAY=0
+		F_JUMP_TABLES=""
+		FORCEDEBUG=0
+		HAVE_FLAC=$(usex flac 1 0)
+		HAVE_GTK2=$(usex gtk 1 0)
+		HAVE_VORBIS=$(usex vorbis 1 0)
+		HAVE_XMP=$(usex xmp 1 0)
+		LINKED_GTK=$(usex gtk 1 0)
+		LTO=1
+		LUNATIC=0
+		KRANDDEBUG=0
+		MEMMAP=0
+		MIXERTYPE=SDL
+		NETCODE=$(usex server 1 0)
+		NOASM=0
+		OPTLEVEL=0
+		OPTOPT=""
+		PACKAGE_REPOSITORY=1
+		POLYMER=$(usex opengl 1 0)
+		PRETTY_OUTPUT=0
+		PROFILER=0
+		RELEASE=1
+		RENDERTYPE=SDL
+		SDL_TARGET=2
+		SIMPLE_MENU=0
+		STRIP=""
+		TANDALONE=0
+		STARTUP_WINDOW=$(usex gtk 1 0)
+		USE_OPENGL=$(usex opengl 1 0)
+		USE_LIBVPX=$(usex vpx 1 0)
+		USE_LIBPNG=$(usex png 1 0)
+		USE_LUAJIT_2_1=0
+		WITHOUT_GTK=$(usex gtk 0 1)
+	)
+
+	emake "${myemakeopts[@]}"
+
+	if use tools; then
+		emake utils "${myemakeopts[@]}"
+	fi
+}
+
+src_test() {
+	# There are no tests
+	# Instead it tries to build a test game, which does not compile
+	:;
+}
+
+src_install() {
+	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+
+	if use tools; then
+		local tools=(
+			arttool
+			bsuite
+			cacheinfo
+			generateicon
+			givedepth
+			ivfrate
+			kextract
+			kgroup
+			kmd2tool
+			makesdlkeytrans
+			map2stl
+			md2tool
+			mkpalette
+			transpal
+			unpackssi
+			wad2art
+			wad2map
+		)
+
+		dobin "${tools[@]}"
+	fi
+
+	keepdir /usr/share/games/eduke32
+	insinto /usr/share/games/eduke32
+	if use hrp; then
+		doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+	fi
+	if use offensive; then
+		doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+	fi
+	if use opl; then
+		doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+	fi
+	if use psx; then
+		doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+	fi
+	if use sc-55; then
+		doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+	fi
+	if use sdk; then
+		doins -r package/sdk
+	fi
+	if use voxels; then
+		doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+	fi
+
+	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+	make_desktop_entry mapster32 Mapster32 eduke32 Game
+
+	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
+	if use hrp; then
+		DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+	fi
+	if use offensive; then
+		DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+	fi
+	if use opl; then
+		DOCS+=( "${WORKDIR}"/opl_readme.txt )
+	fi
+	if use sc-55; then
+		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+	fi
+	if use voxels; then
+		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+	fi
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index beb3c5012c8f..44c7740f1978 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 4ffa85817d81..4bdf88989aac 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,3 +1,3 @@
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 768 BLAKE2B d75705caf4a4cb9c4b9566b477d7b5c931a474a4774b3e52683a58e1623dcc24b4ecb7595ca72847f98d61c830f872661a02474f6e5b0d7683c25de99fcb258a SHA512 c164cb3178e74ab186ba0b0b7989b138ae9c6cff22ae0d331a2c8a19a36ed364c7e2b8d43d5b338b82e82178722111ee3c22fe5ef77c2889d271bfb65c3eb204
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 773 BLAKE2B 0e1ae32f96f19282f026d4247c1dc95000525836c0d8528d1ee275ae5bbe4511cf2f23fdf693a56480e83ad22f620d03c8f24bd9a8d0b236f5bd976f404c5892 SHA512 e8b192cb63c0a765b79c14db77b6fe7d205dfacb78875ef3038d8eea5a54c180bb6db3e6c8664c20960f7aea38b39df2b968003abd56ef2f4273e7c78df08e23
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index 06acddbb33f8..360de4ab49b5 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.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://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 ~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-extra/Manifest.gz b/gnome-extra/Manifest.gz
index e17714decf51..1963a8192d65 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index a371d260479c..91c6a470881c 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,3 +1,5 @@
+AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
+EBUILD gtkhtml-4.10.0-r1.ebuild 1067 BLAKE2B 1e59a8ba2d63b5822fbf90974509c9df8866844932ed9596a39046a8b602f468a54047718f332c68222a5f15480d24da7ee05122d060e67c9404bb6fc378e43c SHA512 b2b1b61dbf4590b2405389973cd6f5ae26a8357c511e5a8f0f2b988f1302dd8277593ee3371422a866e347623e5a1232013074582f189eeea2d6dabe2a1362c8
 EBUILD gtkhtml-4.10.0.ebuild 988 BLAKE2B 9c380fa816424cf6f7e238664856cd77bd16bfe964ea47c6702b526d8aecaac546d5c76f471b322703e474a95c545c3d4b237db70b598e6ec143ff6067d6972e SHA512 2e0d36666c93de5f672c8218490220e063675eb0310dec0b26f64223913f36ed904e9e09ca292cdd9f7fc519e18986c28813e2f022ea474e1c73b4c533648c75
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/files/enchant-2.patch b/gnome-extra/gtkhtml/files/enchant-2.patch
new file mode 100644
index 000000000000..c1afe677c666
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/enchant-2.patch
@@ -0,0 +1,35 @@
+diff --git a/components/editor/gtkhtml-spell-checker.c b/components/editor/gtkhtml-spell-checker.c
+index 0927f57..89e9873 100644
+--- a/components/editor/gtkhtml-spell-checker.c
++++ b/components/editor/gtkhtml-spell-checker.c
+@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlSpellChecker *checker,
+ 	if ((dict = spell_checker_request_dict (checker)) == NULL)
+ 		return;
+ 
+-	enchant_dict_add_to_pwl (dict, word, length);
++	enchant_dict_add (dict, word, length);
+ 	g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length);
+ }
+ 
+diff --git a/configure.ac b/configure.ac
+index e4946aa..e5771e3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ PACKAGE=gtkhtml
+ 
+ dnl Required Package Versions
+ m4_define([gtk_minimum_version], [3.2.0])
+-m4_define([enchant_minimum_version], [1.1.7])
++m4_define([enchant_minimum_version], [2.0.0])
+ m4_define([cairo_minimum_version], [1.10.0])
+ 
+ GTKHTML_API_VERSION=4.0
+@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES)
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
+-GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
++GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..22fe176d121f
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools gnome2
+
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND="
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/cairo-1.10:=
+	x11-libs/pango
+	>=app-text/enchant-2.0.0
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sys-devel/gettext
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	 "${FILESDIR}"/enchant-2.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 68ae880ef1f9..50c092e945e1 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index dd2f8b1234cb..e81e3bceefc7 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -2,5 +2,5 @@ AUX kalzium-18.12.1-deps.patch 2589 BLAKE2B 4ad2efb6ed0db05c82faf6f6851e8ef1fe54
 DIST kalzium-18.08.3.tar.xz 24377636 BLAKE2B 094167e7014afe89a17d2be3331e546c2079793b3a76e3262f5f390a13e9c0bbfdde094bcbde0b61e95b28582f76d7bc870709968d5ac1c9846151474d27fa5c SHA512 844fccca678b7909675cee73a76dc0b38e901b3dbae42884fe803f773bdf678b2aa9957caebb9aac50ddc58e177169e284de9303ad40886f16f5c51c72347d32
 DIST kalzium-18.12.1.tar.xz 26573788 BLAKE2B 567441e1e397ea25246157db11a31a4b148ae280bdf5afde2ad9f04f85c333dd5f6f08815c50babbf66466db0e6e9787abe846ae21562b6bc46ed6fbe5b2d05b SHA512 6f9e7c16e64b8c690200440e80be8f036ef6254c9e367cf1fc369250c47bebec47b7918d1fdd1194efbda65685ac03f2e3191c7f6d6380aa678b197dc28d6b97
 EBUILD kalzium-18.08.3.ebuild 1585 BLAKE2B ad0493cd738cf48edae09e0937014782aff796d1c0449df3b7276f9cb2573ebdfaf0e154906a054a4a8efb65762acff2a17723332de474f54133c9fa77f5f53d SHA512 efda0462b109b2f01402351d2c0b84366e834f7515099cf61e841f791b3e21a16877948d28f249493e53ffb8587bf9b7b0e612ebd0487333c08a52e879dffdfc
-EBUILD kalzium-18.12.1-r1.ebuild 1631 BLAKE2B c16de2ce1b9d9f29b5d99712fb0d49391c3d61cae24e5e6b584a01ddb1bf996023b588ab2bd28a95343455e7d8f14332e96a6f19b449ea57cd45cbfca9337f3f SHA512 ee1456a8f3eec26bd1a86f7242f79674050374efe22d4f22e9660b4dd4512e83a8f6401c678773fe10a23c8bbffdb0abc0d2d3ebd4256afc49163d5a182f9434
+EBUILD kalzium-18.12.1-r2.ebuild 1636 BLAKE2B f0f52a64e2f478de0007dd3827f8c51e20c939c7ffc5f57ce97f90868620fe2688d44cdec58c4bec27ff5ef7643d8564d7fa4859432a708af11640284f7902b3 SHA512 80131abb2d00b79f36189474e36214a122048d0403dc7713323140aa6a80dc02d5eb9f1ef3a81b137c87823359364d2e2a29b84df70485c6c7e5ca8f9945735e
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild b/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
deleted file mode 100644
index aac0fcfa4ccc..000000000000
--- a/kde-apps/kalzium/kalzium-18.12.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		$(add_qt_dep qtopengl)
-		$(add_frameworks_dep knewstuff)
-		dev-cpp/eigen:3
-		sci-chemistry/openbabel
-		sci-libs/avogadrolibs
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
-
-src_configure() {
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalzium/kalzium-18.12.1-r2.ebuild b/kde-apps/kalzium/kalzium-18.12.1-r2.ebuild
new file mode 100644
index 000000000000..e79d64eb294c
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.12.1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		$(add_qt_dep qtopengl)
+		$(add_frameworks_dep knewstuff)
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		sci-libs/avogadrolibs[qt5]
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+src_configure() {
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 12bb56eb1bd8..826a6d7d990a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 46bb3fe2b6de..3e58f8653129 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,7 @@
+AUX ktexteditor-5.54.0-allow-change-marker-size.patch 2381 BLAKE2B 527cce76a6386196c5ac5558be893418886e1ac051a25e7fd091f90aa13031ac7687edf49b1cbbc31ba415773f82053af68ef15cfcdf2a7565aa3c5248372d7c SHA512 a1b6a72ad99ec246fbf2d74e57e8537f44b5e4adc197bde5060a6c8b29da295d198483f93a326720efbf3e0940a627da5c1d5e164469cc905fc081f642a5db90
 DIST ktexteditor-5.52.0.tar.xz 2251064 BLAKE2B f605b3fbcdaacb131587f1b8f4f9f9ece10c0a7fa55413ea210eacc5b28e2787461a5892524b383b4f4ae1c71a1dd1939d488d3d41b099e3157398ec180d480d SHA512 98442415124e4202d13ec99e84f9ff260bff959efdd7703555eecb74594c93125e83180fbb5527d216d5ef57da60055e89b48f331ddf0e2024f7686c78c6b7f0
 DIST ktexteditor-5.54.0.tar.xz 2264380 BLAKE2B 576176595c80b79f4bbe58e17304c7a9168be2723f01e7f1c51f67970bea9a9169084b074e754957c2e77c134df837226e85ff3b3a0a149005240520595de116 SHA512 8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500
 EBUILD ktexteditor-5.52.0.ebuild 1393 BLAKE2B 3c7fcd8fb2c151ffb9e3318ca158c2e49fffa87649001a5414bcde06e99f20a3af2c094568014d90696365ee6d82370234f69b683dbc7ef4c87a8a7c010adfba SHA512 3ff4074be64290ad4062723033b5174b3cf828d6c52580339fa123712e93b9bf5ddf448e28261cf6bda053770e8c071281c4d7fb3fd90bcd1df23d63c72d6333
+EBUILD ktexteditor-5.54.0-r1.ebuild 1458 BLAKE2B 987740c0160f99e310380f5dcc71dc8676d92eec8bd178f93d2b5db8581165edd775b67b93c6fded7c133c9434f1d8c5a22c07245d49ef6fd12e8bfe80c154f8 SHA512 42dac6270887b9a9a85fc405dc27a658512fbb428cf3d2e7c87a435290620988083f30a139546b744da8cd3ac8cc6aa6295f19caeddfdbca3c7226c7a9f97b8e
 EBUILD ktexteditor-5.54.0.ebuild 1395 BLAKE2B 5312d70dfa9ff4807aea72342db176460b9b622082808a6bff3ff372aad8d2c8a3b58daa3a78b71d847a69b2d774ad6fdd40d3c34c865bf27571fd92c371e473 SHA512 50f3b031102a7d59a1a5d0f8914b8bb1bf3bfbe758eb4865c7adf63f0006fc0dec00be009b6e54f7ade014348aeaf67ad4d3565a0defc96ff0778a0fb2e31eff
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
new file mode 100644
index 000000000000..032fbc99367e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
@@ -0,0 +1,78 @@
+From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Wed, 30 Jan 2019 17:16:32 +0100
+Subject: Fix bug 403422: Allow changing the marker size again
+
+This bug was introduced with https://phabricator.kde.org/D17661
+with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8
+
+FIXED-IN: 5.55
+BUG: 403422
+---
+ src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui
+index 02a0d54..cc44a39 100644
+--- a/src/dialogs/textareaappearanceconfigwidget.ui
++++ b/src/dialogs/textareaappearanceconfigwidget.ui
+@@ -185,10 +185,10 @@
+             <string>Size of the visible highlight marker.</string>
+            </property>
+            <property name="minimum">
+-            <number>-1</number>
++            <number>1</number>
+            </property>
+            <property name="maximum">
+-            <number>-1</number>
++            <number>5</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+@@ -301,6 +301,21 @@ beginning of a file.</string>
+    <header>kcombobox.h</header>
+   </customwidget>
+  </customwidgets>
++ <tabstops>
++  <tabstop>gbWordWrap</tabstop>
++  <tabstop>chkDynWrapAtStaticMarker</tabstop>
++  <tabstop>cmbDynamicWordWrapIndicator</tabstop>
++  <tabstop>sbDynamicWordWrapDepth</tabstop>
++  <tabstop>chkShowTabs</tabstop>
++  <tabstop>chkShowSpaces</tabstop>
++  <tabstop>sliSetMarkerSize</tabstop>
++  <tabstop>chkShowIndentationLines</tabstop>
++  <tabstop>chkShowWholeBracketExpression</tabstop>
++  <tabstop>chkAnimateBracketMatching</tabstop>
++  <tabstop>chkFoldFirstLine</tabstop>
++  <tabstop>chkShowWordCount</tabstop>
++  <tabstop>chkShowLineCount</tabstop>
++ </tabstops>
+  <resources/>
+  <connections>
+   <connection>
+@@ -314,8 +329,8 @@ beginning of a file.</string>
+      <y>7</y>
+     </hint>
+     <hint type="destinationlabel">
+-     <x>340</x>
+-     <y>44</y>
++     <x>559</x>
++     <y>117</y>
+     </hint>
+    </hints>
+   </connection>
+@@ -330,8 +345,8 @@ beginning of a file.</string>
+      <y>6</y>
+     </hint>
+     <hint type="destinationlabel">
+-     <x>385</x>
+-     <y>72</y>
++     <x>559</x>
++     <y>162</y>
+     </hint>
+    </hints>
+   </connection>
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..72fcd5e12613
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 0bda9322a14b..d68c798ec9b1 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,7 @@
+AUX kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch 2896 BLAKE2B 0e19645ee2543003f1e6d6f68461695451e37986abc3f68fc518c69622fed24232461f2cf8ddbae6f84e3112619482f340e0e0addc863448ad3d65f8810cede3 SHA512 3e33aca5dddbdefee8d048d1413955eeaf93137192ddabb21f933c7971ad919beaa3ebc6dc00c11fa47cac19de9a552ce097f2cf308796c2ade7b2329a4984aa
 DIST kwidgetsaddons-5.52.0.tar.xz 2185380 BLAKE2B 6307774cc9d6c41d45b9c5fc97a2c72d52065970dee54f6871df49f5f8ce9ffcb62277eef031466ed7ced83ad6941de61f424d03affff00111dcbada24a7ceb0 SHA512 86f2f32ab3071358c6d2887fcf0105a3d84d60e2e58898a48857776cc42e0a2c45d53d786879449fed79fd86dd58b2a9ae2053b7b254fb3590222e915e533cd3
 DIST kwidgetsaddons-5.54.0.tar.xz 2187048 BLAKE2B fba80432f00154ed4811d70b693d13d3dfee5c5dcebd3a3c8b3403ed5119e0289f10efdb8579be302ae2c2b6bb17853f20ac4c337fe78dbe042ee2cace00f8a4 SHA512 e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8
 EBUILD kwidgetsaddons-5.52.0.ebuild 522 BLAKE2B 0875eb8feea99bfe3e18fc121d3fa3b457ef62351959926c50cd16cf0f9629087c89e7940f56e6c1ed4d446d66db434b37797c76a2992994bd34c81157d0c579 SHA512 d1abbc7350ed8ed8523e14f758bb714d88b83b84d56aa552e02c123c611a9d5a65149420442b80240513dcb9118bc903140eb2179ff884a659bc967dba71710e
+EBUILD kwidgetsaddons-5.54.0-r1.ebuild 590 BLAKE2B 61547b76e1be127fb6a1182d506364e0516c9db02065ebb988eb3ebdf7041ec05fe8561b318fbbbc70c09451eeea2f166665da598f721f8a01395d3b1758af5f SHA512 9a57345c5d58b0bbdf11e227bfe04fd25cc26e42ed1a0875f6da29292a7f5db15434710bb53f71333560c6fa26c8f02ad2390866d1d5b2b0e2d4e034271e6f5d
 EBUILD kwidgetsaddons-5.54.0.ebuild 524 BLAKE2B 84db784a57f04cbd14d04a502ac416314dfa8e42996e2c111d0ab450cda4c00bd5c2be770f3413733b8b15c556bafb2167922f8df03ed171fbaff8628c5525f8 SHA512 2036f8a1d36b67a09e1b882cf34ec3fb4e2a46a5eff3d6588adcd2d37c9bdf2d2dae548109d417fbbe4017d7ba93f2ab9c9d004eba1ff32cc4c8ae8173f49ba6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
new file mode 100644
index 000000000000..38c89728b52e
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch
@@ -0,0 +1,88 @@
+From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
+Date: Thu, 10 Jan 2019 09:19:33 -0700
+Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3)
+
+Summary:
+This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility.
+
+CCBUG: 402730
+
+FIXED-IN: 5.54
+
+Test Plan:
+Before:
+{F6520054}
+After:
+{F6520058}
+
+Reviewers: ngraham, #frameworks, #vdg, #plasma
+
+Reviewed By: ngraham, #vdg
+
+Subscribers: cfeck, filipf, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17907
+---
+ src/ktitlewidget.cpp | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp
+index 7a34bc2..d8b0517 100644
+--- a/src/ktitlewidget.cpp
++++ b/src/ktitlewidget.cpp
+@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e)
+     if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange
+                                            || e->type() == QEvent::ApplicationFontChange) {
+         d->textLabel->setStyleSheet(d->textStyleSheet());
+-        //Qt stylesheet doesn't support lighter font-weight
+-        QFont font(d->textLabel->font());
+-        if (d->level <= 4) {
+-            font.setWeight(QFont::Light);
+-            font.setStyleName(QStringLiteral("Light"));
+-        } else {
+-            font.setWeight(QFont::Normal);
+-            font.setStyleName(QStringLiteral("Regular"));
+-        }
+-        d->textLabel->setFont(font);
+         d->commentLabel->setStyleSheet(d->commentStyleSheet());
+     }
+ }
+@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment)
+ 
+     if (!Qt::mightBeRichText(text)) {
+         d->textLabel->setStyleSheet(d->textStyleSheet());
+-        //Qt stylesheet doesn't support lighter font-weight
+-        QFont font(d->textLabel->font());
+-        if (d->level <= 4) {
+-            font.setWeight(QFont::Light);
+-            font.setStyleName(QStringLiteral("Light"));
+-        } else {
+-            font.setWeight(QFont::Normal);
+-            font.setStyleName(QStringLiteral("Regular"));
+-        }
+-        d->textLabel->setFont(font);
+     }
+ 
+     d->textLabel->setText(text);
+@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level)
+     d->level = level;
+ 
+     d->textLabel->setStyleSheet(d->textStyleSheet());
+-    //Qt stylesheet doesn't support lighter font-weight
+-    QFont font(d->textLabel->font());
+-    if (d->level <= 4) {
+-        font.setWeight(QFont::Light);
+-        font.setStyleName(QStringLiteral("Light"));
+-    } else {
+-        font.setWeight(QFont::Normal);
+-        font.setStyleName(QStringLiteral("Regular"));
+-    }
+ }
+ 
+ int KTitleWidget::level()
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..274e1794131f
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" )
+
+src_test() {
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 2073a8318c2c..dc59703677cd 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
+AUX kxmlgui-5.54.0-kcheckaccelerators.patch 2830 BLAKE2B 0b2efb47f00c14da7b2e4cde06129f6c3d39aa7232908521458b5e09aaa3564c7ed8bae5ba383f587db27f154d7685e918318ed8db2145fa3f3634483503f562 SHA512 5f960842be0f2d4a5fbac8f08af49ce8c1247b152b96feecbfdfface3039a38dbf17bf4f0f584ff6956d842e9bfdb9884db7651a636c01bb872b279ed2dd5222
 DIST kxmlgui-5.52.0.tar.xz 868824 BLAKE2B b83639a9e5fb7fc3f841f943636f51860350b4f9e45864b60835a44e6a61412149a9702db70abd30a33af439a0e13f09a4cbbdab094875543d906042fd41cb0c SHA512 cad39799e4649a6607ba6f10928c02e68d6e7c9420b4f401fcb55fa10a7b74a2304ba226680fb50fa674207b10e9dec0fcba7233e74e514c7dbac5df4a020f8b
 DIST kxmlgui-5.54.0.tar.xz 869308 BLAKE2B f9f19452444074e2ce78f7a8c902b9703e0532974659ac5a34898debe52cd6dd05752c4923a9d1afe9606e628cb696ff59f0a5b78ad6d13f75c077b9bbde35e9 SHA512 bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5
 EBUILD kxmlgui-5.52.0.ebuild 1221 BLAKE2B acdaccd9ec7f22fda28b1d27ed9821184a1554a28c0e5df772aa9242203bda66edc342defb7cd60b3a2cc1fb07ddbd46c09930eafdc881d230ef2db710e6e453 SHA512 bac10638129d1cff3b7653bb25a4b4f87bbd0ce43e8dd5f192979da6626134b7cbd95ff08d4f0be364f984054e8fe8260d5f986af28df8e040de3324c29f2d75
+EBUILD kxmlgui-5.54.0-r1.ebuild 1280 BLAKE2B 7a3235a3cf0257ff3a17cccda56bc141cb993bbcf13cb9a7f992001076ebe6e9367fac427492312583ed92c587d74103a54c65fe565b9026a7165b7ab58926b3 SHA512 c5afae446c6a321bd1d0a584dfb1840757ff76767c018d951bf0867b0f03f1e761825bbf2d535741b9a6ba3c8df36d7aa3c99c1d0937cc4e7f88cb58240e949a
 EBUILD kxmlgui-5.54.0.ebuild 1223 BLAKE2B 899515fee4a20f349a0b5b635201af4595078c4555ebaa71d3f290907104bb5cd05e288ad757e67a16de151f4b71f5d0019611cdab4712c33261eddd6f8021a1 SHA512 90bc5dce670864cb90373e5110988a406f83c07cda34a9c688bff2e4f1598d3705554ea87debbebd037855582b98f44c0bbd0f984d581cc5caa3db1f96b658e2
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
new file mode 100644
index 000000000000..0882d5f09f9c
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
@@ -0,0 +1,79 @@
+From 02b523bad09aab062355e46771889b0f3709692f Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 12 Jan 2019 18:39:33 +0100
+Subject: Make KCheckAccelerators less invasive for apps that don't directly
+ link to KXmlGui
+
+Summary: BUGS: 337491
+
+Test Plan:
+Ran qtcreator and it no longer has the & in Details
+Added some debug and checked that okular still gets the code called
+
+Reviewers: anthonyfieroni
+
+Reviewed By: anthonyfieroni
+
+Subscribers: davidedmundson, anthonyfieroni, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D18204
+---
+ src/kcheckaccelerators.cpp | 38 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/src/kcheckaccelerators.cpp b/src/kcheckaccelerators.cpp
+index 13fc012..e08447d 100644
+--- a/src/kcheckaccelerators.cpp
++++ b/src/kcheckaccelerators.cpp
+@@ -80,10 +80,44 @@ public Q_SLOTS:
+ 
+ static void startupFunc()
+ {
+-    // Call initiateIfNeeded once we're in the event loop
+-    // This is to prevent using KSharedConfig before main() can set the app name
++    // Static because in some cases this is called multiple times
++    // but if an application had any of the bad cases we always want
++    // to skip the check
++    static bool doCheckAccelerators = true;
++
++    if (!doCheckAccelerators) {
++        return;
++    }
++
+     QCoreApplication *app = QCoreApplication::instance();
++    if (!app) {
++        // We're being loaded by something that doesn't have a QCoreApplication
++        // this would probably crash at some later point since we do use qApp->
++        // quite a lot, so skip the magic
++        doCheckAccelerators = false;
++        return;
++    }
++
++    if (!QCoreApplication::startingUp()) {
++        // If the app has already started, this means we're not being run as part of
++        // qt_call_pre_routines, which most probably means that we're being run as part
++        // of KXmlGui being loaded as part of some plugin of the app, so don't
++        // do any magic
++        doCheckAccelerators = false;
++        return;
++    }
++
++    if (!QCoreApplication::eventDispatcher()) {
++        // We are called with event dispatcher being null when KXmlGui is being loaded
++        // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular)
++        // For apps that don't link directly to KXmlGui do not do the accelerator magic
++        doCheckAccelerators = false;
++        return;
++    }
++
+     KCheckAcceleratorsInitializer *initializer = new KCheckAcceleratorsInitializer(app);
++    // Call initiateIfNeeded once we're in the event loop
++    // This is to prevent using KSharedConfig before main() can set the app name
+     QMetaObject::invokeMethod(initializer, "initiateIfNeeded", Qt::QueuedConnection);
+ }
+ 
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
new file mode 100644
index 000000000000..eac5c3cc9e21
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kcheckaccelerators.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 3768c343c9f1..f615bb9ad576 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 77e583e5a325..2c2fb63b5b16 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,6 +1,3 @@
-AUX basket-2.49a_p20170225-fixes.patch 2428 BLAKE2B 1b1ed57b33d819ac8bde1f4d26b768c69b2414a90363dcbb83ed92378124cf9c46980c3999e6cc8295114f4eb956a298e0a62b9f53e17927d9f2d3657ba32539 SHA512 52aa945f6994fce6c6204ae3893ccc7c656a1c97aeee85062328f7d9f8fdadc354abc0307865b0b2053a1d2da6c95fd1431d9c1e15f699acdd333c16dc1bd27b
-DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
 DIST basket-2.49a_p20181205.tar.gz 4689215 BLAKE2B dce87001622aac8e50957d87d36c9094a807765d96bc60fe450fed0f293e0e21ead7529c57eaecc97c4f56d5bce7fabd34a564f632fc56f0c83621fac4092dee SHA512 62c6a337f634be374ee8631c8b88a78097ae4badd905e6be556f11fa841cc03ab32ab563f59a865d1bc85f105ec273472734c42f1bff834e4d7219c258d82281
-EBUILD basket-2.49a_p20170225-r1.ebuild 1883 BLAKE2B 088fed133e29820d2196311f2887817c9359f2a113191261753d3a4b15989e720579844facde31fe274a8db0662849a2bec66fc11c7091cc8f612a7b168e1bd2 SHA512 e0994d91a49175bcb19f79c60e582b0939656951bf616b18a968e6b93025aba869e4836665a42cc96afc9a5e250233cfad60401e755e82500deb4b964652ee3f
 EBUILD basket-2.49a_p20181205.ebuild 1883 BLAKE2B 14ace1b507b583e38de4ba2c89b53afe8151ce1e581f24cec303c087e7e76e8cda6a00b754c3654e3215b8f3d2288dc6258866b1cf6b9a9a5aade5337c1f5dea SHA512 4bad565cd69db35d0ca06acfef2560f496925566067333f4f814a6ee154a74a50e70750d09f11194f995c19ff5b0f166ce53c7dc409728c96a27cd5152fb4c76
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
deleted file mode 100644
index 8cc9279a6024..000000000000
--- a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315"
-KDE_TEST="true"
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="A DropDrawers clone. Multiple information organizer"
-HOMEPAGE="https://github.com/basket-notepads/basket"
-SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="crypt git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	crypt? ( app-crypt/gpgme:= )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	if ! use test; then
-		sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Gpgme)
-		$(cmake-utils_use_find_package git Libgit2)
-	)
-	kde5_src_configure
-}
diff --git a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
deleted file mode 100644
index 82ca2e8e26e1..000000000000
--- a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001
-From: Gleb Baryshev <gleb.baryshev@gmail.com>
-Date: Sun, 13 Aug 2017 21:37:52 +0300
-Subject: [PATCH] Fix KF5 issues
-
-#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
-#34 Translations are not properly used
-#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
----
- CMakeLists.txt       | 3 +++
- doc/en/index.docbook | 4 ++--
- src/CMakeLists.txt   | 4 ++--
- 3 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2997365e..7b54ace3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND)
- 
- #TODO: find meinproc
- 
-+#Make libbasketcommon search for translations in basket.mo
-+ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\")
-+
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
- 
-diff --git a/doc/en/index.docbook b/doc/en/index.docbook
-index ddef489a..586014e8 100644
---- a/doc/en/index.docbook
-+++ b/doc/en/index.docbook
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-   <!ENTITY basket "<application>BasKet</application>">
-   <!ENTITY % addindex "IGNORE">
-   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9ea886d5..f4cf523f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -59,7 +59,7 @@ IF(HAVE_BALOO)
-   list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp)
- ENDIF(HAVE_BALOO)
- 
--qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
-+ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
- 
- QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView)
- 
-@@ -93,7 +93,7 @@ IF(HAVE_BALOO)
-   target_link_libraries(basketcommon KF5::BalooFiles)
- ENDIF(HAVE_BALOO)
- 
--set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-+set_target_properties(basketcommon PROPERTIES VERSION ${Qt5Core_VERSION} SOVERSION ${Qt5Core_VERSION_MAJOR})
- 
- install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})
- 
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 8fda9a81fcab..5440b51867ba 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,7 +1,5 @@
-DIST latte-dock-0.8.2.tar.xz 654976 BLAKE2B c2078821ff0a3c431fe3563f8a68d1ccbd1d74694c883d3da923a28922e00e51378b48b2bcf5348e0bbf3c5c4a5224ebc06fb2c8dacfdf7418b601ef108fb683 SHA512 342bb68c371eb4d5a4587888c1d273cd47521e1ab3584449a76fd046fb0e3203bc0f36a9d46e8299e2f520c76473df832ccfe2a957260986a4202ecf996b2228
-DIST latte-dock-0.8.3.tar.xz 656396 BLAKE2B 00fece3abe4c259da212f7d0f2ddca7aa4926c6378aa986d4f6f7777842b7c9966f78798b106239e2d63af7af822d872f0f19fcb4686ce0ebad1086089022720 SHA512 e49ea9aca28bcae202e5f4832484f579233ea220a7eb7dcdaea128d68185d7bc0ec6df88eaa543c6267b00fe0a0b060bf533816bd196210e18c6ac56186e018e
 DIST latte-dock-0.8.4.tar.xz 656528 BLAKE2B 200bf01ea489f2c7486291623ca6b0518e04ca4d607c9d42294abc3f13f1fd13d5a9da7dd16f7ced7d786e729bda12e80666283d3dfad32cb49be5731118ac84 SHA512 6a3fd4223316cc2e17934c1e7220cfe4b23ac5a06070f22ff26dcc2f312f73a666230aa612cdefd650e320ad09dd3456e44d253a2eab31e7c9c5d2f52343acc2
-EBUILD latte-dock-0.8.2.ebuild 1266 BLAKE2B cb04c1b03c2e8023399cfcff150a19bd98d730f53570237b4298b23bf72fc9cd25c9fac3af21c69b8c12764a9b9a865860caeada2c7198dfaf011da3d6ebca17 SHA512 0fa5688a80b0c2e932774401fcbd22483358eb4de39445ac5cae776e83f8cf945650fbb121778ac90095f3d6ae0cbacc8b14052c1d94f2e9b3777cd3030900ad
-EBUILD latte-dock-0.8.3.ebuild 1268 BLAKE2B 165fef170da3dc66404be7ef812119d565998af53d9ec9ba668f52e45c3803890f28a334c509f6b9c17fa1e1ffcfc699a0bcaee396fb39895d75cfee6b82dd96 SHA512 a3ed2f7fde3633ecfc20009f1cdf30fed1a8228e37dd735da518da26593f385716dfaf7ee0767393b47fdda31f2004c6415be997c6206a827a53336c73b72950
+DIST latte-dock-0.8.5.tar.xz 658752 BLAKE2B d5a42809ded0ab8128926956df7c498e956581bb8191513519b91a0bd7932803af20ac2a43c2d90caf2553976cee8f691e42f64245c2460c9744206b78d9c0f1 SHA512 eaf45040871e37b24a2134a0a1bd790732f68d870e28c847da3df5ccd3f0ce320750d28380b1ebcaad3d02b793ae89a96710478b97ef5678dc804375cbf8cb6d
 EBUILD latte-dock-0.8.4.ebuild 1266 BLAKE2B 3540e2a81898a191f47da5da3010569a0a1989cf38f47e6b95cc6bd68352f4a7fa047e885143abc5ee3f612e79c505ce6e0061c84213c4efa63785f78139beed SHA512 a900b12f2c1d8bab891d93afb34733717502991a8bc33701c715fa0528b98cc3c86e5c41593b158663211b290a23b2ab4a76a292557004617a6d15fc58eb62d3
+EBUILD latte-dock-0.8.5.ebuild 1268 BLAKE2B eea8b84771fdba6e89aabe1019bfa5d5aa2b907d7e16eea7fe00ab475540e45a3b55502fdf3c9933b3d5a105593a6ed39cb32b8becca596ecfdb1559ed52fbfb SHA512 6b9d794a77e9d7c7ab61f80030e17e7ba9d6f87095dee3d79054aa4d7ede528d4e9b1d1da4c266fe2ea588157cbb02d3f965a20de49f1da04fc9b6a7efef84c8
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.8.2.ebuild b/kde-misc/latte-dock/latte-dock-0.8.2.ebuild
deleted file mode 100644
index 31b5657f913f..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.8.2.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 kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://store.kde.org/p/1169519/
-	https://github.com/psifidotos/Latte-Dock"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui 'xcb')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/latte-dock/latte-dock-0.8.3.ebuild b/kde-misc/latte-dock/latte-dock-0.8.3.ebuild
deleted file mode 100644
index 476f28f5fdaa..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.8.3.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 kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://store.kde.org/p/1169519/
-	https://github.com/psifidotos/Latte-Dock"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui 'xcb')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/latte-dock/latte-dock-0.8.5.ebuild b/kde-misc/latte-dock/latte-dock-0.8.5.ebuild
new file mode 100644
index 000000000000..6ed795aa72b3
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.8.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://store.kde.org/p/1169519/
+	https://github.com/psifidotos/Latte-Dock"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui 'xcb')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 6d965adedaf1..f45d61936af0 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 3861ea17ebe0..677d7197e9cb 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,3 @@
-DIST bluedevil-5.14.3.tar.xz 158780 BLAKE2B 83437d1dd778b1d46d6024f2d244326d0b46433ca8f0d6a0370a487c09924057912f6725f0fedaec9eeab2db65cce500ce2492a65e4b6f11bd88518a38e2c3d5 SHA512 62fc66b2d5dfdf32bc64c14b871a097a38772ba7d5c25970753930b796c23f51c5f928167bed7dfe028118b5914c6f9af1c885ba1cc1d7432834ce14004b4f28
 DIST bluedevil-5.14.5.tar.xz 158260 BLAKE2B 1a8fdd9804a852413eba0315c0f97f7b0f5abb4f96568c182596595501c15e33dee713b0989f2b4c10b2441d1ca350c617a41d0fc5a1877f5142d91b6f288e28 SHA512 9327ce7824339fdec42e7a0268fe5a8a100a150e4b1932e9c6a0aca9d3f5bb9b3a153490cf1f6613a459841b775f6648ccc55176addc024761b4d70462eeb3d0
-EBUILD bluedevil-5.14.3.ebuild 1000 BLAKE2B ae24cdb385be828dc093718fca7e665d59705c1bd5c0e68539d805c93312593e1c0faa1450117bf90d67195847103e60809e615a659f99ea5b90e7cf9af0186d SHA512 aff9ebfde627daba4ffd50853d0094ef17ed0daaa67a9a2c9aa8e689faef80a932d9888eb8d5eaf4c46cb35720e018ee1f6adf00ebfb1ee5cb6b4b997b71517c
-EBUILD bluedevil-5.14.5.ebuild 1002 BLAKE2B 42e51cd125d3b4c860ebd4a08f5eda2ebfc805225746465766991f3632bff94841df14794843b335ceb780f23b5983f387d020f1fd72ea60ca7d9432a301c47a SHA512 129a85411f7f729520b1219a453c9b6b9114dd7eadde7f6bdc702802f3788629cd8d40d3e6aba078bc279ca664b240c6f00ad6b2835324144f929b99a56799eb
+EBUILD bluedevil-5.14.5.ebuild 1000 BLAKE2B cfcbbef7bdec6b3df58748b3ef84f4a17314b2d6ebe325a2d43c165dbc376a5a8e36efd3dbaf2f0d3f36dd715e595cd0fdd383ccfc6f9796bdaae7674f84fd7b SHA512 890e0cd03567831bfcbfb2cd2516788b1148442b5f996d2ac5bf777c1daad87af31f69be47b42473463b124b0d1b3fbce7f58c48eed927b27a2994667c49ffdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.14.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.3.ebuild
deleted file mode 100644
index 935baed43a56..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.14.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild
index 73fee1340a0f..998649e6b32e 100644
--- a/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 65ce9cb98bb6..f4d3cc68857b 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.14.3.tar.xz 3146484 BLAKE2B 71e6aa9fccfdd7a9b87634ae22ef98a4ec4ee14bd1e196ddd32cb5b333d6a342261016e6e6416d8b1be112c3f12706232600e792fffca97f533f720904e7990f SHA512 ad1df5c705f3e3e548b37f33989049e08b695a1f96af4cdf8b7dca3a3907c284757b5c7961f95f2a220af2f538aed526ef9c5207a271aad55aae56a2b431eed4
 DIST breeze-grub-5.14.5.tar.xz 3130276 BLAKE2B c067915194e87b244125a38af0ccd16eede5204b74e5783d7c339b11ed522a38cc0c1f3808750a74297b9060ff693b070994d8e05665a20c793d2a1652a0951b SHA512 a921e27b29dfd9f2eb65a3fbb84c812a750d7823281aee698dab07d5f7bb1e7461c70130e7d4437b6dc6839aaa0994276665f2fe3be6b1cd96a331736029ee2b
-EBUILD breeze-grub-5.14.3.ebuild 395 BLAKE2B e2f50203ab90e827b795517cc78687709a4640fa4aebae9393028e034edf020c9f1f733f40d2d8bba25e90de74f1110bbb540ab952bea9c2d3d84f4460110805 SHA512 5a715e8f1cb375aa739abca75fbf6ac04d31ae262397852c9bd9c83deaea273c04cada022b9cbeac12b1e8fabd8f1483d9b0c0fc8aa8be995cffc4bf2b6c4a56
-EBUILD breeze-grub-5.14.5.ebuild 397 BLAKE2B 3eadbd99986e743a85f9797cc9406d9e5bd854564c0df834cb52918a29091ba515adb6b860d8f7430824fcc219df91385db1ac9118060237524cf1a9a9126142 SHA512 2785e125e0520f61e37c34773b2c576f43bcb05018de309b84552c240d90ad7f3b453bdc65142c559ee941af757f587bdbe9163633331e22ff6d747ee748b768
+EBUILD breeze-grub-5.14.5.ebuild 395 BLAKE2B 22372b8db26439d4b84946367b4d98ef6d77d088adbfc52f39f406f1431d7d477cfb308bacdd9069d985a22b0706fd4a8e8275607b17eb6a5f70d1a2738e0231 SHA512 5ceb9f70c4d1314a1c90f55a1f604d60a45596b7231194fad919d0f0306efed34cc39d9087681aa653e89a264f47301117210d878ebd08c26a379330b98fdc8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.14.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.3.ebuild
deleted file mode 100644
index 2b9958e425ab..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild
index ba5367062bda..b285385310c3 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for GRUB"
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 378fbe6fbfa0..52d2acc84f1d 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-gtk-5.14.3.tar.xz 202364 BLAKE2B 399a6cf0f68e9876c02b5c627740436e775dfc50c806e0413b6e66d53a1bfc62a670168d2027e4943c5cfa17e36fcb3873a9575cde87a44961ab14dde19fb402 SHA512 9330fdc88c7407cbf236ac83046dfae7fbcb61798ed5a1c440a35da12cbed72a7fc7cb0d496ad0dde943b4918a8deb8bc45411a304e926546042b58c19e7b019
 DIST breeze-gtk-5.14.5.tar.xz 202408 BLAKE2B e2055710f8ba551c190ca5922be413cccee32afcc591cccee10f5d3952f46e04e7af09fa0bd0bf85770bec80ec0a3793e7493b0884e1d48d1d787ff0d3cccd9d SHA512 3e8ad24851b84821b8894d4bea33a9ecb7bbfc312d5d4aa246520d5a5fa4dbf77a5f6b7a34f69dd9692fbeadf5246ebe44d0a57fee171b3903cbfd1356a632c5
-EBUILD breeze-gtk-5.14.3.ebuild 293 BLAKE2B d9d54477dfc648beee79f0d3fc8f41ce2f64d2fa7bf543047b274c6438d3acc15333370824b02305854f97c78b8cf01b92208075cb3cf611500bf2d3fccd2a1d SHA512 6060ac57b44200b58c0918b870bb2684db92a8ac27a3d6905ec1d4a03064ccc23274295b16ca4c284f0ec0f0583f79ecb76680ad61d0c9ee593399e48fe1d9ed
-EBUILD breeze-gtk-5.14.5.ebuild 295 BLAKE2B 2e3adca8b431642ff91cf92baf8516d730efceefa02d8068d26b427d9dec45367cf180cec3c81c3b74ed71c030d457446a1483481a8ebf33d0bd474a2efb633b SHA512 157aa3696dee031f34d96dabd358d30dbcfc5f86fc920fc5526cf66975e26727e0a936c225d9f551dfbc249cc8630869ac3df02c02fb2268ad69c51d78b5f6e6
+EBUILD breeze-gtk-5.14.5.ebuild 293 BLAKE2B eec688f3827909de89029aa8986063beede7418cdcaa1afac20c0bb0ade91cc60ce4b99c2ab7b3c3e2c813953ba700cdc9a5ffdfbbfa12b61c4f354680147928 SHA512 832aefcc3e2caa1f5190109fc470fdf3569e84990670cb9eecd0ce98fadf188cb43634cab814a304f00f2020849838f639bddbf0a273a16929f44bc22ee75b6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.3.ebuild
deleted file mode 100644
index f2e16c69db94..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.14.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild
index 076cde699a2d..689f67102692 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild
@@ -8,5 +8,5 @@ inherit kde5
 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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 1cfcfaee617c..427e2582e76c 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.14.3.tar.xz 105456 BLAKE2B 4c9315a56a26d86930d9de2397c767599ac795cb5198c67ea04971d2103af6587b22996612e2a958339d592db264b04b08d7a65d3e6293155e3753883e5b4f38 SHA512 9a35a1c9c0ceaaaebec1dfcb9bb7deaa2279bcd3a189a07c3623e0107537eb917ad15f3c9c54fdf32a3ba9effd61b556b05f1189b655ce9feea6bb0bf9b25bf9
 DIST breeze-plymouth-5.14.5.tar.xz 105440 BLAKE2B 54a2bb0243f8a6ef068b3b9164edd906ce6d1cc9b4152b9a64628cda43c0b3ab99d2a454c86f878db32df1744415d564b38b0c370dd1198940d8432b2f02999d SHA512 540770481c9dfa2e2d927faa847133f1c8a9999c3fc4b846bb6d81b17447f2ed72b7855607fa0892fb81e61f04e702f168bf40fce75c1e839788946f94c7419f
-EBUILD breeze-plymouth-5.14.3.ebuild 456 BLAKE2B 9fa46794fcf92612c6a5d614c3724f8966c8ce621414cb96a3f464134f66d8442eaaf825ae945cff3133c1f693b931838a5bba3ee411188433451b8f70e4015b SHA512 dcf5b7e2ae15564d72743405e82a22444249b2b84363e679a69725943dc8c31d461d4d1c1e6ec043cb398f6738a073814dfeb197e1bb91246b94b710d4f167d5
-EBUILD breeze-plymouth-5.14.5.ebuild 458 BLAKE2B abed337ade560186aeca86d92122944667cbdf5ecab61d1a40c87f6e53078b97f8f599928d7f37187d6167b069e7188a0be818ffbe8c6b81bb10449bc7cf50e0 SHA512 f5b766089ebd59f75e9cb1a7be2676170715318791dbd5bbf06b2f4428bf458ec1d10aa07b4108ed2c8a39a7d40aec1f4471d50986bb4c7d50947e021e42479f
+EBUILD breeze-plymouth-5.14.5.ebuild 456 BLAKE2B b2fa38ceaa4eeef4f2a35d8ee25ab3d808d210d7073547cf272aff4d7afdf12eac051093c859bfda14852c84e41324f59e6f5f60f907e8dc9b339d3ca949ccec SHA512 2d09eca8bab5ffa1727163b535fba26c3dd3a4a1357190a161afa15c789ba09369eedb1beec1a64bfd0344a841462c1414feab53d56b554daf85fb828a95aff0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.3.ebuild
deleted file mode 100644
index dba684ae49a6..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild
index 05ddd00e8e72..3b58f02ba52d 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Breeze theme for Plymouth"
 LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="sys-boot/plymouth"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 059cdb78c6a5..697af5baf53f 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.14.3.tar.xz 24905232 BLAKE2B 278e332298478666f833df99187202d0286db0296ee90cbcb56cbde80e75e5e342fcede11ac7166cf2009e0855d2bdf2ff5cdda4ea8fbe9e56b00d2a384d8583 SHA512 070d9477802ecd9f9427976b48c841982d660aa1e59c59a3dce92f11e87e80ea0f418114e70a8231ba97031d854a856d67c2c72bed02b92cc8ccc93852a4c8ac
 DIST breeze-5.14.5.tar.xz 24932044 BLAKE2B 51d8a888fd926ae26da7d67aff55786ab9d1d63578f6ff0ef0a8b09e88c74b9cb61aef235bd7a1e9b8f18b5eb09fd92dd6dd9f2bcd404e80d09c10bd6038b778 SHA512 46cff196ffd6e0284b8e9af327e7ed3f10851f208b6c7c900821d69bc98dfe74e9f2aed392ff930966c610a711d0b0c0a47c9fc647474ce596ce2f8a24ed0dd3
-EBUILD breeze-5.14.3.ebuild 1148 BLAKE2B be7068e654fda27174168693583c707d231824ee46f7e8582dfeb5be59ac480bf01a72338265d58f188ca97474d7410643e6654e2dc21e202a1c4e466ca6256f SHA512 04a5045f69ea69dd9b1737acae68e6267178ad81af071d4ff3b8fc57dbb6a2651b2b5eec7fba83f935703423cbef8c3d65a6f5b5d6202d6af476fda634d7e673
-EBUILD breeze-5.14.5.ebuild 1150 BLAKE2B 44b135eacdb721537008b75b18aca0a4a1c5bb2ce06f895bc6aba56858fedcd854190efb8f3e74b075f3c73ec864ea4ead58f616c6cef2deb9d818facc38e6ac SHA512 67409c6325e5b2bc2e58a175f527a32892ef4e4a8b6f3de61a59895c838eba1d8eda6b8b3f804ab8286a138c02dff1fb81388c802b1d265f2560b422ee84ada4
+EBUILD breeze-5.14.5.ebuild 1148 BLAKE2B e7d1164e97fdeaf7da1c1e9c9c5950c1ed9774774e259ecd4f0dc1563f06259eeb7a04030363036052904a00c43f4728b0ec7c45e654a0fbca204591ec01c626 SHA512 9d6899584449a98e8595c0dab82bd2eecd0b46b655a9e3eac84221e02366e6f3bb7462ff44ef362bec1f054d3d254ee48608b544da297764811fd12eb929dbdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.14.3.ebuild b/kde-plasma/breeze/breeze-5.14.3.ebuild
deleted file mode 100644
index 1166c08a587b..000000000000
--- a/kde-plasma/breeze/breeze-5.14.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="wayland X"
-
-RDEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sci-libs/fftw:3.0=
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kpackage)
-"
-PDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.14.5.ebuild b/kde-plasma/breeze/breeze-5.14.5.ebuild
index ad49ffc96014..3cd02900d0e7 100644
--- a/kde-plasma/breeze/breeze-5.14.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.14.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/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index f21f092099de..f6a3f9427040 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,3 @@
-DIST drkonqi-5.14.3.tar.xz 740084 BLAKE2B 350876d0f67fdb1a4a9c45a11026bb37b9084f1f2c2e5a7701400e2af07e93bff89b71f8659f8ebb21c448257922a7bc2d6f8c4018cdca605842cbe21d70242a SHA512 3b6d64061073c795e3bea1c0ac168f1dbeeab709b8e067d3c862151a83899c031d3c06c063c509f604a8db58f5247f4c369dd39c971a89267783c0e170cc48eb
 DIST drkonqi-5.14.5.tar.xz 737580 BLAKE2B 1bb0ee7a70df8740feb6838bae7679c4acff4bf976e85a733da102db9716efcee5fd4f314f3877607ce600123b6452694a8fa528ea87a41f49d76b3bdb46f975 SHA512 8985ab8fae82e16fce6d604fcf6e4a393e1a147061f09eaaca6cd048fe9cba47cc9959013fc912b3829a9aaf3c471941597c5d1d3630f243fa1871e387757b36
-EBUILD drkonqi-5.14.3.ebuild 1361 BLAKE2B 52bc9be741dd861148babd2a3f339e5f849965f0e3c56285d6a7a177a8d07b1f735b40d0eef573f45b0238c43494a7914331d404b9b014eab9f7362c50ac3383 SHA512 f7290f14dcdbb839bdf29a32d6bc7e47460f0591088970045e55e4924640621f5da0859c97b66563e487b8bd9b7f62a4c01e30efb96a56b93c737d73d714cd99
-EBUILD drkonqi-5.14.5.ebuild 1363 BLAKE2B 5d12dce18576573c69e2c782b674901bc7af2a7076b6f8517dc25f865344947ae12946589696e46f88af3e3b5e6485a0613f8f44533a6bd7daf6bb7872bfc1bc SHA512 9d9806aaec0e8ae68fed21b46d73fe973dadc628f68753c03bbef53a3bbdb03509df136fa5211d99a0864a9de035623b36f4b51e59e6c83a95e982265bc9fdff
+EBUILD drkonqi-5.14.5.ebuild 1361 BLAKE2B f6e0805203591fa2edc8b067dfdbfa50dd288201738597ecc148abedd3520acb5dd8ce72436ad746c6fb56adddac0ce81eac13f516fe575be1d781ee0fa8d8f9 SHA512 665226f038f076e1e81375d2fceaf242bbb0f92a5fc29d3712a98b96ba4a0b27af3cc1db77368657b85e97181d76c450eb2d37aa7c14dcf80b0f0f29c2a28f61
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.14.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.3.ebuild
deleted file mode 100644
index b3bba1ebe52e..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.14.3.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 kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild
index 0e4420a05247..5e225bb44d4c 100644
--- a/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.14.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 8af600d3ca15..286bfb683951 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.14.3.tar.xz 86148 BLAKE2B 27d574a8b0197b017139aaff4b77dceee44f92bec3b4988a3030caa72f87f42d5f47da7d1090170fc4cfbb7b2114cb2eb5252e3ac7ea76926ca58aa3a9d88024 SHA512 1f293709a86cac57557542fc4b545bc11e3df7f868500b5d8be4107b4a80a0c04d50ed5fc94709e6a630017fe2c3122e082faa7c2d12fbdd4f6666d5de2bb68a
 DIST kactivitymanagerd-5.14.5.tar.xz 84964 BLAKE2B 555c4becb239aa6d04a60319f3360e054af2de43745de86e1c47451434eadd1fdf1c93b44fcd8fb50e44942b8aee15d9b4fd40b36d6aa2d369c77388f61569e1 SHA512 a2eeb45c260eb11714f73f534867a5c6c1c5f4d8c14fdab71251f570b212ed6549f94f214a836d486d952f0b8b1effb346ad49f60a6d66edf84d977457d9a0af
-EBUILD kactivitymanagerd-5.14.3.ebuild 871 BLAKE2B f57fb55ef563b00e44e62a58ed7796bcf83829e80c06c8eb238eba1d22ac952d25436b3740973d5cf6dc01ac716babed5cc885f506b26d6cc14021ed721db3df SHA512 7752de14eb38cd03184b28a835eb129cd03ca5f29f081ffacd95d29ac1a410ec65ebd9d89d291add89438b233f08edc3c64570af3b7c1fd2ba6a6a34d33019a8
-EBUILD kactivitymanagerd-5.14.5.ebuild 873 BLAKE2B da7c90ef5ef535f002f3294aa895ef8e1db0fa2fc61a731ff37078ce3b21a3fc60338c5f41ebd0cbd9894a14bb5bd3364ef0ed9c8353067b228282ad63d381c5 SHA512 504d4a3a29f10a7704fd506e63b16cf3eb2be6ff85f1e962515e1b3df87fb529fb3f4e778e76bba6349262d6551a49a5b0c07bad70ccbcabfcdc3cd658be96c2
+EBUILD kactivitymanagerd-5.14.5.ebuild 871 BLAKE2B 1b5ca6e76fb1e69699ef8b74a727754d262dae9046f295d62515e9da9e86799e06266ab2df4f158092ce8b9c4b1cf3fb250c1ee91f2abb852ec671436d6c0302 SHA512 9669a60f6ac4be5337bd0739ec585127af10e71da3e1f4658a651500555be5581df404fca4cef65726b150a100b0add53bfc9e067d8f4e6cf809eafa631b6da5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.3.ebuild
deleted file mode 100644
index d074d48ebce4..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild
index ff13d6ca802a..7ed87e852262 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.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 9ff58d17b548..99279467a111 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.14.3.tar.xz 587012 BLAKE2B a5fcc690d21f246d7cd2f7eaba0dae7368e63b6efee4080919f2816baf2381e112cf31f00228591f166061ab1871136ed97af8dfe8bf9dc58d29f8555adcf89c SHA512 4578bbf6bbaf266a19c317945f33b3c9c2c3290855287947382be04a7f66e9e7da4bd8970994786e2d3cf1b4ef26a065f960b89a81dbdbd5263813fae19f114c
 DIST kde-cli-tools-5.14.5.tar.xz 584812 BLAKE2B 0a690b72a9218d675d518a43d46baf7d462e425164ae0b9f42b0e6109c9da693b1521e151c72992d387257a107eba3ccb2fc83aab1537d55592305e58e572a6b SHA512 fba3fe47bb1b7faf67fa9edc39640629ad0689c99964a48162166401d342dddcf82a19078f76d9d92c4892cde302a5c9c578e0c2a852fa321216c2c3498a2428
-EBUILD kde-cli-tools-5.14.3.ebuild 1507 BLAKE2B 3ecbb3267c90079b6ac5aab5093d79ca29bad16061bbde3c8dcfc81030dd1e1632d135dec4f8eec2e9f7de627fdf548b9f709efaebf5faec6682a2d931a4b37a SHA512 94c6f8906bcffb60461df5ab3026cb847981ae928b6cd3bba78cb5eb8934e8ef1676883e2fd4c07753775fe5e2973e14d55534820180d47759fb211f884113e2
-EBUILD kde-cli-tools-5.14.5.ebuild 1509 BLAKE2B d4eada0483f1d11c2bd8d44ade02baaa85ab6d30fb40401cb7ab1136756facc3b48a5167d3ce6dec2781ff162cc76944408a0dd1c5de30dd75d1bf45eb619abc SHA512 a8afec031a7881bf290854c7e51a0dbe8d54a6e8019a01c9249fe041b8a14c75d3c1e23ff741044aaab907d3a6d5a4fb28a259e2d3903fd7056c50dfb1469361
+EBUILD kde-cli-tools-5.14.5.ebuild 1507 BLAKE2B 4c3bd2cd491c8359419827e0fdba815c99a1e93ebb567e28d30f451d8d9418bc12285412307fdc325896f74ecbe611c4dfa28c574512aad5fa5846ef24ce640b SHA512 e39c6417786cd46010ebacd2fc5a465e1b9140f36578216ee62822f370d4a9511c6f84704b8bda7440420552ef929b2f1cfc2ac05ad8bb4ab36671f803cb5f5a
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.3.ebuild
deleted file mode 100644
index 8dbae8e9bc06..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesu
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild
index 80a59a522f62..c82dd31d3035 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.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 6ec0ef34875d..de8662439901 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,3 @@
-DIST kde-gtk-config-5.14.3.tar.xz 157292 BLAKE2B fd060e1810058472e24a82819c2b3b737637d8a5430912e22511085c0c361ccc5f355f7d1235d9514dabdaede799528f5522fd83b452c33e06689c70ada3502e SHA512 5c8d14d77cd6707d32f09361247445ff4399bb7331125d795bf2046bd7f8467c374ad68a11899bcc1592c9c207a4f94e9ef523074184550577c9c85fa7de49ef
 DIST kde-gtk-config-5.14.5.tar.xz 157032 BLAKE2B b13e44fbe1ea048e58b98f1396528372f74545effa145b65a71709f1e7732c0ed48111e52eaafc544d180678e411df20786a0f9cfee1557c1df873b4630e380f SHA512 3bb350307cabf44a27dcc3be95c8d2c15049be80f3c3fb127ddaaf9880acb850f10126347fba07868bfa9424d5e1c92b580687aa356be2869ff36684a15d8563
-EBUILD kde-gtk-config-5.14.3.ebuild 1248 BLAKE2B 359c3fc33950aa3404e967a424ca291e6124d6c883f2ac575e47e5a8380dc05756c8ad751ce966a28dd8c6151edd185086b30eb02e817c7628ec6f3815c9d602 SHA512 5677f6138507e3385114b0175a09c7c3dbcde35a4f42c52d5caa6a2640dbf1261145cd726d9e75d1009aa9dda699c2eb9aee3f5ffaed0bb3ab0f1d612ac91e61
-EBUILD kde-gtk-config-5.14.5.ebuild 1250 BLAKE2B 8effbe3ae2a70a88d0b8b57b713573ace1db80224b963a8bb94f90c70e0cc39338ef43e4ff5e991548d6bf9e58d097cd54a0c0765a3c492fc6c443e9ac71b9af SHA512 ffc558e4819e7cc8c0c6148144d5485c3f20d5177a73d8545c482bd4032c72c282ac9a53365855a1b0774d8cf8511f7cd6649be8902b11d8efa0193a5fe4b000
+EBUILD kde-gtk-config-5.14.5.ebuild 1248 BLAKE2B 9a52ec78800d6b0ec0f98cd568f8fcd9add213afdfa3d5694f4247cb3dd4ae6c4655b7614abf6bf0c6b28b7b466743c933df1ccbe833ee0b616cffe9dea47e91 SHA512 f3d2eda4773cc022094cc0f8aa44263c22661848b77ddd4e507a19932f2cd004a7f7873d844be1e3d64772799a45ae4160502222de00264d5ce1ba6c6d8d3e91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.3.ebuild
deleted file mode 100644
index 46b9142ea180..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild
index 1b8010dcde5d..0cc1a1d7f133 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index d9c424d35997..46eacc0a5f22 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.14.3.tar.xz 42196 BLAKE2B 4fc93f64d151d83c539ba7f1504c5f44b12d9a3e6c804e702c31ecdd0d8f67cdac2f8c4b71b19eefb49de2bf7333c0891102084279907f35cef06ee02a587650 SHA512 f43368fbb4799c12452232b1a8d28d5befaaa81922f7b189192a73343dd5a4ce21f5ff9b779cf552cabd95a4721ef2d937518f34759d3cdc90c76d3152ec5915
 DIST kdecoration-5.14.5.tar.xz 42236 BLAKE2B 5d541e977e971e64c2906535ed1232d8c7b293f3b3caad203e1c80e6c33018befeef056b4c28720a7acc23e1775513fbf87cd11e491f80409a046e359c524d9b SHA512 c5e06b46c009722eae68495142445e276a979010259f728f7df326e7e5dfba280d90a0ceee6a482a333c1bc1e8106ed5c6f9f25bb86eac15755ac1a5e357abb5
-EBUILD kdecoration-5.14.3.ebuild 397 BLAKE2B b2f4d2dcb70014e6bc805630f3c8c2f9173560199f3efc1767a79805a6f884a8296798a4b5b305837502eaca00e6bb6828d3a2cb4383c207b8f21b444b9d674d SHA512 23ea27dc54a6edea8002dc4bc746948bd90ffc191caa67b05bee71f6eba82d6f87e00891f7274fc769c04c9f9a6cb352ba397b92b391544f68c8cef9e1ffb7d4
-EBUILD kdecoration-5.14.5.ebuild 399 BLAKE2B 89c1a9c9e0811834dbf6b8a4755abf6f100d235fe3ee8da5d005f4a46bd695fa4db51efdf874451b2461dfdc74da015f668d0c8bb003a4c8de578bc71e488900 SHA512 3958314cc5d49d33d270bf76456716a81f9692d27ed8e1593d44e2b67fb40b9d4fef2a8f08a17ade6ecd945409db9b3df1ce4bff686923c2d004fc5131416108
+EBUILD kdecoration-5.14.5.ebuild 397 BLAKE2B b3fcf1d4a56fb3f094f4c564f4717416555d61c2a0f6045cd7c7eeb157b8b2798a9581cdfe45df27f45e382f7612d355d5f9a3cea83d6434e3f9586e97656815 SHA512 b62455a82480794298159df9d72b1b1f7ac60a776b59e1b798489a5d8bc478844f65248c913c38913cfcf1bdd8265afc6b48752cf6f4e8f64c683b0b2b70841f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.14.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.3.ebuild
deleted file mode 100644
index d960122c5180..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.14.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild
index 5c1e09f4315a..e9e2c444cee7 100644
--- a/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.14.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 8b5deb1b8b8a..4c30b20f0f2b 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdeplasma-addons-5.14.3.tar.xz 603632 BLAKE2B 77ad5c876efa8e13f790b0b822afa43b79d3187955580e31611cfbc5a1e93d9a5905128a0057dccd28f6ddd45e5636207a8833896f51a6bed8fbd723e19d79f0 SHA512 dd53e18d6fd25e6fa17863aa80bd648e1526b72b852de10cf37363c722879244cb9ad22dc98932ddbcf96321b71acb36c8ecdecb2a7c3304e55346d5da08a704
 DIST kdeplasma-addons-5.14.5.tar.xz 603588 BLAKE2B 0323ae26e0e55b7a75571c1cfbd88dfeb221f1aa706623abb21f900ebdd56bd9f3ac521b91c129ab99c046932353ba5079e72d3fad09a131ac1417c8783736a5 SHA512 f6d0203231598b161991b7bbd6bbbe4504831195d5d892c302212cd86067156cb17bc4632e7dd8a951747f98dd84312a3c70eb477bfb16a13a118de07cc1615e
-EBUILD kdeplasma-addons-5.14.3.ebuild 1528 BLAKE2B 5e362cc1de9a4fc54ef92105ed7ae5948b007f85c79cca6a32cf9bea0fcb502f630cb6e425a7626bf663a2e490b807364ee6d2d60ef9d9540be79f284cfcadb0 SHA512 940e16fd11eea3f95f78748787346348b0018adad101f276bcbbf46ab674dd9fd72ec39d3684dc0fea1bf8dd5b170cf119882d62dec4b781e1caa14d7bd0a1fb
-EBUILD kdeplasma-addons-5.14.5.ebuild 1530 BLAKE2B 8f6da78d0ec0067bfd2701207e60ed35b88e9258245fb8303cc8f5c2d242f33c7e9348113504b6febae568c051a18185087df8fce8ca70776074d26524bb4ef7 SHA512 dcba129fef601f7e1c6e1f833dc792e27a9375d4223d8ee8bbfae4041f6aef3af1ef8ad3db7c3bfccc03cb9aa108022258cefaebd097191eecbf7a3099f21fa5
+EBUILD kdeplasma-addons-5.14.5.ebuild 1528 BLAKE2B fffdebff11f7f996a599d1f85a0dbc37b9d8edbc4c578de6841692c347f9c2954d9963d7e159c60dcd110cbb1a7158664fd57946ce667f9a8cc305f6d6b63d2f SHA512 8596c479d0baf793a8d37a15ceb19eb5ca86db22b6776b58e0d99a56c08dd17a669ad00311ce5ac853543cddd278095bd848a6daf2aa153933ddd1e416e61766
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.3.ebuild
deleted file mode 100644
index 885a4e3c0a42..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="share webengine"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	share? ( $(add_frameworks_dep purpose) )
-	webengine? ( $(add_qt_dep qtwebengine) )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild
index 5fca0fcb6cf3..344f13b13c2f 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="share webengine"
 
 DEPEND="
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 27692dbeb9c7..6efda621f279 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.14.3.tar.xz 79512 BLAKE2B 055e260d53f068e8faf6f2349d620e29cbae0c3b2b556f203175178b05906ee12ddbbd135bcd396b097030f2bf0bf9a83f4191150bae9f3dc53e32188ac0bb22 SHA512 aaf35fa7c502cc12a47819ef3a13f7fab9fdf4ee88fbe4c8d7af2e087eca055aa9c15f0ebacd5ed8454678d4f97581a4c27e05a5c908af0eeda2678dc361b36f
 DIST kgamma5-5.14.5.tar.xz 79228 BLAKE2B f151c1943ae38b8d2a5b2f02e6b36456eaa70adaab7df720dacb23cc48e6f37bfd118273b9b0c13d0db27c5908a99e6553e1a7e9a2e3cce5b98c36b7042de396 SHA512 5d62c170f15f3859b5fddbc3a1f223e5989b1e379d7a855ee77d8482867485f27727beb94758776d1416472b7eacebd5f32819fe2123c32c87efb9fad7876584
-EBUILD kgamma-5.14.3.ebuild 528 BLAKE2B b9f0585c5320e1634e8f84c5af13ce228d52d7f1795260ef68993cf9b50bd77677169ed3849acc25a7a89012db06ca6396397ff517a6a5d8905fa85e065f94b5 SHA512 2d674f16b9bc26b6ec972551d5b0388d93fb4b3a1cdb95354d098f623fb27d8956a1d6f7a168255eeae22f307643d06a4a299041eb41bf3eb286ba0d55cee5b8
-EBUILD kgamma-5.14.5.ebuild 530 BLAKE2B a837a5f793e3307f7499ac3dc8f41d35e2fe7b1107906293fe10efb48b4ab6c77ae7fc9afc56392181f6376f3e0e2efb3268c8aec78b71f13d758095bc7617c8 SHA512 f10da5722efa7e8983f96520022a39f31ba5f1121331dda39d3b5b2a936bde0f9df220b63156531e0d401598deab8cb28a6150feb93d437c2ddab00c8c6bb900
+EBUILD kgamma-5.14.5.ebuild 528 BLAKE2B ed7df9960aad22175d7c236605813d0326438ff1890cb075ba3fa76c0da9070b8eae6f9132a152884b105f352a29363d7eeef9dc0d62c0f85e9c22bb0c198e1d SHA512 2a4878d530d10d943e56ff9faa0fc639bec4dda8a4ec0c0a040202d5e578c7d3e4e6a5fefc8c6057925a11fb800f5688e4220571b3e4e9434a9145d26bab8665
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.14.3.ebuild b/kde-plasma/kgamma/kgamma-5.14.3.ebuild
deleted file mode 100644
index 9094cb7b4fba..000000000000
--- a/kde-plasma/kgamma/kgamma-5.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.14.5.ebuild b/kde-plasma/kgamma/kgamma-5.14.5.ebuild
index 0ec32aa811f4..a7d806038626 100644
--- a/kde-plasma/kgamma/kgamma-5.14.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.14.5.ebuild
@@ -8,7 +8,7 @@ KMNAME="${PN}5"
 inherit kde5
 
 DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index ecf994b69d52..673286982a22 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.14.3.tar.xz 1380280 BLAKE2B bc292790fbf68ccf97e4c77dc0aadedf2c31e0cce4095c90cd59133083da0103d6056950a7937c38565ef90922a463dbae26c4dbdf3dc3d1a7f1b6f7066a6543 SHA512 81a1e6fd2def3babf2a48026021266d091f935468309fc34fbc36bb8338e8e138b4c9e029d272a240399cefc8a87ed78a0a53fb546cf87656f5477dde29d7ee5
 DIST khotkeys-5.14.5.tar.xz 1380612 BLAKE2B 1a38a436a35f0c45d807938be4682436c317d429f402091cb0785c1aef3c50c2e96356bb3a56e8f6399c0162bb9ccd3944f903458be70ac2d5bd8109d017d701 SHA512 d588112f501f5bcf5d09238d585a74ef4995d8c09244c46d4f70853764bb909eae25031d9ee180df3d96d512045179295ebe525c8490f18fcb2fd868d96c91b5
-EBUILD khotkeys-5.14.3.ebuild 1119 BLAKE2B 930559cb775ae5d58a5c86d2bde11855af7714a11c087322c558ae3440a855494fc8b9c7597a4b4ad4b669fd4397362c0e88abff4929b638bb40063b8deccf02 SHA512 b63ca0eab623244b30fa1df86dbe588612920dcbdf87a5b699999f4b951fb0aead4e449089cd494754245d8e6c031b123eda4d2b4ab097c1afd01c4771268f90
-EBUILD khotkeys-5.14.5.ebuild 1121 BLAKE2B c2ee929cc651798c39367348cb8056c0946131c514d188f69262dd8e91338461be31041ba2ce8fb36c9fd2d976696522a088b3eb2398e8fe72d92f6096a873ce SHA512 c6a01efd770f0930731ab468af445c9ee3a67ed62f829d1f8fb9ea0615c7505949767c9e68ddff284f42e07c56106921eefbc49007006d69cb70946bc9d9eea0
+EBUILD khotkeys-5.14.5.ebuild 1119 BLAKE2B 30290386de8a3e6cb631cd72aba8bc9457aff21f375c5617a7de396a429e5296834adf84a2c0cdd370ec59a9f1e26b276cc98946b39662b5de63ab183dd3823e SHA512 721317543126c72fdbfc835760c6356e573ee890c9967638b16536f7bd80bc3f6cbb3547b5a2173695d1ce7a0d1f99c06dc734c30e7de98e5ffaacae47a0ca38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.14.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.3.ebuild
deleted file mode 100644
index bd1d2e37c862..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.14.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild
index bbdd1a2d65e4..ee7253ce639b 100644
--- a/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 7a5c82af3847..f7b554a08460 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,8 +1,6 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 AUX kinfocenter-5.14.5-hwids.patch 1727 BLAKE2B 771c4c771c6926cc044cc512b7c1ebe5b528be50a7bcd9fc2d6f56675a26261c6c6cb5bae20c7992efd67581a7067b4ed09f21984d72a94ea1ce664234eb4c39 SHA512 cd348c2339528993795c292c99d9befd01033d4a80487bc1487013ba3db7879fbffb3ab5b1ef3125580ad0bed8a8827cfde366cfca770e71c5aca440742a744d
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
 DIST kinfocenter-5.14.5.tar.xz 1323212 BLAKE2B cf248445aec1320e18f11e58d9e02a95b1535446bc207ed75b76d18ca81af12feac221cf847bf73ecb4e0036432e6055c2801b34b9673ae289330468b2184c94 SHA512 df38b40eef89d4b4a6e7f6e5e72325122c5ed924fa01dd59e6d99ffef61a9bcd89e11dac8412ea0a95ecc0b68469cad6921ad529a247b59aaab3dc7a7d09a04c
-EBUILD kinfocenter-5.14.3.ebuild 2484 BLAKE2B 6893355e5e305ac324fdfd5c7277b83d105286826c3aade3605f3662e7805c9effcad153a7ff26b357e1e254631567560067443fb1684648e321f8aa64288e8d SHA512 ca0dcbe3eac5131c437ec38730650a753cc0928d24253f292dd5976c13992b980222782e83376dcd6e3567e208db5681a700d87bceaa0bc1ebab172a9c498653
-EBUILD kinfocenter-5.14.5-r1.ebuild 2665 BLAKE2B b8f306777bd784c381d519e090f5d38ecd615ba0a2bc127085ffbac7bd494dda44df204a608f08c9a48e2d87252afd8782b7fcf4aae27bf18f3ae2393457b722 SHA512 546afb05345e012dad2ff57b6d334e7f2bad22092d3a7cb24198f249466cff606f9599b205cf0a1993cb1ef3d0391df7505fee22aaccc55ed6f2da858b9fecaf
+EBUILD kinfocenter-5.14.5-r1.ebuild 2663 BLAKE2B d7e455e2acf138bce3faba5a2fdde24534242cd90a74ce97c312c89d29cac2dcd62ba448cd4fc6180bf3331d299bb775396de86289a0f514fce4b959084a4912 SHA512 19cc0902367979576600ea407317172fcbde5275966545a73529a1f899c0387d2c492aa28e3608af687e0907e568710485365731ac07faafc5b1dc44927fee72
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
deleted file mode 100644
index e6d787f5b029..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtquickcontrols)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
-	fi
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		elog "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba"; then
-		elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
index 6523f277be2b..23944011fa7c 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Utility providing information about the computer hardware"
 HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm 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 a1f5f0a03662..d82edbd836e8 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.14.3.tar.xz 770680 BLAKE2B 27bcd385c3e3b82585c96cf07f2040db2774f71729f7e52ea58d919375502e86fe47677d90df3acffdaf6e99dc91632beea7f801e00cba50a08cf9b33af77238 SHA512 889651562d92874ee62e6edd4d9ab119af5ba301262602d52ccc811faffaee0f89ba909bbd2645f062fa060ab58252206f34c73b7b5924f0e22d16e07a7a31e0
 DIST kmenuedit-5.14.5.tar.xz 771176 BLAKE2B 13f210340600baeefb171925f51f962d6323022cf52ea4f7e4fe1e3996eb5164981af0a9e12aed886a076ce7dfabfa56c63d03602723cf4536cf294dde2f155e SHA512 4a54ccc1dfd23266a2db4929e0690c5d773934e133d2854183880c2ad3915eac94ae147cdf75a97309d21f6c3b3702d9f6bb682cb7b05f84892ff86a211f6b33
-EBUILD kmenuedit-5.14.3.ebuild 1104 BLAKE2B 2293a1f87f0f2f3eae65ff7c0eb7860b7efee5a13b144a16a80f5350b64e48692b7640739ae35c56acdf780c93942ecf348243dc8801ef7433a7ab16c8740d71 SHA512 d566f8473834fa0cdff14e27727135b90dcf00ddb67ae535406da9a9809e2bff529c831a578ce023abf5700febefad23af19763aa0468d4e70b27580f072c9e2
-EBUILD kmenuedit-5.14.5.ebuild 1106 BLAKE2B bc8692f0d51d23bc66486c9c69e7321f5db9a802c0252017a1d872f051e88c825ffbaa5d3eaa445d7ea859b79c6ef075210cee3d2ff3f027cdb9f5dc256ab8d6 SHA512 30d234bf4e842cf94854a346332440b4c6dabca3823db1723bf074b68d66170a659a07ee4648dfded111d9c46fef414c0e13d4e86cf8b8f725fb095c40ea01ad
+EBUILD kmenuedit-5.14.5.ebuild 1104 BLAKE2B 00be327078b312f162bfd4fd674014ffb0062c8aec16c948a3f345364a41fe0638b242f5dc66dabe0d439457009318c07f7ce8235e10b6ffb339da12b3e78936 SHA512 b58491611d77a9b3bd7ac1379fdd3bdf028719faa4f82cf129da5ee4c68b1b53ce75f6991d799ed3cc42c443c5a67e7b36ca8b3db1c8d5225aaf69fc8ce79ae6
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.3.ebuild
deleted file mode 100644
index f1f3308da623..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+hotkeys"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kinit)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild
index 594c6adf0b98..269d3f555b38 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma menu editor"
 HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+hotkeys"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 28a91817164d..3061b91413ae 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,3 @@
-DIST kscreen-5.14.3.tar.xz 122344 BLAKE2B 7a0861586440eb4c03b632bd665ffb0e1afb9b7ebe78a120af855c53c06c8fb08a02532f4686221144b75fc8a7fccb3a37bd11729c7a9ffbda2549f29f5606a0 SHA512 f0331d8ec7cf7868ada1b537ba1b89cec2938e11cc0148722f0ddcf193e2067e73cf41955309bbb0779095df1836f27a105963c8840dfc01615d04c61c23ab82
 DIST kscreen-5.14.5.tar.xz 123964 BLAKE2B 0bf6488c2dbc1d9fc0c21b55d0bd5362aa7600e6ece480ac75ae41e8890420bbf6c8c5f9b38c42f42de8432a30900d5473356a448667e8296129fa8621926fe0 SHA512 d53c9d9f8071f32903c807f4c9c842602eb7b9bc914969b9f23e5283b8bbba5eff64f84c0b5df48374487e84bf83f70f160618325890aaf018d35b2f590893a4
-EBUILD kscreen-5.14.3.ebuild 961 BLAKE2B dcaee56613bc4da6e50b1f361d641f76c5f6cf9d601fd1ab4b10d9baf2f7916cac57b50748515e53e4e1875bcc79d13d2e3b6ea1af8fcf5b22fe07fedc405922 SHA512 4683e05789274ebfeb5b2cb66f12cd765c319750491368c05a5803d563d4339c0bc1e412c1eb298eaf2d45886c739770376034437f0a58cef7b8fea3ee6baf43
-EBUILD kscreen-5.14.5.ebuild 963 BLAKE2B 172d4afbac574d2f3b565ec102f39cbf6b3dd2402b4eb5a496b3d74ca5208bcfa17bcc4ce79babc74a8afaef067b36bd41663558a433b73742f71948a5068ac5 SHA512 728a11e06d6bd2f9fc841ce97b0d96b77c4458badb78bcf2020978ea8e033ef4831d46673bce8d63579d941b8376e66fdccbf266f22079f37b2142cd07a16073
+EBUILD kscreen-5.14.5.ebuild 961 BLAKE2B 634619a5a3453b34d2b824414f6f44bf5dcdbd04433388df756325d9f06e134eec218fb7ac6401e19b77603599a9f6a291c49845947d7a3490c0fb3e29019697 SHA512 7d95314a87cdfb2d90f605e70151ee4438934463d33571d9afb47f36d7301989b002c3c73a2efc5c98115d65f2f84d14ed39315f482e4763de0a003f07669f96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.14.3.ebuild b/kde-plasma/kscreen/kscreen-5.14.3.ebuild
deleted file mode 100644
index 5b4ab6dd03f1..000000000000
--- a/kde-plasma/kscreen/kscreen-5.14.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.14.5.ebuild b/kde-plasma/kscreen/kscreen-5.14.5.ebuild
index 00a0714bc01e..3997b5cca17a 100644
--- a/kde-plasma/kscreen/kscreen-5.14.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.14.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE Plasma screen management"
 HOMEPAGE="https://cgit.kde.org/kscreen.git"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 0a22d41f72c4..3629e22d1c75 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.14.3.tar.xz 122280 BLAKE2B 03182f4ffa11727606221e8c0c77f610c18ced1392ac0059e743074cb80cb80b35cc0a5e82f6cc3457df493599e0223b5bb2bef134c45e780ba7ecb649496772 SHA512 186f693a931936658624274c7de77e8cb06c433355932a17a6c600c6cf349f848b90642b613c786c0585f050599a545d0e596d81968a6ec0b7188eb34a6e2a71
 DIST kscreenlocker-5.14.5.tar.xz 122232 BLAKE2B 652d8f2981231278d8890d2599466a86ca8530c44a2b6379631d575c457a573031672529313921fd87fbef6859302d8364ebf4769430941326e9c2ecc0d5196e SHA512 49348f137645333484be93922ec167403c74fce751294dbd02ffeedde6279ff0a0db8abc12153541612d4aeb6d6ed646b7f5ab22b78a8b80ae5eb37fa16f0e1d
-EBUILD kscreenlocker-5.14.3.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
-EBUILD kscreenlocker-5.14.5.ebuild 2226 BLAKE2B 595e91d46af9d0cf4d1f6d38b6878928fa33e3087ee85f6e279c3eadb9abe63e2dc0fec56be9225ae2362c65fd717c96a7dde88769d1ca1122b86b2672df0826 SHA512 9d06c2f5b3eb9884547ef2578aeb49ba91f61c98e32d808a5d2a3f024cbdb7547bce6ef24c92aac7b43f3b99585ec1cc9cca4253e9ad5088845e13366f6c9c34
+EBUILD kscreenlocker-5.14.5.ebuild 2224 BLAKE2B a4b9b1bb32338c1900bf6fc03db75a98e8bfccb687154e0d7d2813287943975c571893fac220795bcdd27cc10ccc9cfeddc8c1981b353bc717865ca0dc07ea19 SHA512 eddab28da0a303178aa59fa0008a7c50763e5ab2b8e13c7f183889d5266b42b52d044cac17b3786c76888185d6606a4924822097dd48adb1c3c3a74a4b05108c
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
deleted file mode 100644
index 509d7ebe22da..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
index 67cc582043f0..cfebc067fb88 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.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 4944cd9ccdf3..1369d6922e77 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.14.3.tar.xz 21400 BLAKE2B 86606d6de13b785a5b78cbd08e588d88057818b91799aedecee5514e88a34c4cfc4b1cc0910d0ff145963aa74f979f80d17146342f5fc4e64a794cb85f701a0a SHA512 d4aa1870c9e484e8e855d701585076e6ff25af6647e3c97075b3296a4a7603b32833e147dcd8c42073c67ffa9fff77b2f65697bb5885529ce0fd17e29dbe8e76
 DIST ksshaskpass-5.14.5.tar.xz 21332 BLAKE2B a29b1fc2802925759eaf1b9ff8dec7dd0dddcf67b2093fd6b8a9bccb112264a9f01cbc8b42e707b9782cd3efe9d272ae9ca573e3e084f5a3dfe632d88be52104 SHA512 5517193df92ad868d06bcc8f353bfd38932d0a96d98e6af38d3714478233ea91771cbb7b075e76c133d595812643a0e2fea6a6086be94845a252c215b243b37f
-EBUILD ksshaskpass-5.14.3.ebuild 1232 BLAKE2B 9a8faea2a76e168fd052f95f1f02f3c4537691216c86b9273f00166c6ee992fd2fe46f71f142a994bf0cc04b62da14e111af94deb821bb6ced1078adc149d91c SHA512 272d172e50b43ade2fac038ad57abd105f2c111f3f8b9a67053994602f21959fef32151683e94a692acb91424cf546dfd7f38e0d6bd9cbfea2e65099e5945a68
-EBUILD ksshaskpass-5.14.5.ebuild 1234 BLAKE2B 712c1e67d4fcea410a680e7c2f9bf691a3fcd3786d0f439cc094160c3d8c10704b0c72e47a6f298ccdf688ac2353bbfa8c7c47b90904a31fb37fc7b5190628c1 SHA512 36c7b256fbd075040659162ab3188e864447576f5eff077f249f9a685047dad25ea5171b808a7c6e567f5497433b57f130abad9a8014fb8dfe3fd54efbdbdeda
+EBUILD ksshaskpass-5.14.5.ebuild 1232 BLAKE2B 384105f32ece746a9b671226bdba2f3995201d35e6b7d5bcd356958e01a1ce229b130e331ab486d84166c6812030c8f121785e24c6daa2256e2557fbe2d14a32 SHA512 816c5a2044994783d789f2a7deade5afca6351482701f6c4cdf020e84e2add6d143d0e1c3ffa69d249925d380cbb40e52b9ff324e2ab88d856c48be16b710095
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.3.ebuild
deleted file mode 100644
index 289f7a5ba309..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.14.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild
index ebf909cacf25..b2624391276f 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 4bd9ef06ce77..690383b8f149 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,3 @@
-DIST ksysguard-5.14.3.tar.xz 501720 BLAKE2B b3b4ef98ba78c3c30fa76b6914ed93d5a002b1806fc59ad778b27082eb39acdafb68f815743f88cf4d43a4c10cc2de4070603ae5ee18d93a25e7299f0cd0839e SHA512 aa1d2007ffe0b4ad30e3e54a98cb56980d7666a36c879039952a2e589fe054ee773d3b495fbf3605777ed616e90f6f959ade3768e874f45f44223666b398de25
 DIST ksysguard-5.14.5.tar.xz 501624 BLAKE2B 1d2a19d268653768affce6c746340fc1ab3e5f77cca939e6ec58f9e4285d51bffb0026f65489db54d43799df95983288d6d59d38c52aec2f63f3d668b94757db SHA512 fb04538b500f3d3dd0a3f6fa1a0adf1d3a72e2647bb48eebff8fac2c00d5f3a1de18cf4ea35bb6daa210976514bfe3d8adf8a6785d279535b0e2b4b82f25ba67
-EBUILD ksysguard-5.14.3.ebuild 1142 BLAKE2B 1ae2650c7333856eb2231fd390bf2cad08e44fb0a38fe1a65672c33c057cef95b29da5e66e1cfb50d57017a03d3e58cbb18d5a63e451c0483ed5a31f94a180c7 SHA512 2a16fb1c69e2111accf48b77d5db3b9e02acfd5d56e98cf605fb8362430f2de311d190cee56b3a23af14ec2f146b3935056b1d55f5d87934f3b2953018310000
-EBUILD ksysguard-5.14.5.ebuild 1144 BLAKE2B 25121a3474d3fa43875cb7f0613b19124531a1b59d437a386f1849b6f14b86aeaebf8d408d4c4d938da43746aef5b183c9738192e83ca8c97877d540001401f8 SHA512 736d6b2990b79b2442266cfae71b2eb88e9625c26b4bce9f06490f5324ff7e9c6ee2da5f7e5a5807507eea2b58aab6dde503875867041dc95a19ac34828cab86
+EBUILD ksysguard-5.14.5.ebuild 1142 BLAKE2B 03c5148c869848e145454cca90e93791b321c08f775d5d8bd24b49bafa4480cbb290f20ecfd8d1844499e99ea146e920d29de6045bcad0a20ecb97d6d0d96980 SHA512 f99138d99689281768de1645a4695aa0f4ea840952d86558f08434dfeb93a4fef30457dc1fa6546af37c0c455e95df8fce4a33d67114724a5304fe1e5a2d4453
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.14.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.3.ebuild
deleted file mode 100644
index 580334a6de12..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.14.3.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
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild
index 9e4106a07d7f..55711f6e7839 100644
--- a/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.14.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 b0e75930b103..239b2b6149e3 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,3 @@
-DIST kwallet-pam-5.14.3.tar.xz 19104 BLAKE2B a804e6786cfc860af1c2de17348cb128a9f7922c1399d50fc69382ef139e959e54bde36b8d46f3995b4800de12ea79528a6ef0f3df45d5cf9d7fb4a26b15fc35 SHA512 b6011aa8dbff209e7645f3a6f8ce2c8bc33239bd91c756cc3baa8555f6339f20c7d5c9efae7f5fbb8c85844973b5be28833b513f4432e7cfe39e8fec78032298
 DIST kwallet-pam-5.14.5.tar.xz 19120 BLAKE2B 61d049e49be42028833d60c6da30d31b80d0e3e2842e7ad281c1062d18202116d7044ac8311e8bed5e2f6430eb8e1fdfc7bda24309b322c9ced1eb8f0d45aa64 SHA512 ea841e20bcb948418129d94f938e76b46360c6d6bc9d49b882b6c29997fe8fc5257d245e02f7462490a03d2cc2a49749568a085bec297da4fc7caa8f14acf5cf
-EBUILD kwallet-pam-5.14.3.ebuild 634 BLAKE2B 6b5579b199117b038aca09f3dfe63fca5236898afa0cebd1addcfea6c8595f4dd07be70b4b8502365ee1859e51f1b261603d355bbba1a4347203e52bd78f2c11 SHA512 82b08b8ff6f2a7b946079022df4ad79ba4b91a4e90a148e841573d12bea136a0fba23ed103f519201baa2d0edf6a8c506739e74b6e413d0e92559daee182a02a
-EBUILD kwallet-pam-5.14.5.ebuild 636 BLAKE2B d347de54967d000b6df3f719eceee41ad436a8640afb2b437e5da95436445a6646394447cf05f62ba6038f5c896f439221d30aad8ff00c3a1b6f9fc64b13d4a8 SHA512 7ffd7db3cd9af330ca313de50394841857bc3c679389dd763e9de8a6e6c6dc61fde8b841c42a462518f7ce4cfe8278e074db7108aa8ce80ec2d97114ce93dce6
+EBUILD kwallet-pam-5.14.5.ebuild 634 BLAKE2B b7a4453ca0a2281c350d03c3dfe4582349f4be0fc7f032ecdd9aeb0ad1221940c82fb40c477742aafe397afa06a18296f1ed4691996a032a46b3a97b8590431f SHA512 589b1534f3fa18374f32d77c573782c160db1b71f410b46a5e50fdf2c6f65a86deffcd6707ad35027c8ea50598047a6ac21e87d75ea21e19c2d7e45ab01e5928
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.3.ebuild
deleted file mode 100644
index d697dd6f9f45..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild
index a3318b9c7b11..5f466e7bb74b 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index a709707e0a05..86f7a0811b3e 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.14.3.tar.xz 18812 BLAKE2B 8eaa74c417dc2841b54e1ce2e2c6dda5328bf584e6b103527932709fa737cce91359f0a5255b5d01f8d234efef02bf07c97e5068c18af35dfe2845b34e196fcb SHA512 844dfd0ed6568a18b74e86752a636e216e0198203bbf51c0061b9fdd0a16c974d1bb0bbdb728ace53c6e72a0f5127b4bd90284b71983c323d093f5a54919a6da
 DIST kwayland-integration-5.14.5.tar.xz 18704 BLAKE2B 56669ba9cc8644aa1a613bc35756c317809889494e0b033b805e91bef9fa4b4721e91a5f2a108f314fa6f6b62fd12d5b96d7f912612b3a6c4836ba54a56a1838 SHA512 0e0d5ba23c8e9417160f985298e71d3693b01c5cc1773a0f9c9f173e14ab568b1701ec23daf8e07e95666ac3a680eb8f476eb0e96b6d89aa6f4f761e52704b20
-EBUILD kwayland-integration-5.14.3.ebuild 548 BLAKE2B 9d8e2af5fa2566b48ba28ca4b33afb3aa65aecf7a1037e0f4e0862dd3987908a7ae7400c4afc7d7583ce4e5498992117fcad0d3738f82c84f61e5597cefd061f SHA512 86269a21c856102cc3a28e8098f90b9aa9b718927b0e606ec3b3e70c35a2c49b36bed0c0531fcf45a7291b1636017feaf51e120898bc0a63264367cc3a5db0d4
-EBUILD kwayland-integration-5.14.5.ebuild 550 BLAKE2B f5e8ebd5f0c3191442399d8fa406d3ae6c98bda9fddeebd264015ac7f8c1674a2176975d56d607f84afdb8d7a772e88a8fa126878f533d6ff88aee4beed51208 SHA512 6cb4461dcb63d8eba0868c0a1b553c6587acdfbd55d0b9fa46500b0c9d593453cd6e89a1a6c8529fb10213a21b91e23214844f966f270790bed461dd9318341b
+EBUILD kwayland-integration-5.14.5.ebuild 548 BLAKE2B 4d43a74f700048b87f09845b01422153c398fbfdd9f678c0bff901bf07e31bb8fc6506d7f20a1f53e0fd0e9e7a5c3240713046c9be10ba98bb1f7c8779e13d8c SHA512 d424dba0b3f74c95b86dbcfcd442726ea62ad505cf0a184d073f277166642167ec7d253563a3be55f7ccf265593ea82b7ddec4f911e316b4d10c2cdea3c9587f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.3.ebuild
deleted file mode 100644
index 820f2cb611c8..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.14.3.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
-
-KDE_TEST="true"
-inherit kde5
-
-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 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild
index 84eea10a2ba0..30e3e9e259b6 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ea08b2931562..c9224f28b74f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,9 +1,4 @@
-AUX kwin-5.14.3-kcrash-init.patch 1364 BLAKE2B 56420c52d5c1fb8fb4e7ea2a4f41112d99443bd69d65d5246a4c42520251126a4413d5589d9899e643a04c505033a05a3c46477f6c414a7fb2a86093f5112abc SHA512 069229bb1c9eb1562d907553d0c06644cbd940b1ec33d93d0722238a590f7aa44a05b45ee98657084f59c156e1be036db2d1997ac191e0d4018b95eea4652040
-AUX kwin-5.14.3-resizewindows-crash.patch 2671 BLAKE2B 8be2d2d0a5e28a550c3c01f00673a11d916b5d52d92e072d38301881a4787788a6dbda3897f921921edcd0f24243dc916b08689b0f3ff6339f3411773f710dbf SHA512 522fd906ccec2a2b6cb025060f6be45d263295a75fef53549ec43fcf083346ba1e7087091604d9a531023f2d1f7323897cc252e5f30fd6fef9147aac18c3b387
-AUX kwin-5.14.3-virtualdesktop-crash.patch 4668 BLAKE2B 6f405123b019d45b76dbabe4e114cc02c97d1cc9776119828b87f292b6d21b238074d04bc7ca0eb473ea4675d38fa9926a94c9247b8eba1ea5ed581b3e6c75ad SHA512 4c4914cbec8b45212346c5ce58338189ffc035e490cfd6173a4db138eb36011fcf9ff61899b9f057df5b460e83f74776065f8c45cf4bf3f6c599410740190027
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
-DIST kwin-5.14.3.tar.xz 6573740 BLAKE2B 53d80cf2e2bdb8b74421badddf2c3c7620ddaf337a8f91239c5de8a74efb7c3f4cce1bddda722a93f0d5a89e7639015b3207fb3b5ef483be2781ca742f742d29 SHA512 4ba7a6cc02c1a5e94f4d08c6c72968ecf1e1c72fb9f047e2db014a525d3f6e30b8e16d1dc2043f077e3f63b67362355c456295f7962e1661d667c01e0b22626c
 DIST kwin-5.14.5.tar.xz 6563208 BLAKE2B 693f82408352a17e97fb1fd81ac78a2c14e7e417347fab4028df0bb6f30e0fc7e0bd976fb90c9e441b98cb9ab00aaa1e1c39087baa76a532fc4a575aedc656fe SHA512 b098d131bb2117c6f96950b14896a60e46d3de858ba537e91890405d10e40e20fce26644dfb55d8b01136c8a8f4c30d825beaaaded9be49aeba1b70bfc945546
-EBUILD kwin-5.14.3-r1.ebuild 2775 BLAKE2B b2839b1baaa70ed7758aa8842ae8df4ab8c89336f7e15566b77bdf89edcb2f8635bb8d9fe8262b9d2157f71c38dbf97df30bf1f9bb46d30a18c70b795e54192d SHA512 8c49a9e496e3a8bfc33d1cbb1a146efd54a27ecc264e0130d2fcbdb3a9f8395f2453c50ae331976439c8389e2204ac2407f04699b224488911bdd08eb52cd019
-EBUILD kwin-5.14.5.ebuild 2633 BLAKE2B 3a9894bb818f9a8d04f99574cceee80be1fed3740286d06273607d9a0d91756e7902521eef8339ced4b3fbe897dfbbb406bf2a325cb9b268a77530292010cf0e SHA512 05944e75a255ef24fd902d738d0a398f51b1c8a4ac43775df6f5c4a6e44e09929805b1693c5aef7aab1ff591f2459c5969cb2774cad4549a1a10228004572ab0
+EBUILD kwin-5.14.5.ebuild 2631 BLAKE2B ec6a629571e836bace0dd0ceb688c13292d2a837d24461b8f732f05f74e75e2dd9c0a72cf3c2b947d8b1e55223cc9e9b0b4a0f41c545284aa6d7f8fa49c02936 SHA512 16e1b663f4d2db687e46031f046365ada6dc2f2a4dc8e5d1573fffbe12bef0106aaf6b2ee50c677884f0624485c087f860d08cff1a6a8b734e36dedde9a8f1d7
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch b/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch
deleted file mode 100644
index fc9c3007f840..000000000000
--- a/kde-plasma/kwin/files/kwin-5.14.3-kcrash-init.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From aace9b1675819feab81d50f694391c7d854d9822 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Fri, 16 Nov 2018 12:50:53 +0100
-Subject: actually initialize kcrash for xclipboardsync
-
-Summary:
-to successfully use kcrash when linking with as-needed (which is a default
-flag on many linux distros) one also needs to call KCrash::initialize.
-
-https://markmail.org/thread/zv5pheijaze72bzs
-
-Test Plan: builds; correctly links kcrash
-
-Reviewers: davidedmundson
-
-Reviewed By: davidedmundson
-
-Subscribers: kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D16923
----
- helpers/xclipboardsync/main.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/helpers/xclipboardsync/main.cpp b/helpers/xclipboardsync/main.cpp
-index 2f06e9c..1a5e5ee 100644
---- a/helpers/xclipboardsync/main.cpp
-+++ b/helpers/xclipboardsync/main.cpp
-@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
- #include "waylandclipboard.h"
- 
-+#include <KCrash>
- #include <QGuiApplication>
- 
- #include <config-kwin.h>
-@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
-                 argv[0], qPrintable(app.platformName()));
-         return 1;
-     }
-+    KCrash::initialize();
-     new WaylandClipboard(&app);
-     return app.exec();
- }
--- 
-cgit v0.11.2
diff --git a/kde-plasma/kwin/files/kwin-5.14.3-resizewindows-crash.patch b/kde-plasma/kwin/files/kwin-5.14.3-resizewindows-crash.patch
deleted file mode 100644
index 37963c8395c5..000000000000
--- a/kde-plasma/kwin/files/kwin-5.14.3-resizewindows-crash.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 406b70b04e093c13faf763e2d885797ae037d806 Mon Sep 17 00:00:00 2001
-From: Vlad Zagorodniy <vladzzag@gmail.com>
-Date: Mon, 12 Nov 2018 17:45:14 +0200
-Subject: [wayland] Don't crash when resizing windows
-
-Summary:
-If you resize a decorated client by using the resize user action(press
-Alt + F3 > More Actions > Resize), then KWin will crash because it gets
-stuck in an infinite loop (AbstractClient::performMoveResize <->
-ShellClient::setGeometry).
-
-Here's how KWin gets stuck in that loop:
-* when you finish resizing the client, AbstractClient::keyPressEvent
-  will call AbstractClient::finishMoveResize;
-* the first thing that finishMoveResize does is block geometry updates,
-  then it does some clean up (e.g. reset the value of isMoveResize(), etc),
-  updates the geometry of the client and when it's done, it will emit
-  clientFinishUserMoveResized signal;
-* when PointerInputRedirection notices that signal, it will call
-  processDecorationMove on the client, which in its turn will indirectly
-  call AbstractClient::startMoveResize;
-* when it's time to go back to AbstractClient::keyPressEvent, geometry
-  updates are unblocked and if there are any pending geometry updates,
-  then ShellClient::setGeometry will be called;
-* ShellClient::setGeometry will eventually call ShellClient::doSetGeometry;
-* ShellClient::doSetGeometry will call AbstractClient::performMoveResize
-  because AbstractClient::processDecorationMove indirectly called
-  AbstractClient::startMoveResize;
-* AbstractClient::performMoveResize calls ShellClient::setGeometry;
-* (at this point, KWin got stuck in the infinite loop)
-
-This change swaps setMoveResizePointerButtonDown and finishMoveResize,
-so processDecorationMove won't indirectly call startMoveResize.
-
-BUG: 397577
-FIXED-IN: 5.14.4
-
-Reviewers: #kwin, davidedmundson
-
-Reviewed By: #kwin, davidedmundson
-
-Subscribers: kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D16846
----
- abstract_client.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/abstract_client.cpp b/abstract_client.cpp
-index b4628f2..ed72b9c 100644
---- a/abstract_client.cpp
-+++ b/abstract_client.cpp
-@@ -1457,13 +1457,13 @@ void AbstractClient::keyPressEvent(uint key_code)
-     case Qt::Key_Space:
-     case Qt::Key_Return:
-     case Qt::Key_Enter:
--        finishMoveResize(false);
-         setMoveResizePointerButtonDown(false);
-+        finishMoveResize(false);
-         updateCursor();
-         break;
-     case Qt::Key_Escape:
--        finishMoveResize(true);
-         setMoveResizePointerButtonDown(false);
-+        finishMoveResize(true);
-         updateCursor();
-         break;
-     default:
--- 
-cgit v0.11.2
diff --git a/kde-plasma/kwin/files/kwin-5.14.3-virtualdesktop-crash.patch b/kde-plasma/kwin/files/kwin-5.14.3-virtualdesktop-crash.patch
deleted file mode 100644
index 4e480a06be8e..000000000000
--- a/kde-plasma/kwin/files/kwin-5.14.3-virtualdesktop-crash.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From ad28da84e78c7eb7ff1e608c4819707b2142daea Mon Sep 17 00:00:00 2001
-From: Vlad Zagorodniy <vladzzag@gmail.com>
-Date: Mon, 5 Nov 2018 14:59:42 +0200
-Subject: [effects/slidingpopups] Don't crash when sliding virtual desktops
-
-Summary:
-If you switch virtual desktops while krunner is sliding in, then
-depending on whether your distro strips assert statements away,
-KWin can crash.
-
-The reason why it crashes is the sliding popups effect tries to unref
-deleted windows that it hasn't referenced before (if there is an active
-full screen effect, then popups won't be slided out, which in its turn
-means that we won't reference deleted windows). So, in the end, the
-refcount of those windows can be -1. That triggers an assert statement
-in the destructor of the Deleted class, which checks whether the
-refcount is equal to 0.
-
-Popups are not slided while there is an active full screen effect because
-we don't know what the full screen effect does.
-
-This patch adjusts the sliding popups effect so it stops all active
-animations when user switches virtual desktops or when a full screen
-effect kicks in. We need to do that so the effect won't try to
-unreference windows in postPaintWindow.
-
-Visually, it doesn't look quite nice, but for now that's good enough.
-A proper fix would be more complex: we would need to make sure that
-full screen effects ignore sliding popups (and also maybe docks) and
-perform some input redirection.
-
-BUG: 400170
-FIXED-IN: 5.14.4
-
-Test Plan: I'm not able anymore to reproduce bug 400170.
-
-Reviewers: #kwin, graesslin
-
-Reviewed By: #kwin, graesslin
-
-Subscribers: davidedmundson, graesslin, kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D16731
----
- effects/slidingpopups/slidingpopups.cpp | 22 ++++++++++++++++++++++
- effects/slidingpopups/slidingpopups.h   |  6 +++---
- 2 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp
-index a104a5c..066b2a3 100644
---- a/effects/slidingpopups/slidingpopups.cpp
-+++ b/effects/slidingpopups/slidingpopups.cpp
-@@ -3,6 +3,7 @@
-  This file is part of the KDE project.
- 
- Copyright (C) 2009 Marco Martin notmart@gmail.com
-+Copyright (C) 2018 Vlad Zagorodniy <vladzzag@gmail.com>
- 
- 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
-@@ -53,6 +54,11 @@ SlidingPopupsEffect::SlidingPopupsEffect()
-             m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_SLIDE"), this);
-         }
-     );
-+    connect(effects, qOverload<int, int, EffectWindow *>(&EffectsHandler::desktopChanged),
-+            this, &SlidingPopupsEffect::stopAnimations);
-+    connect(effects, &EffectsHandler::activeFullScreenEffectChanged,
-+            this, &SlidingPopupsEffect::stopAnimations);
-+
-     reconfigure(ReconfigureAll);
- }
- 
-@@ -434,6 +440,22 @@ void SlidingPopupsEffect::slideOut(EffectWindow *w)
-     w->addRepaintFull();
- }
- 
-+void SlidingPopupsEffect::stopAnimations()
-+{
-+    for (auto it = m_animations.constBegin(); it != m_animations.constEnd(); ++it) {
-+        EffectWindow *w = it.key();
-+
-+        if (w->isDeleted()) {
-+            w->unrefWindow();
-+        } else {
-+            w->setData(WindowForceBackgroundContrastRole, QVariant());
-+            w->setData(WindowForceBlurRole, QVariant());
-+        }
-+    }
-+
-+    m_animations.clear();
-+}
-+
- bool SlidingPopupsEffect::isActive() const
- {
-     return !m_animations.isEmpty();
-diff --git a/effects/slidingpopups/slidingpopups.h b/effects/slidingpopups/slidingpopups.h
-index 821640a..32e8fb5 100644
---- a/effects/slidingpopups/slidingpopups.h
-+++ b/effects/slidingpopups/slidingpopups.h
-@@ -3,6 +3,7 @@
-  This file is part of the KDE project.
- 
- Copyright (C) 2009 Marco Martin notmart@gmail.com
-+Copyright (C) 2018 Vlad Zagorodniy <vladzzag@gmail.com>
- 
- 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
-@@ -49,8 +50,6 @@ public:
- 
-     static bool supported();
- 
--    // TODO react also on virtual desktop changes
--
-     int slideInDuration() const;
-     int slideOutDuration() const;
- 
-@@ -62,6 +61,7 @@ private Q_SLOTS:
- 
-     void slideIn(EffectWindow *w);
-     void slideOut(EffectWindow *w);
-+    void stopAnimations();
- 
- private:
-     void setupAnimData(EffectWindow *w);
-@@ -81,7 +81,7 @@ private:
-         AnimationKind kind;
-         TimeLine timeLine;
-     };
--    QHash<const EffectWindow*, Animation> m_animations;
-+    QHash<EffectWindow *, Animation> m_animations;
- 
-     enum class Location {
-         Left,
--- 
-cgit v0.11.2
diff --git a/kde-plasma/kwin/kwin-5.14.3-r1.ebuild b/kde-plasma/kwin/kwin-5.14.3-r1.ebuild
deleted file mode 100644
index f777d457ba17..000000000000
--- a/kde-plasma/kwin/kwin-5.14.3-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel '' '' '5=')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime '' '' '5=')
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=' '' '5=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsensors)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=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 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtvirtualkeyboard)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-virtualdesktop-crash.patch"
-	"${FILESDIR}/${P}-resizewindows-crash.patch"
-	"${FILESDIR}/${P}-kcrash-init.patch"
-)
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.14.5.ebuild b/kde-plasma/kwin/kwin-5.14.5.ebuild
index cfd36c06b840..f743c744651a 100644
--- a/kde-plasma/kwin/kwin-5.14.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.14.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE window manager"
 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 2a50250c9fe0..66464c6c6308 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.14.3.tar.xz 20116 BLAKE2B 62857079674003d4f2116532bdd38efa543e3b7e3450498dddcfddf2c69640e0b4c582d8175effccadb80194a56187632f24d066194ef709400bc771e04d86bd SHA512 ed39586685b8f1dc7acda6b8de88fe3d68abb613bd0b4574f4994dc177f29ca696989eae3a8c2c249bc2386761f836a43c5b9cf7d5768f1a80b0907e95635759
 DIST kwrited-5.14.5.tar.xz 20000 BLAKE2B 220f600b92f5e1190a415ae6eb4a934813059bef2a2d7cade9fcb2690d2eba26c2da551c0d59a351cc3c3f0e95a9e11aa62fe0a046c9a4cc3e25fec8e8451006 SHA512 4b4274b05f4dfa9b178c7446784889ee63a9ba0f84ecfd26c3f465d3f3ab54b91ee3373f0ca7d2e4be81f5d46704b36ce8406f0df3d6e523d9d1d59db50b3b3c
-EBUILD kwrited-5.14.3.ebuild 498 BLAKE2B 0db3fd21597e047f00139c47ed86fe95edd619297a8978fad6d8fddda42b77ef8fa789703b01a068095e732701ac898a9ba67652335be701bb733901ef23775f SHA512 948320270ed0b36200342fd010548a9d15e6ee9ae36c352f708f2d1c3ed0bcbdc1ce33568d2497e00aec97302ef166b29ca9ce95dabc8cebf644326905ba00e3
-EBUILD kwrited-5.14.5.ebuild 500 BLAKE2B 955ff614adc3e5b4aa13a1c0008aa598b57611d0637c3318b71873eb8a62b27a43a32aa4290521759a4d575bd2f025bd2b69fbaebc0c02b7eb579dfce2264965 SHA512 4f2050eed9941c4dd48a8dbef16beb5114159c08c9056ddd48aee186203034d6db01f5488cb0504a4167a7fdfea75c02620d8350b22e72e73ab15df43826285d
+EBUILD kwrited-5.14.5.ebuild 498 BLAKE2B a75a620f219dd95a00be437de6d349d76fbc0823e7b0f713e9704fd36653bf962dfcbc686f395b11abf0d195ce81739e6f07a406bf8f3eb8f032524d22f8ed05 SHA512 789a146dde6ed4218d2f742b12b660a25e16fa750f575618557b5bc02b9b33fce5c2bef72d56b746cd361b8fe58f2f6314bcf2bb52821d4c227afa7beb0dcfbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.14.3.ebuild b/kde-plasma/kwrited/kwrited-5.14.3.ebuild
deleted file mode 100644
index baaf5642cc7f..000000000000
--- a/kde-plasma/kwrited/kwrited-5.14.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/kwrited/kwrited-5.14.5.ebuild b/kde-plasma/kwrited/kwrited-5.14.5.ebuild
index c0f34d667fd7..86e908f9da0e 100644
--- a/kde-plasma/kwrited/kwrited-5.14.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.14.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 3b37323f3e6c..c93cacf1c887 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.14.3.tar.xz 80060 BLAKE2B 39014ab27f0ef6ac9c7e24785247b8ae3307f306a0375996193ce457a126ffbe8bc22e0144cefe71a01242be4a147d3bfadf39bbd0bf5f691ac6ce15bc6500f8 SHA512 c909291132e362f8408f0696f08d3fdff70d56ab8d128b68d4984626d1bb19f274cb3b84f08e2af7c0c0fde3eaee12689c1aa9a5fa267406b51d1d2d02a82d54
 DIST libkscreen-5.14.5.tar.xz 80124 BLAKE2B 89d2925fce1acb267cde70b231ae0a6a5b01aaa64e323751ee4ee4ad0d2eda1114ff582c0b1ee7c8c487fcab8597ecd60c8303c628e768b32628dd51a2369c39 SHA512 de83b98771548e96a2addfd9426624f47d3000e328ccb78011b6b7c9f8f9004c66954eb16848f73cb779cebfa40d7aeeb13fc98ab4b4f8966dfd88ccfd475276
-EBUILD libkscreen-5.14.3.ebuild 516 BLAKE2B c4814c20f3d693deb2f3288e9ec00a75162bc897b6ce9f58d7b2ad42bf214a7843c014c8fb933f087e5a5bc8ed7600678613f351f97cd2b3cf0bcddb3f2dbeb8 SHA512 5fb6ded81474cc36423c509fde791ea5f6abd73ed5dad178ff685b41c5d940bf29913e0d553540b76c67bb9a9a91cc4e62fb8743f4056fe667c9d6b6b73a9610
-EBUILD libkscreen-5.14.5.ebuild 518 BLAKE2B ecb3a28a648a64b73a65dec37c71e43f00718ece99e6a8c9dcbf554782e2f3aac496849c29a835520cc2b69a1ac62a4208e445d652e0e06034f74a3dabbd05ee SHA512 d5254eea98088f5174028a7f7bfca21e62b1e116e14567cbb54bebfe5ba964f288acbe3d63cf82dfc875e9101bcfa065ffb64b67f351167f5b4f8ff0e1c4a00e
+EBUILD libkscreen-5.14.5.ebuild 516 BLAKE2B 560a57337fe4774283b5a207c7813da984e7a4f3762110c969ac396af8f6923f54d421391bcee3f5bc8823bf709f3f18eecf0d4de26978284e5191c021b83d44 SHA512 a2e62850c6b4198c89079a38107370b19ba9ce00c2b1fd3c3f9f507c27bdfeff78b6b94d15542576a064c99faeeed580490836eb1166bb8f5c272d6ddd93264b
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.14.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.3.ebuild
deleted file mode 100644
index e59a71299f96..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.14.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild
index 251cb60bf63d..ab6efb16b768 100644
--- a/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.14.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 07ada51fc3aa..2e11fdf2eb9c 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,5 +1,3 @@
-DIST libksysguard-5.14.3.tar.xz 576328 BLAKE2B fa10444f1c08f1ba70f4fcd32591714736d2fe7982685c705e90f662c402ad5194edf00b1a6ce425bf8b25f5d4a91a88092408b3cce2ae6a40b49d13805cca7d SHA512 b561ad796ccf290176d116b8c5c9845d07a76e3f089bf578cf4a9cb2ef323dfb848c5011d084da0e3f548e3d92b57c732db0d4c93b79b7aee5085d8df2516467
 DIST libksysguard-5.14.5.tar.xz 575532 BLAKE2B 2977f15fd038cb270c0ae3d171b5c9d0cf1bd4ef726ef6d66495a30003f349f787cf0520bcc43561fd72b022253406a4dd7baebcc59da76fd71ab21094758370 SHA512 42a5fed2abd28a08c4926513ff950be9a672423078017d2e71aa8dba5ccd80b522779a76a403e5baa0434bd547028289a715b1764fdc2166ee27c95981249ea4
-EBUILD libksysguard-5.14.3.ebuild 1216 BLAKE2B 8601dddd670306841db2a37eaa896045c9d7ba65e3da1c29990ca6d24a37ef9d871e921dd68db93918282e5bd6bd50c6f52a7a1797532f79efa72224a9cc7495 SHA512 43856ca403522dfa273dd04c464ef3e83e731005d984bca9bc9f2ad627dfefc8b0d701d5497bd347c4eced8d25e37f7065058825bc9806f670b9d79cf59e4238
-EBUILD libksysguard-5.14.5.ebuild 1218 BLAKE2B 4727f63b097ec34d957647fef8fa3bc844f5126a30a6c03c7d73393c50999c9f143442d69ebbbcb03dc3b2752741c85f382a9643ac0a7af5db4e9609c384c66a SHA512 4059a8a9d9348a6f6237ed42bce6c709b4b964a3418db797a38df760d916144183351a4ff18277b7cd6f034aeaeef8fdff28900e2a61f3c94aa2c6e13e9ee25f
+EBUILD libksysguard-5.14.5.ebuild 1216 BLAKE2B 1dca642b38398fd81a540867919fbb1f735434d4d6af8fa2cf0444168369d557271bd695ffbe2a9b7eaf77be1e6e4442561f4060b96a468e50445cf3ae115a5e SHA512 f03485a1e4f28f847d91882c5446fa0269cd831b72452b7f07c65b22982e0e953c8606d5bb334a09c904d00855d0c416cd042678f3078004f4239a9e49922bf7
 MISC metadata.xml 373 BLAKE2B 63fe12e91ac593fed3eef538f3fd765b880de105bdd2fd839bd6cc5cf01f811a57391f0397962d2b22ec69a7b408aa9b6a8060d40f3aa3d5a003135d9b58c5b9 SHA512 26110007d8a82dd742327178c9aa0dbe40ed1ef47b46e6ef62d2cd5d53f25d6d95a56052f5dd4247a583f25a794b5d2f4db56ced1742857dfbe55b31397c3e7c
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.3.ebuild
deleted file mode 100644
index dfc1b942bbf9..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.14.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="minimal webkit X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	webkit? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild
index c576277702ae..c57d3ca36023 100644
--- a/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.14.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 webkit X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 521865978a0f..c2558c530687 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,4 @@
 AUX libkworkspace-5.14.2-standalone.patch 3399 BLAKE2B 3e36f83f6112f00fa1864759ad5094450072df9aa726d88b102fc5694a1662b0b62d1cf7361ef08c9070439a581b40794e14cd2d17e85399d1cacb788f44ed8b SHA512 d2cfde759df79776daec10a8108e6bd20c89f94db8eaeebac23844a9240f08c8e53254905632f100b4c31f48070162de1736109d05f8abadeba71f8124662a2f
-DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
 DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
-EBUILD libkworkspace-5.14.3.ebuild 1444 BLAKE2B 2ab401d104d4021f12ff6819d1cdc9749f24d224e1e712f9eb7c662dfb41eba36f8695ff4784567b8b7c6fc2d30ea2bc2c1ba9f5336c00a01dc975acf59bdfc7 SHA512 8cf30d752255475838f74f6088de9686338b7af5d1ce1a57d25e11119274a8f7e63004dece705fecc5f09aa18ecdf3e7a539ddd5c28a119e1fb7f25487767f94
-EBUILD libkworkspace-5.14.5.ebuild 1446 BLAKE2B e8dfb07f9fc62484f2c11843cbc3c82040d2901a8dab77bb1820136034b2201e1421dee0c1fa5c095cc6148caa8e5c28923a4011462871bd52d3185c104f90f6 SHA512 c1aeda5be12daad2811136eb0cb305e140896d80857fdeaca9e7fd63c376fdeeee7c867a67a461286891810f56aef16790c472ecce8aa8c955cbbdf1ba8b21f9
+EBUILD libkworkspace-5.14.5.ebuild 1444 BLAKE2B c4f3e846adb30e8aeb3cdf77e78bcc178d220b7deed01864912c8b3e5e5c8f1a2937c54324b6a557b09327816b3d279625a7136a58b4a222564578d19dfb9567 SHA512 10b6e36b6c70663e61d6ecbb5638d9ca5d43a3684ea0d3e945a8299e6163126e105e5916ac73640f4cb6bedbab3e8ce53fd794bce95b079196917c88fa1ffabb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.3.ebuild
deleted file mode 100644
index 59a41868051c..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.14.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.11.1"
-KDE_TEST="true"
-KMNAME="plasma-workspace"
-inherit kde5
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kwin)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/libkworkspace:4
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	kde5_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/${PV}/" \
-		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
-		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild
index 88f82bb097a1..02cc79588f50 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild
@@ -11,7 +11,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 3c4f7613c2e8..eda5853d732a 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,3 @@
-DIST milou-5.14.3.tar.xz 57924 BLAKE2B f7dc799dcab3981bcefc488fcf1e221e450d45f5c706a595e86ee58db26c8bee9aa0a090f75c8cdff895a64280aeed1e962537a9e34f5a1142f0b3bf574e6070 SHA512 3ede4995eb258e15aeac4b87a8eab5502abfbfaa921f1a1c3414329b79ec3cb65c916b37313e5bca398a1e8ca8347919c2ff464b74b87834f2dfa6b943950775
 DIST milou-5.14.5.tar.xz 57628 BLAKE2B a3882d48a71d86a60056c25b991ec629ff23be7d2fd7f756faa84eb50ffb52d0e77231858e8bcfff0660b36806af5a295025eabf98330620b25fb22efec2240a SHA512 ed77a9550df216bf6a62ddc5af4c9d73a2a453a12f927c8964465eef8d4e60c1ac870e8e59215a0e0c288caf40f5714c904dcb9daa2054de94329fa781c1294f
-EBUILD milou-5.14.3.ebuild 689 BLAKE2B 9faf782e98a3274aa1fd218ceacaf0e989a8cf664a9ea829d4bbd30f0f9fef519ff8903b3c392f438549e738b4b9f9f8c96a61cb53607c72d2d5a62738814167 SHA512 fe2cbab7a6140410fe09753562da399ee96a8bbbecb45df55d4f5d2a2492246a63696b310247e223ed493846745da5cfc1667289b3c53da7273efca74f397855
-EBUILD milou-5.14.5.ebuild 691 BLAKE2B 758d309dcd632bc067a80f6987628c377311f273d83ebe92bea0cc0b23888391d5b9a0527307bdd578da15948d7ad661da2c653076ab37cfe2ed55a4affe34ff SHA512 00fc10627aa42564a3bf4a6b40d6705006495ab114616437ca7c00b80b0c38c750ba29efa56bd9cfc09336882d004c9d453fbb531476567babca5f48082825a6
+EBUILD milou-5.14.5.ebuild 689 BLAKE2B 4c0f20fad2b7f5fb86284f33cf14c4f7372303dcb6171bc6ece194ee497a46c74a5d27febeab025131fe3d032be0ab109fde819942c8efd3621222836ed187fb SHA512 4762dbb3aff42ec891f1eabf5c5f326cc0c7340717e7fd4d743d9310f6acab041cd0a7a55fef759aef759522f67f58dc92016608c957f913ca7e99fb2c81707f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.14.3.ebuild b/kde-plasma/milou/milou-5.14.3.ebuild
deleted file mode 100644
index f4c684bc08f6..000000000000
--- a/kde-plasma/milou/milou-5.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
diff --git a/kde-plasma/milou/milou-5.14.5.ebuild b/kde-plasma/milou/milou-5.14.5.ebuild
index a07cff567f93..be18135698be 100644
--- a/kde-plasma/milou/milou-5.14.5.ebuild
+++ b/kde-plasma/milou/milou-5.14.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 ccc6e8f1ca7e..97db51d950b2 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.14.3.tar.xz 4479292 BLAKE2B 5c1a0c9b3abd7c5823081b7a1b69d510ebab297a9573c066285107ebedeb23a1eb7ccf6811e11322278d5f4940dfa7ff5273a59610f7ec97883b3e4100f74516 SHA512 9ea74fed0228d9431cef6e51fb24a7c59c4070055ae10ee87b25c04b01c7652df97bb7f09b62402cfa71ad27936905b9db3a1a69f73710f40683c5b33a302336
 DIST oxygen-5.14.5.tar.xz 4467780 BLAKE2B e43f1663f16f1c0886f43ced1c8382254144eed256ad80e4c9eb025a11c1e4cb5f3a543cc61f3ae7dcf30f6519ce4857ae1ddffda607b411c43b404504c9faf6 SHA512 b4cab5dbce0828e7a080cb458b00603ddebf9bb4ce5fce9ccf07a0dcee030ee268b9a6c53592035eb15251edb4ccf14dcf0fa921370f76d4cbcca355400d479d
-EBUILD oxygen-5.14.3.ebuild 1126 BLAKE2B f8b7d7d2c24bf53b4fc84e0344bfe0c216082fbe93c0589e0700262cdc3a78fc7545624fbe09899488e6e4ee392d9ac00a0c54c40e31a4bccaba778bbe04ee1f SHA512 6bd1874df00cf07a3a3bbe5394b38fbf3eef8de9186fed427fc169bb60e2a1c5497d268318285d8e28763aab1a0c1321187a55a179ff9b3cf26243948734c71b
-EBUILD oxygen-5.14.5.ebuild 1128 BLAKE2B d2b042b4b54dfbc2ea4532c56ffb01ac7cb92dc10fb0b530eace42cdd91c5db10779fdd39609eb5ca4acd66e0afbb68c060446d40fc7c3199318b766175247cf SHA512 0a2be80a403ac0bcad6061247b24be0266c8a6ad6cd53a3e1e759427d4e9fcb5c8a5393472efed8206e9828a47c8ecbd9e9c4313cdf26ea5341f3dc15b2af814
+EBUILD oxygen-5.14.5.ebuild 1126 BLAKE2B 8b7e3cc4ea31d8e84eb7bc981660cb53a820221b2dd40706c8c85176374c3eac840ecaf23a7801de5d19eea7a1070e8cdad9270415a3e287b87b0168f1d364c5 SHA512 41b6043a878d8d6dfa34fb24cb83040a3942eb46aaefbc5359b10be19a02660bc8de53ff825d2767f1bb9a7754e53ea2b2813dd8c5562b9955195b0e9678d02a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.14.3.ebuild b/kde-plasma/oxygen/oxygen-5.14.3.ebuild
deleted file mode 100644
index 391fd848726e..000000000000
--- a/kde-plasma/oxygen/oxygen-5.14.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kdebase-cursors:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.14.5.ebuild b/kde-plasma/oxygen/oxygen-5.14.5.ebuild
index c1c4116f67ba..d19f9a95c807 100644
--- a/kde-plasma/oxygen/oxygen-5.14.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 81be1f382d49..098a6f38bae1 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-browser-integration-5.14.3.tar.xz 109220 BLAKE2B e91a246576ca1ef92098b44204ab7e4622731759eb9657608cbd0dcd83cbd51768009b677cacc8129fd6268341bc4c8893f92b1613f45f579e601f5b732691c2 SHA512 e2fdf6d2a6a84467f8f17e3d498dab8f27ef6167e913ae28723bbf7aaa21f61a549cb88e102362382dcbeb420b305163484dcd2b01fa476182da2fa37d1b83fa
 DIST plasma-browser-integration-5.14.5.tar.xz 109844 BLAKE2B f9461ffffc3c8427154ba6f2a8d75c53be5569b5e7ed42638f411f7006dc3d7c7da89f170309ed73ebde073a40d025ecaf979c09f200d44f9cef737a53496308 SHA512 d1f607fa02fc2a1f609c1f8dc12f84d820f830451765e665dc1b7bd94e2f366460d12298b6458b8257f418f02cdd561c90e5d811839a5ef1554269d3691e4a72
-EBUILD plasma-browser-integration-5.14.3.ebuild 783 BLAKE2B 11695a608f0454350bff1806c6752e4534c512e4cbf180120723ece5ed4e0ea7f069ce03aac284d56459f590561030f9c21b95670e1f554eeaf9e60cfdcf5898 SHA512 d81d285e60124d22f2737e398cb864a8c19a13ce33ccceeca580bb2520c631bf59594123838e3b40087bb049a6be72dd87ba8fab248345c3e0f4cb2631d21e41
-EBUILD plasma-browser-integration-5.14.5.ebuild 785 BLAKE2B 8e313dc2f50ae203d6478057faed4f013a4ea909ac27f73d0bba4d397d7da924566774ea1a9629151d1972c40368646bcf720c12ff41b4665f717aba97fc5695 SHA512 234146fe5bbb2a1717d88060534f6153b2b1f3260736c956123b552f696f8f04d8b89d4fab95732d98be4d4ed140dce737110fc03a5bce412804b24e1b68a927
+EBUILD plasma-browser-integration-5.14.5.ebuild 783 BLAKE2B e9af4632320246402a3e117800f1a325f78557862ca9f86d211edaa792ae5e85d102de4995e44e487320af70c60129ee717c78197a55fdf5ef0757a4268d5f73 SHA512 f6b66c45c83aa643da90f3aa986fedd35853a05e3db066318033938094f90c1120cb1b3df4adb3522d223a9d62a732869294126db4b15ace68f350495f93c5fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.3.ebuild
deleted file mode 100644
index 35b5bd254775..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild
index 40116d1cdb36..f27ae0900799 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8e03bf1db863..20f9e72c97b0 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-desktop-5.14.3.tar.xz 9141312 BLAKE2B f6be5a432abac3835b7a6102a755f7bfc8809ef851c498ecc57ca2026fadcf7aebc2cf5c4e8b11198551cdaca04eff0607fd0d7ebcfd47a33fb4fd739e1eaf42 SHA512 52ce17321a0dd153446e9e334102ab2f6579e84595c53641864a660969ae410272f4762b345397fd00e9f6e936ce097e179d0b69a62341fa97b7b6b0b1ec38bd
 DIST plasma-desktop-5.14.5.tar.xz 9149560 BLAKE2B 09e65ddd964f250ae7f82c193eed9161856a3bb6f2dbe34dc7b52dc54f614c3e3c4a91da78751362d03a9bc5c89c1039fdf3f6a4e378bca3955f992c4ec651fb SHA512 c195189e34906dbab9f3793b866aa7537b2d968c4390851b39da8fe900c26d3691d5229e70eaab8d9fd782da3bd2381c63f91b435f2da592d5c6300b1a1a5726
-EBUILD plasma-desktop-5.14.3.ebuild 3855 BLAKE2B 94aac2ed142295424fcbd016980b1f73e11c5ba63ea5b5e46df9fc2e93e94043469cd1e2ba819d5fee2bd3581d296030a4d4e29f4d1b3e963aeacaf3f7148d1a SHA512 5e8898d2b675e46d362099f22da89eb027332e384e3298a8b6971cc96bac04f026c71f14dc76da1e83a298d5ea27027009ad95847487fc2aa46f7b62cddcf60d
-EBUILD plasma-desktop-5.14.5.ebuild 3857 BLAKE2B d5dd91c8b3f8d2ddd3e16d6019f9791cb4b4681a9eff99b741a45cfc21fa61dedf93acb9e34998794a594e704664f9e10cc78b94395b8138010706b20efc7c1f SHA512 2e8eb1fcdf3560fbc434ff5a60ff91a19b1cffa1ddf6410569e8a575eedcf2c78aaa7e090805746d77f6df7246a5834394373230b4082f0206557ec4a2d1d64f
+EBUILD plasma-desktop-5.14.5.ebuild 3855 BLAKE2B 49ef9c5621f098a17721e4844358762e0aa1cee1188a15a4d24bd040a99cb0e09f37a24bc569b6a00755774567365318f8bd3b9013578027f8d9c24d8dd0fa72 SHA512 8f402697eb2585f463249823087eba4b6c4cd82f213f29ea9a9a1092bb5c7194d59b3d3cbddac80b36c0cac497ff2e5a55c6879cf4ca004e85b6ff2116af1daf
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild
deleted file mode 100644
index 49a1c49347e0..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild
index e6474b3532f7..f30755ed499c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm 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 b0fa32d46fa4..92c0c2033aef 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-integration-5.14.3.tar.xz 54088 BLAKE2B 743e4e1083339f3b78cffbd66a54d0363c05b2ca0dd3e456c180b0a39b880c9f6f07fd522e1993e35247dbaaeb330671da44462a0e156c84cfc10619ed642e98 SHA512 8078936e3db9c24a5ea05aaa826b5a69a4f12ae36e7c7e958776dc5b1d12d1d29a45a7f4ebd4f030409f7ecdb40e1f1a57bc859bd75a1ed6106ed74a122b2e23
 DIST plasma-integration-5.14.5.tar.xz 54192 BLAKE2B f032456177475eb9db60dd8d1499693dbd35480df3e2150e1a073da82a41d934459d52620ac4ff7cc52d64473b38da3ab2e66b433ab89be18d746014d6936153 SHA512 6169066cf8afc96f7a595a0ac1c54785ea8f7cfbd609d30b8aa8a12586256575746318765c92038c18ab976ee064a190b1131f01f4c336e13d71a1cdfa719429
-EBUILD plasma-integration-5.14.3.ebuild 1059 BLAKE2B 2d8482f0b2d54b8fea3fba458bd20c5d264c93802ae6f78b52cb66f86bdb4f6e0e735df195f70b5f3c49e02cbaef5c9de156d5783e8af2e720182af99a3226e2 SHA512 a0e0ba1ea30047b4ea7889205682a9ed4bbcade21d839d8819e792f0d44eaf8f7ed26874d38066197b6885aee638d8936d3fc76385c1274c9ea304658c6d6a34
-EBUILD plasma-integration-5.14.5.ebuild 1061 BLAKE2B bdf267c2c682ada4d87efeb5e342b2b2c0f59e40f8addd26ded9d36a93ea63c72d9af447aa9f7d08ed9bd25667f9e792acb00a16c3b544790363752c5c9641d9 SHA512 cc001d857df8023b9a3139018ef22980d2337832de5d08f461f448b0dc1778c870026cb0bdec62b901bfacf12d26af20f511112c79c5614472d644230cd51561
+EBUILD plasma-integration-5.14.5.ebuild 1059 BLAKE2B 3652c87bf431fbe33b22ecfca96de227f1a36f74f6d780c6f1257cf5b5c06819b8f2288e62942868062b798d5b6f7ad4c0773fc614ed0a3e686ebc36c90e1817 SHA512 5f52fd6913ba99692cda205c313ac2b891036c0479aa4e0cd6fa809cee5ac3da79b7f123cdb23a9ca1daaa38890649f3c5733f3c2b10270e07f5856d9d6cf118
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.3.ebuild
deleted file mode 100644
index ce019fdac5d4..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.14.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=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild
index 7dd94729902d..1f8900fc2bf4 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.14.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 d0def32be546..724a901a1694 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.14.3-r1.ebuild 3328 BLAKE2B 544555fb9e28331dc86489a2edc6154496f4301de7ef67996d60ce442d8fd486ed41361e4633b6b656994fb7a6be4ddd1b59240300bc83b87f7276caf4011ecd SHA512 bf7155b71dfb9629072ac8b325fa9c424d099e8b68739d0ffd9575c9ec1ee21df20a08921f92fb8a2b91ced2040674619b6bd061cab3029114529427d65a67e0
-EBUILD plasma-meta-5.14.5.ebuild 3685 BLAKE2B e5fbd052ae54559b432786834eadefe4662f8c4335531fa8a8e8857ffae64ff6d1a1c10acae18d41822fbc46952828dd1b7af52376c0552e341bbb1402f661ef SHA512 ab0ff11d9ae36cbcd590a499ad5052176d16b00c0a8a37148520220ae0895cdf7fdeb5a06fcdee4a79c72aa6b6a9cd3c753bcf3b4cad06804bd6682b13279d84
+EBUILD plasma-meta-5.14.5.ebuild 3683 BLAKE2B 6a783d9fdbd1853b32a69d94bb1a7e29f06fa0a42a655f4d5d9b53ca7287191976e6338aa901dd22128822e2234e6ce04317f1e66138c4de3ae565a92142f7ed SHA512 486728c86ee9eb36c12d3014813f8891749926cb2711c54a2564b0a2a5053fd013d23b0b1db92919075f7109e94fd5341fb4a159d4585d02b1c662f8c375f253
 MISC metadata.xml 1656 BLAKE2B ca6cffa3becb923ebb5e5feefb43215ec30f95f4745275ecf6da10185b2d7715ca74dae6ae757d835370a933754ff0d703fcdeef22766596618a48d8a5849528 SHA512 a4a469d477efc111210f5afa647741666eaebd303688c7e297b1c191ca312d9ac129887055ab95e0750338a5e4e9316aff0f1c62da8b40959fce9e5873683005
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
deleted file mode 100644
index d5cd6979a7e6..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook
-+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep drkonqi)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		pm-utils? ( sys-power/pm-utils )
-	)
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm[consolekit?,elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
-	networkmanager? (
-		$(add_plasma_dep plasma-nm)
-		net-misc/networkmanager[consolekit?,elogind?,systemd?]
-	)
-	pam? (
-		$(add_plasma_dep kwallet-pam)
-		sys-auth/pambase[consolekit?,elogind?,systemd?]
-	)
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
-
-pkg_postinst() {
-	local i selected use_pkg_map=(
-		consolekit:sys-auth/consolekit
-		elogind:sys-auth/elogind
-		systemd:sys-apps/systemd
-	)
-	for i in ${use_pkg_map[@]}; do
-		use ${i%:*} && selected="${i%:*}"
-	done
-	for i in ${use_pkg_map[@]}; do
-		if ! use ${i%:*} && has_version ${i#*:}; then
-			ewarn "An existing installation of ${i#*:} was detected even though"
-			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
-			ewarn "There can only be one session manager at runtime, otherwise random issues"
-			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
-			ewarn "or package.use and remove ${i#*:} before raising bugs."
-			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-		fi
-	done
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
index 17439dc7faa1..ea23101e8758 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="bluetooth +browser-integration consolekit crypt +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 1887da7d8757..6194f8a9cebd 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-nm-5.14.3.tar.xz 718288 BLAKE2B 6fc68e0bf8661519889bead3b816cd51159dd1f48fb4243e4e8adb2097d9297d33d8246947ac92170d0290855f8b80f344d1f456e24c1f2007fa5333b3fc7bea SHA512 6337c35407074c649645df447b0502fce853115514e28fd216be0738bb35c86c3ec8313780ef6d7e4df3836c44851d644a07190c2333a1bb583e612056bc22a2
 DIST plasma-nm-5.14.5.tar.xz 721144 BLAKE2B f9537e742be74b50ffeecee007ef91d93d108b566cf081cb4d25bc4d62c98847a74e7e69ec01b2f10e4e75eac4bc75cef90a3a47ad5ad199cec9f20c31bdaf20 SHA512 54667ff01db16bfadc1663dcf51668aed4eabcb70c3903538044bb478aeb4625d27777df13867cdf03048b6575a540de5c7baaef9e2dc2c41f458d2800daba96
-EBUILD plasma-nm-5.14.3.ebuild 1986 BLAKE2B ef531c575d820a2ba42700797d85c9f332d6177ff8e98a1ea8e84d07e47cdba1bc959137daed51f2fe75243fc594373260a8ae3c55b7899820ecf1ac3e6b7488 SHA512 335999283e760276943c4f66712e87ab73b0bf5200f4fe0eaa015df34570ee0436f787fa67a139c8341afbebf19de6a19f1b5bd51af5ba2b456ca01b84871942
-EBUILD plasma-nm-5.14.5.ebuild 1988 BLAKE2B 190cfbec91b3fb929f5c2bf827222dd4f6f86a06977a06e3f899c37eaac3db5e163723f791f94a008b8a3c2b9d4838ccfb702b04438f2763b6719ebee2895943 SHA512 d0a130f8a1a50c2a05fdc69a9ddddea1cef621c6213f27340362c0d1ab641820cda881432accc2b0795c05e929c4f87663a85a40448dc604a08ba8f18e128cfd
+EBUILD plasma-nm-5.14.5.ebuild 1986 BLAKE2B 25c9a92a8fb9f565a1bba33fc7b9e4fe9e709377fd6a6ba5524bf31675f11fb8446acd30e59eae3d868f395ea3ab073938886e7d06737dc2ec8f767866fe0fc5 SHA512 cdb63ea84dc5327959ef97081ed9f2a19381b59c0597678b1cdbb0752a7a33a588b9349d0cf43a372e41b73b4e12149e87e485060f882d7805c6e509769470d5
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild
deleted file mode 100644
index 37e82b1c36b7..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
index 19d1e4607a8f..d8120ee53298 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
@@ -7,7 +7,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 7aad26e8c989..8bd1ede80714 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,6 +1,4 @@
 AUX plasma-pa-5.13.3-automagic_gconf.patch 530 BLAKE2B 49fa6547b997c0f31627941b333c30ce0ba1165910c235a8319e4855fc5b5acb8c8355b47cd87e57aa49d1f320ed9d6b395887376ef55a5098c436bcfa7d4e4a SHA512 5baaeafc2e4426251d445f954ce25b6561e9e5e36064f803068d8d60d6186cecc4d7eb97da20406160c166800bfa4e54543566f21ac4afa398c3cf4588d23546
-DIST plasma-pa-5.14.3.tar.xz 94724 BLAKE2B 5f4088ca4278852af15575c00a973b1d32563b39f05a6cc8eee0962e728e662b4e4862134dedf860167a6535fcc225807c2d3a6fe859058b5dcc12cd441e06a3 SHA512 174eb9449188e3b97c0476874ee79f8f54074c9dc40c47c09cebe680af1539cd8f144c2d6afe79b821e44c22eb9049e1aa8232cf01895d5d4e8e3a02ae973df5
 DIST plasma-pa-5.14.5.tar.xz 94368 BLAKE2B a8a1bf8ef2b6a9496941f4a35bfb1e92a4cf7a8d3b9ea014cff6d04ab7b01f0c3e12433eafd3a0f529f9391624e82f0d5f7a6314b8b717e58cb733636c18a1fc SHA512 436ef77d61d37bc4cb166ebffbbd0b0f51780008e902f791af66bebd0429f8cda608674790c87e89ddd40dd614eeb61eeb11e173c02f43d03cab420a2ffa196c
-EBUILD plasma-pa-5.14.3.ebuild 669 BLAKE2B 68f4d9cf4f99b934091ff0acb7ea55eaa873655e414d2a048a35ac70addac92d33395fc5ddc5648b36ad84c6363db9bfd57208e79917482e775d2a0eebc1a69d SHA512 fc13b99dc294a9d93af8406ca8184947daf7ec8ad27e9c8e30f9d5683de816be95c7b1de40c4b6a41b166156b664e8122910d1f6da60a83718dfcb3ea4c58293
-EBUILD plasma-pa-5.14.5.ebuild 671 BLAKE2B 0972d1683560410850adffd9b106046d9e0c1a9eff7ab9484b8fcd1feecb78d044878df4a85ea7ea17501dba1e4d9f7d376d0a2fa01a29dc29dc3a5e76498753 SHA512 7a8469f29ed8463a0e17c75ee3c31ddec4d2d931fcd3037afebfb53943904b6dae1159feed6e23a6cb2af0eb7c114250498e1b9425889ab53b89dd1dfe5c7abc
+EBUILD plasma-pa-5.14.5.ebuild 669 BLAKE2B 742bf4b4a257921f1ffa83385259573492ed0d34694ab304b68d5d2e957ef56a77c4d8e58d9ee4f429852204138a3c12e63f176bd2464262afe474472ad23c41 SHA512 1695fd9426f50cef53ba9896d34bc6a0dcbcd5757fe9e22049d64e6b9fed922d7466b5136d272b0aef312ef71b880732f8994c2a4aa5b2fdecbebc5c2ef00aca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.3.ebuild
deleted file mode 100644
index 8364d905afb0..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.14.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild
index 42aace8869bf..8dc89aa8cf8e 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index dd32f87001af..95fc833316b4 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.14.3.tar.xz 250856 BLAKE2B 4607654ebc9a0eaabc7f4a0cc5ea2bb697d6dac90131aae4b4366febfa23a44e73910d14890b6bd64d8fc36ce16fd12b4220fb17862cbf00186004ec0d3ec15c SHA512 9610abafb27147a398fb5bff28f2aa3ec367cf062fb1804e987da410786086c8f8c8d6def464b2924ebe24b37c2369d5f75e5c8c12f412b68e398cdb8682ca35
 DIST plasma-sdk-5.14.5.tar.xz 250236 BLAKE2B a635ce3f32dfcb83d89ebcc546b407f51b41cab4afb134ef26792b5de188cee17be946fdf24c635cec2603b8b524782e69148a1872decd89266241a70d1c8cfd SHA512 b4ef6eadd49e027009090bbaa7d1af476b6d1fb8bea68df2381442bfbc2405d324319bc25c41060d4dab8517a6549e507790413d77f7406d7cc02a6ae7aeec39
-EBUILD plasma-sdk-5.14.3.ebuild 966 BLAKE2B 4f97db8570b3c006ca9a2b888ce432cc91a9264338f9c25c0e5172aa13d0903839e8554f897dc52d66e64c47d4d5bbe439ca8b7479ca19836d3e76867d1f2fd8 SHA512 4b970f6dac09c3c6beecb795dc9e3a213a54090b28b7108de33bc33d2c23a2455b206eede7ebb04b5846a7fd0c95261efca969275a045ca100de9df65a103118
-EBUILD plasma-sdk-5.14.5.ebuild 968 BLAKE2B d7cb2badb871af30cb42bc1d62cf107dd852c9ff2b9e42037f2d9dbc7820e689446b42204f4cf8cf373cc8531d64de27e38c6c1cc9e95b1e972452a71b31ddc9 SHA512 cb6adb8466cf7dcd3f8041cc09a7fc520d99141b0747c6c013af47f79a5ed8f0b6cc1491b9e9a0b5d43e37319b766b0eebad4017df8fc6ebef219371493fbe48
+EBUILD plasma-sdk-5.14.5.ebuild 966 BLAKE2B 34ed2949623f1a03649738d728be955c88f386efd2a0b1476e49faafb1f30bfeecfe291b524bbb704c84c7c84f72cce4b887a64c244da30ecb26adbaf3a28e6a SHA512 63fae02215fdd40d6dab66f632335b543050b11d405c5c6e41ac2ec188314bfd5d63098a32145560e63fd32df5908c5c750393c20b8bc694e5c5724d000057ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.3.ebuild
deleted file mode 100644
index d4dacd20e9ad..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.14.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=6
-
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild
index 6435381c22b7..40edb860bc80 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild
@@ -8,7 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index f3525d9d1eda..fd4bee52728b 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-vault-5.14.3.tar.xz 121448 BLAKE2B 554ad3ce9699ae937c5bb0759f994a4cbf53d72606e9eb6fae5bd39136be3c47a4fa5aecb9eda335f13e939fb349d37088e389ea7036ad97ed348837a3197e11 SHA512 243c9201644f0c1408f5911e21eacd447d2f13133fec6bfdd540fdc7e49afd59fc0f5c090d315b6b48bfcd42848fb6f2d9738c14701f8815e719c6e1f18a1456
 DIST plasma-vault-5.14.5.tar.xz 120944 BLAKE2B 2f47095f47d46dabd58e7ed753da3cc57ffeef71a1a6692f2f795df56678b133f941487b8afa2c4f70e0ac7497bb7f474a9b8f666a0bf41c3d57ca0564aaf524 SHA512 8ac7e59f0b41b66af1ca73a939c77907622090ace7b2812d7de7e12d5a80d740ffae2eb667a8e3223ea34198a425d3dd83c0c21e5e055c4d3bc32232d9f8d26d
-EBUILD plasma-vault-5.14.3.ebuild 1071 BLAKE2B a889ddfde73eb0abaf4e224bc398a707b48ea6f8bacd405b82a516fefcb8f7a105f5306b9bd644b0f481e2e918c59d1a9225370b94a6a892dca6618f3bf80aca SHA512 ba68590eb31fd416c4218c89b943af386f17be7b52a8ef663428fcd1f13375299b3516547b25572b4e4c1c322a3b95959b78f5943dfc3241634954aff8418c47
-EBUILD plasma-vault-5.14.5.ebuild 1073 BLAKE2B 36c64034315534742b76a5c62a776ff5a35d921ef67e98e317aeb0660a00aa314cd5b80d3fff62217e3d49fe3cb2f06abf31132232e90754bc63454b1d5a06e6 SHA512 26dc793d624605cf73b27275ea7bd9d6e40dd7523fc4dcf52ed6b8a4648fe47b6ee7a760dad3076f9249833b1e1c87a3658c0090bce25a7b07cc818e75411515
+EBUILD plasma-vault-5.14.5.ebuild 1071 BLAKE2B a92906c706a1c4b3f0d5fb97cbfdbac03bca06e1fbcc20c7811f27737702723d13f340cdc7e460124af57d0bbcb6ba1bf8e943f4da4eccefd8c8519f6841359a SHA512 9479e0bc93ccabecddbb669192e1f2c40bf6951d3357607ee1be086bc9fc591dbcb3efc328407eb83231b3fc2a44e15cc9730b3e46039e38e423c636e8fb5acf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild
deleted file mode 100644
index bd556f2358de..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.14.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=6
-
-inherit kde5
-
-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 x86"
-IUSE="networkmanager"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild
index fa87d69ead75..9a9bad30295c 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 00bc82636595..220258cb52b5 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.14.3.tar.xz 45915252 BLAKE2B bb1a8676bad8747512884dd35fcfa2ecd8b8fa76ecc55a9e81b34ced6df36a1663e220ef2551ba9ca75b998b54d1599429efc4da22fd37a85ea369c99ecd9a25 SHA512 6dd8dcf7c7e24eb905eefd347527bd4132187b5cf2a26d3d2f40306c95d1565e36bcc27b349f6db9a7960cbf9ef3ab5c36b77e73e48bed8fba13e352ef85b981
 DIST plasma-workspace-wallpapers-5.14.5.tar.xz 45915040 BLAKE2B cd55b0f52f4479583341af64cfd73122055402d25220339c4210d273b06ecff4d121c91b877aec523d89859f434c6221376c1ef6b9e2fe3e4d8426f72d0464c6 SHA512 6bee195adfdcee3ede62ba4bbb8d26ce90ea646570110ea5260ea433c565160ceaded996e32662538d931022a0ed1e0cb9b1578657b9e6350d8d193b412c8c35
-EBUILD plasma-workspace-wallpapers-5.14.3.ebuild 356 BLAKE2B 2d7224e97cb39e96d7c66faffe0590d352b088d0db6355249d5924694a2ecb86c7750da8074593371f7e36d931f49e293fdef5d580f292ed76d7486f20947b0d SHA512 c6e72282f36335820a10c7f3994374c390dd6dcdf9cd64e0d058154480917c8d10c007316e2f6aa63176e6f2b970e159266b4acad01e6a4ef031c901053ef287
-EBUILD plasma-workspace-wallpapers-5.14.5.ebuild 358 BLAKE2B fd78abd7d53907aa66ce273ddd814baeb4511e3209049f0e7619e931936b13c72fea12b32fdfbd7d9d897fa5ea021afb7ba45ef60a5bfd9419bb9f9fdd4d08c5 SHA512 d7cf67a315373604c82c54107a5b778896290ac4471b79bfe878ec8ae0005ac2c96c10bb6fa48445b3eb4d7fd494357de289c28e2b108c3bdf11cf7fdb1ce595
+EBUILD plasma-workspace-wallpapers-5.14.5.ebuild 356 BLAKE2B 6c735e0bc38d4f9991bbbb4b982091b973a5165c6b0bdad9217c9590aacc0e5bdcbf285eb5e92323ae420e3bb2f62d1d138b0ed918870e7f8f4d6d92e525367c SHA512 a4475858708a720156c0f11f1da1dc36705f34b28185ad44d439d993d49ae414aa8b1719d227a3c3638851169c68f9fc4356d783b33542c690d11b3aa1f50e5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.3.ebuild
deleted file mode 100644
index efa1994e38c2..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND=""
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild
index a2c4404144f7..3da50272f264 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild
@@ -8,7 +8,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 67747fdeb5c8..ea4d73a6a78a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,8 +4,6 @@ AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a4
 AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84d50f06efe5ab4acbddc39226747660b21f6b5209a85bb35b023e583a51b583e87f3d75d02c4c59621463992d29ba6150941d464a07ad8c SHA512 df01f4f246d093606a72c8ca018ce829b42073cf6db2db00f9be7b22d7532f3a6fab5218579c666ae8ed6408c0a67912643f2c37e1c13aada49b7ef0c4111044
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
-DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
 DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
-EBUILD plasma-workspace-5.14.3.ebuild 5000 BLAKE2B 68a4683d732fedc92e5713e12e2b5cb39deb4470fd75884242bd0b6af6f4ecd3b03937f9f7f6aee4f49f9e89515aec84ef747380f16883e0ce17babe8b9fd87f SHA512 c9d44afe6712f5fbe0042adbb339a8d8e6885c90cbbf5e2bb744c25454d291a1094b6125236fffc3bedf0c1d0347c670b916baa3cffc796664601fd103931c2f
-EBUILD plasma-workspace-5.14.5.ebuild 5002 BLAKE2B f3bd027c6221cfd4fb42d84a78d0f6ee37b1a6995094f238c59b5c1d685bb115669cd461759c8af4fc1e55631d11c47c134c85a947b24735e4f69058627c1fc4 SHA512 5fc11ec0cb20e6db09dcddf663b14fa11fe5193eccfda6f298990d2b112e441043a0b54ea75ee98810ec29651329385a7cff5c2a937db82ae81f5d2ef73f35d2
+EBUILD plasma-workspace-5.14.5.ebuild 5000 BLAKE2B 45c1260d94224ab0ea2c210a4bf8f3bb1bc8c32bea464f231265e42e3c59ae2d2a8f8625361c504e3f124c0f29238007cd130066a17eb0dce93d5ec81091c048 SHA512 0ce7569ed4b7bcd25f2e8890ee7bc64b38a476c216ae48601350c149022618784a7451d8a182fa718f12ef518a77f3c85956575993460ac6d129666d2a1dd1fc
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
deleted file mode 100644
index 6e6996c7c11a..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_frameworks_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
index 6b8b720cd49c..8ca2acf99e11 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.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 276e82388a72..4b66bcd2ed72 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.14.3.tar.xz 39660 BLAKE2B 2f183a2348820b2214089b01ebd6e827fa0221347f84f696a6cdae5e4c84363297c01c07b571d5a97b5930e12de8fe797da2275f413717266d769fed3e2ebde6 SHA512 6024b44cb0c567d405c398f33bb242c1256032660e4a7f2a575db4c7b70bf3b35de8ae3491a76be96b9de9e24dcd84d3345797a2978dbbcc53c96c312b4e4d59
 DIST plymouth-kcm-5.14.5.tar.xz 39488 BLAKE2B 83221255b8ece21b01a7a117aeb31148a8eacd3e856fb92fc73f304f1a9d2cb488758f945275eb1d8a84cb42eaa4a8b6a33fe69e9a7b6855b5d6a9a9329e9099 SHA512 cd90ebbce2a383bf38e886f96ce75290008ce8721092bd3950b8f097f3920341e6a874577359538bdcdb4fd180f59bc24f068a17038412b2623649b1b8ce5440
-EBUILD plymouth-kcm-5.14.3.ebuild 793 BLAKE2B e7cb7e051691e704a791840619bb39a76b44e96a49e2a9939e6364dd6b8b519070b8a9be5e6cc43d8887233e09db8ce2ffa9a6c4b479c3528af924ab24c0e046 SHA512 42b399b00bd2e0dafc6660d46f3ce736ca2718075626fa7a0d84fca656da4a5a3b13f9df55b5b6289c990da35bff1b0de88999e095783b9c873f7254db12aa25
-EBUILD plymouth-kcm-5.14.5.ebuild 795 BLAKE2B 08f8040ac861581a9ed1641c6cac4bcad0f13691b0a391f9bb1bf5adbb49d5af1d2120923b33f3ba4a83ee9e3f8bb5a27a2d6e01e3d98a6c2e64a8c14c5681f4 SHA512 07e61081d0b1318564c65482c16c96c41d007b7e9ea7b11724e3de7d2d80ddd369da38e9e827c78b55213d2fa8cec9479d2c7913e1a1f7a342d7ed86766169cf
+EBUILD plymouth-kcm-5.14.5.ebuild 793 BLAKE2B 9001e38d7034b02acc431ca83f4d2d78fe78c0fb38f013945cb5d3a53c463141b82201496b8ad95a0e31becad663a7ffb253a94fc70d3ed805e133c0a12f7e1e SHA512 d5a7afef122503e673a044e99fd66fec914f2b25d7caef770fd6b33d307937dc66f23a25cf16a4036a53656c885247c1762ebf2c7b777d1fd9e516f9057c8de7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.3.ebuild
deleted file mode 100644
index 34b47920ae2b..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild
index 181fd57c711e..6b288bc8f52b 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 42c5843763e3..8be636fc8f4d 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.14.3.tar.xz 42844 BLAKE2B 29518813e2a6642282cf7151f632aba3e9573edcfa73fbb8a11498dbac575f76802edb29d37199cd6d203e4750c31591d23d65d2e2259b908b7bdc6d1d2ba33b SHA512 6c4f616a11a2f741bdb85f7146f604ef9a9c89b957ca5507f5bc9ec8b5c3848f5392d886340ff4f089655c1fdcb144eb82f12d43102ce163333adbd2629ea445
 DIST polkit-kde-agent-1-5.14.5.tar.xz 42680 BLAKE2B a423f9ea905164bf8fb9eb5f29b8efc68759492ee93f3122f876ab1e7f2e2b6d254f81e0cdb7906ae81a74f7aad928c226993944dbedf7ff3baa838793a827bc SHA512 09999aca1a3a206088a86119b4bd1db3fd2d51932c99da9480d9784f9cceb9e580851249f9384cca785f852e9ae98d921e5094808aebcbcb333027b1179e6f36
-EBUILD polkit-kde-agent-5.14.3.ebuild 716 BLAKE2B 175e6017de9f3916f115a6d5efdf0fe8d7d34b7d59bbd6bd5aca4080019b8badb93068163539fb11431d3296334b667ec4ae6faaaf3ec8ff57c730dc137299b7 SHA512 4aaac34629da6450b1ff0b224b56d3cc67c04f84f3b9052b2c391088892e8a9015526fba36e136bf43dba3e966d3697178f2290f75c26d36b4904519c88d45c7
-EBUILD polkit-kde-agent-5.14.5.ebuild 718 BLAKE2B e1edd36889dee5280410f80998382c7ad2b44cb02e10a4803187296f421397b46c6cf6af7c52b587802a639725593e33c837ec64ca55f338a4ab70baa39e9d50 SHA512 2a2d317b68e1909c9db36053ae2e47231153806571aaf82af511c6b69eab0435ba3d18bf2040b10e75c7e75b869d8e06bfed63550cddc30df2f96beab72be107
+EBUILD polkit-kde-agent-5.14.5.ebuild 716 BLAKE2B 2aa0fdedf6d156cc47231f1cf9b20af99b58740f94525aea5c5c44bf5dcf0f2472fe0a40b836ce204829a1e4f656de95e800295bc51b444908ca85c96cf7ebf6 SHA512 85518d54f82659ef54d9ed2100126cd04b52a6cad60eade21664d1c354a5a04598109168a129384ae6d4d7506430ac22cd9e03a525780418da574a5c0fae35ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.3.ebuild
deleted file mode 100644
index d88c1e9c3d59..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild
index da5e23e63648..d8c338bfc4e7 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
 HOMEPAGE="https://www.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 23afec37d0a6..c069c3d205b7 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,3 @@
-DIST powerdevil-5.14.3.tar.xz 599436 BLAKE2B 0d971be6e007cb1c7e29534f45ec6942ed6172acc9700a6a9d7c7eff4c93fd32313824e3ac05a35fee2cffe9e8f024798db2887c015b00a5c1b1eb61a2c35b7a SHA512 2dd9482efef0bfe407bef2f48e57a08d00a74238d19b2bd6c2874ed602a90e30c15e17ea114ae368fbfa3a9fb914207758dcee2f5d0d6340e7eddebebfd6064a
 DIST powerdevil-5.14.5.tar.xz 599712 BLAKE2B cdf266c76c5c19bfa8730a06c2089bcd856bb2e402c8d0b9059de546e2211335d4875cb75d195733760d5f3268004f2aed545641017f5a415f0be2088e68ff06 SHA512 b71d70889eacbe684173c43035c7e80c840437adebdd0d707065ce7ed707e1c763d3505be53f97cba255432d6a8194f567859059a82086a0225f9cd1ec953f06
-EBUILD powerdevil-5.14.3-r1.ebuild 1661 BLAKE2B 2706ddfa98e351ec71ecc5f912715b84634d8bd08fd1a0bc09a5f16dd59f448f910f90d5cc814a8ad9712157411da2a75972a6479b3bc5e8006ecd3af426affa SHA512 f40eacc4af420eb6f585320d866c91968acf02b29c5bcd15c3c5e9e2b7dfa8d4a9079ef1732489ac56ee3757ab988a33764c62677baa6f8cd00ee4c8e9ac81a1
-EBUILD powerdevil-5.14.5.ebuild 1663 BLAKE2B 262159b60e4659570ee074c3bb18e797cf4de682263f655b53f9f78cdf9316a8485069d522948e18a2ea5239636e31bb7a40a754ee71ad9b4d3dc5e74ea0fb17 SHA512 66453087ba06d6b5e10c5993815dced1bc42bf16e75ca13bd55890e337fd63ad2f35144a1c19a7906a15375eb286e401380fc2e5f6a02f343c16dc523bd7e8f4
+EBUILD powerdevil-5.14.5.ebuild 1661 BLAKE2B ea41a94faeace4cf4ab04b695463c3d0855d35476af743622fa1db2d65dff59d093b71cb9d98b618ac9b725859dfdfa22c95a455dff28ac9ea25f0986b8481ec SHA512 3c2b9a9a3b4a66b764fabada09c6ea4820359fab31d20aca58ba59ec7c26d475ef7cecffe0389aeccda9e7a7a28e743983d58bac090e3841abc9af5b2b2ec677
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.14.3-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.3-r1.ebuild
deleted file mode 100644
index ca6e97c06999..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.14.3-r1.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
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="amd64 ~arm x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=sys-power/upower-0.9.23
-	!kde-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild
index 8a279ddbd882..17c3f6f8d8ca 100644
--- a/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index e56061cb9fa0..bb4cb7825f20 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.14.3.tar.xz 60940 BLAKE2B 2cb3594e935a3010d23b33f333eae52e24ee987536e42e21ec3fcd28b428761d21d799e5ef589439e5fd271835b3c3bc0d762ad2e450e82ba2a202120fa1a267 SHA512 0458a6e624e3d882f0e42d5c8a1b14d030d33fab463dd5cb46149e4e70604f1563dd075efe89561d68372f768b1c2045f9c1cb23e59e23f07ddd702a293038be
 DIST sddm-kcm-5.14.5.tar.xz 60956 BLAKE2B 8dab5119e4f9d1a0bb81b2e75417e9b0d7e0202d372bcd514678a1b9a284724011b34c13ce5dda2c7cabddf49e2dde736c611ea77904b9bef3e87caad4014365 SHA512 f86bed5234be5025ffd601b6424787d170828b763933e2a23357d890b9e6be5156bcb580c4a1f9370722aaeb114065f780118eaab29467275361cb64db23cb60
-EBUILD sddm-kcm-5.14.3.ebuild 900 BLAKE2B d4d51baed84e1dfec66c30b925b1543341c91ae37afd0952056f9aeef46eb3c7a6817396a77db40d2722c986edc6adf1496910ef83323da8e153c1eaa15e0456 SHA512 cb4409d69fd8582e0af5bb35129fddcdb3915cde289cad4ff149902ceb725d8656fec351609eb634955ef2e97728f2776b60ffd9ab0a2b765fb6ddb2ac385b20
-EBUILD sddm-kcm-5.14.5.ebuild 902 BLAKE2B 83f7d5a79008f2746e22cbbe64403de9e9fa8ad76caa357810c16a2de460657ebad0db9edc5e67375ea836dd27cc9dbf156537e0945b1ece2a6e98fd2f0cc6c7 SHA512 718e274effbe28f2f8422955fac048226b3ca952242dec463c9036fa977c8dc0948193991e5d23b9b61e43d86e6d8326d4413a9b71730e38f06d741bc8d6bbe6
+EBUILD sddm-kcm-5.14.5.ebuild 900 BLAKE2B 153ea0243a1e3402e5e76e6f8fdddb6e8b4fe0c7da68e4f67e4625669e5dab58932f95d631b30d5aacd0251fba4d8bcdfb9bbd635efe30ce9a33ccd79ec49b7a SHA512 5afb7dbd49b2fe993f952f261f2eaf4551f77d4bd18347b7a3f03f0b0e7a1a999eca45479905de5c13d7260e2d2083fc0970ec678118c6a48ce1b4ad533ad7d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.3.ebuild
deleted file mode 100644
index 7e98e6e95434..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild
index 91d4cb64a265..6ca01a268b71 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.14.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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index fed9fe349842..a4c4eccc0592 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,3 @@
-DIST systemsettings-5.14.3.tar.xz 179616 BLAKE2B 51cc7b15042acd9768345b32b6534b3e7de1160175c40c068b454ce8014ff3222cd40e95c3d82c9223d8b2e7fc952eac18e4934aa62f15392271a4cccfe653a0 SHA512 a6330a0955a5b569600525e4170d413ce0f804ca5ecd4b27383358347f0edefa38cee8ff5fc2b78364781b1f5f125012c68b300db8ec2afea54c5265d8a6c5d7
 DIST systemsettings-5.14.5.tar.xz 179364 BLAKE2B 3f39b5b109a09a08e12612095188879161939c1e47984e9fee1295a0ca5a29f4eb519a2302f6465448eb67f57bc7a8b37201eb67e5302e580dc4ca3db6b03872 SHA512 7d933b73489c60214edfd26d525f3dcbe7eebe1802345f40033010cb96da516491c0a403a8c2318a53593789f1122e8b7c10e17f0d506b6d1a8f58c904b197ff
-EBUILD systemsettings-5.14.3.ebuild 1348 BLAKE2B 756a08b5d7f3e13bc476df8bf880e262accc222d28517b1894dcff15cfc949f5a990d7f16bdf5f4d5bc8c59a6c160a1ae710368afd8b4b79c60349e7459c1296 SHA512 3e48176418d09c94caf0866153395acf9f3be716200715bf838ed7d85de22d1c888f8bb7598f36d6a2c095c439ecddbe4baa3d628fd4de0d52941d46a25df0e9
-EBUILD systemsettings-5.14.5.ebuild 1350 BLAKE2B d7ede7a99d35c1bc2a1909b7efed7789083287b1974746fef49492fd9b5adbd89456357470acb9a9f64ebb169737682029e8f6cb73d84b55d1497d0fb42514be SHA512 580874c39f651bb35310cdb470ea6949a03b2e0e43823aeb3a2875a84cee094b7e83afd16014f70d7894520c219ac2260bfc4fd69cba26d743e4459dd62e122e
+EBUILD systemsettings-5.14.5.ebuild 1516 BLAKE2B 2a81c87e44d49a5ca97b06f474179438abb341e3fdad8df0cb5dc912f0a384b1346720c72b5512209372acc49ff3e35dedc77449c5c75edadcd2db81592eb4e7 SHA512 ee3795dc22b3a1c881c60942a28e64e37fb8723fddef03066bac49b1193c9326ba85e436dcc2ed63344023e1c61b3811d53401f3a63aead5c49ca4e055b4d1dd
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.14.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.3.ebuild
deleted file mode 100644
index 834bc1b447c2..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.14.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="amd64 ~arm x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/systemsettings:4
-	$(add_frameworks_dep kirigami)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild
index d40f3c882be8..37b968cce833 100644
--- a/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="classic gtk"
 
 DEPEND="
@@ -44,6 +44,14 @@ RDEPEND="${DEPEND}
 	gtk? ( $(add_plasma_dep kde-gtk-config) )
 "
 
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: hangs in chroot; similar to bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
+		-i CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package classic KF5KHtml)
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index cca4d0592d54..aa191a48191b 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,3 @@
-DIST user-manager-5.14.3.tar.xz 546476 BLAKE2B a602da00ab782468645a4d33ba5f5dfbc2b8a61d7c039e7e2736cbc9e4930477f03c9e7e741ff6974c4b58a62d51e7e6f89863f5e48f7be69ffbb5a65362413c SHA512 6b5f2780cbbdad77c546bc27cc5e2a95eb54cba5b46961656026a2fcaf470b9c413450dfbd96f1d5a6f19c480c27a0d7990cfe9bd9717d28a82cb790c8d066c3
 DIST user-manager-5.14.5.tar.xz 546088 BLAKE2B 40663446c2c5f7d67c29ef482e9991455eef2d835534d9856e6f6922af3cb16e9580bd37503593b90ffdc5af80b571f555c3aee73f5bba64f615448635f9efbf SHA512 24077a3e834fc63f52b2dfc61a8cdb852601754e914545ca038e2dd058935d8a780ab6240b70b085ca4ef4c36be174305816da8b7040fc6f54705f20ef3c1bb6
-EBUILD user-manager-5.14.3.ebuild 692 BLAKE2B 0a36109e441fc42c07a4046b08afc65a25db0f2b2f47c62b3b4a87ab15d412818ce18777d36adfa1498b99fd83f9461f1ad467b4aeb692f1f7206ff539786b74 SHA512 9926be5b944b20a4cc7a04ac9a39e0788b1a17cfeee0efe4d6d7eb0b1a803ea90292b5f58a0b5c29b4dc1b795828f548e0eb43a7a117322fca4da5c7313aa895
-EBUILD user-manager-5.14.5.ebuild 694 BLAKE2B a1efe79760330222237c0bbd3dba9d751beb0f9d3f123d23bd5a08c1316dbb1ade71b1a4bb1ca9cfb007d4f76813b097953ef1190fa4ab43d146c21743326c50 SHA512 55b014f46ac0266e563ed4fd00a9f9f1035798ac8fa1f0cda80089f8a7cc763939b1d22bb9183f72b2d9d82a766fddce62f86dde8ac3033cedc48f3892a969ac
+EBUILD user-manager-5.14.5.ebuild 692 BLAKE2B fbfad08574f426b2f81be402e1436d44c5005c517e4bde9a9226862935ebb2c1b3448253a494b51b1ca1deebb73be970cd55ee182a23815658c270275002e4f5 SHA512 ae2690bb910879881440b669233aee7292de8ad8d5d7910e12680b19f7a8e94b7df7aaea11886a6d5d953d2063d892bac68924ea742448e713dc9909bfd78998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.14.3.ebuild b/kde-plasma/user-manager/user-manager-5.14.3.ebuild
deleted file mode 100644
index c20416d347cb..000000000000
--- a/kde-plasma/user-manager/user-manager-5.14.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.14.5.ebuild b/kde-plasma/user-manager/user-manager-5.14.5.ebuild
index 719b8b033d88..91019a30de76 100644
--- a/kde-plasma/user-manager/user-manager-5.14.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.14.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 45a7ecdeaad7..3df96c29b212 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.14.2-standalone.patch 2006 BLAKE2B 92efa283f3ddcc0997bcdcf082c7d28f0bdb8c40d5689672c1c46fcd9a4637ef7b85562fa06f120ec27a31139fd7e25a6ea89fad37a75f54d92bc417a3b8dcce SHA512 cb1dcffac66b51806b83e2254d0adf00008dd276520babf15a52b58c1d6b4fe7441032c80f968bb1988d7657c2c644041f8dbd20e7d794a22cd7781a252941f2
-DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
 DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
-EBUILD xembed-sni-proxy-5.14.3.ebuild 1075 BLAKE2B c3d0e8084ebacf4ee31e1447150caee65dcc01227eaceb7cae8b00038e8561e4fc8c0b88d47d759e89a162e862747ed7249db1e21c1f8cf4ae69442304bde6ea SHA512 35d2f49b722f7dbf7c683229258c50e2485720e92e9a515879276cb9c3d97c06236cfc627ae3de7c8401500cde840985249781c8d786f50035001668efe81339
-EBUILD xembed-sni-proxy-5.14.5.ebuild 1077 BLAKE2B 640760f9c8b881b9774f99cd0f6703166a894480f2007e42c51d0157fe2d3e6bd062aca42815b8da7f1b3ca86f1b624761de4470e62c15518e6582940e97fe29 SHA512 f960102b870c870ac252a177f93f7a00bda8ac7021d11ea46ed23553eb95fe32200acc6b5645a1e665a42b30671442643d8deec370c0badc331a1093e378cec6
+EBUILD xembed-sni-proxy-5.14.5.ebuild 1075 BLAKE2B 4aba0229e1823486e9ea7036513d76300d5ec390b5750a7f7df339bdc41e4834f734af2cec3885cb5d6515edf9c69433ed53fad4a9d8513778ae79f08bfc1707 SHA512 ed202181bae19dbb97712581ed64be5ea214f202d77e049e348fb384f2349c2ace6de2ad2db6477287fc5065e0027b78e5ef02bac1db7a296425a02d390d5594
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.3.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.3.ebuild
deleted file mode 100644
index 6879008a674a..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.9.6"
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
-
-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 x86"
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/${PV}/" \
-		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
-		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
index b141c1e8b942..19e503988834 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
@@ -13,7 +13,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 ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 7d357b744f38..942868fd73c1 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 5f46314a53dd..22fe62bc9a1b 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -113,10 +113,66 @@ DIST thunderbird-60.4.0-uk.xpi 684154 BLAKE2B 11c6dc427422ef2b13e47cdd1265bd8c9d
 DIST thunderbird-60.4.0-vi.xpi 638420 BLAKE2B 3b081a405cbbef4b7401628052e6a8cd35307f5bc2fea44190dd0775aaf5ab0e8895aaade89c395e6b497e86d1d1718517b7afed8fefed7ce98f32f07dc5a786 SHA512 e4a12334e86fb3a6930716d306d1f7535ead42b93fcde31b226746fb04239cbb88fba81b06d1756583975628d2478629d68e977ef6c355ca3f3e0d8a6d341d23
 DIST thunderbird-60.4.0-zh-CN.xpi 622465 BLAKE2B a67a0e99d35a1eae51f2eee63cdc813c37dbc7987c96f6bfa836f27680fdb9539410377387993d958a59e9cb691f95920d0a6d485b0f321ded6167d6c4e751c9 SHA512 25d996d302a32eb837345626a848d83c4a7c59f2d0a21b08c6a67e34e71b51d975553c7845f4f9a1a344d9a958045ed06349a55d86536aad9621d0b5662a23bb
 DIST thunderbird-60.4.0-zh-TW.xpi 626189 BLAKE2B 51a6efb083d9f8cc8d0caf98ecab691cbfafefa1b091d66ea05f63b473b4f58986c653dedb5cfbc19836375a3907a95dd2dbaac7c06f266d7a7195a96086b22c SHA512 6c78a9c4f336e8ae322690ed06179195c2d230faaa0e7406c23008402e9c6a6df414ac103563d82cbecbdbbadbfc91e6694d0966206c54c4767a24a4cf4a8849
+DIST thunderbird-60.5.0-ar.xpi 627179 BLAKE2B 7f6b8cffd759c9b4520ce0d53844320dfb57ef05b0ef65957e681e700d20fcfbe64efed607efc2fb3144485d5637a29b1044dab6c56b5136f385d9e038dfc8b2 SHA512 60ea5813e8c4d9701e1359552cb3de969374902316d1c4f132fd0f7a4671b199245d02f08b25cf87315ca6b78f978838f6f20843dee31731a501dbe56b89467f
+DIST thunderbird-60.5.0-ast.xpi 559643 BLAKE2B 026891e05f09f8444bb67689f5d39727645cc809f052166f0bd61d29c4bd1170cb3b8fa23544316997a912d494041afc2d17d2169102fc6c623167e605607d43 SHA512 4db0e0d348783532740be9d88634766b3baa4ddd571525ef143fcee9d350468af81e2e1bded6d25e9b2640151450061402a660b3a0abaf6de68e0584edafc66f
+DIST thunderbird-60.5.0-be.xpi 659079 BLAKE2B 7d4f6ca2b4bdc8e8df419c9bea19b470ab9d360095fbb332173dd63540aa4482db751d33f34147a433d64a3f867e9a7713b70cba2518c4b437b7394db7bf05d3 SHA512 b3a5fcabd83c8a1cfa51d0d1ae6f711bd57ca33726d896d4b10a59f70f3372c2fe6706bc4e78d1671507157024adedd6580c664162a696ade2552f8cfade4ddb
+DIST thunderbird-60.5.0-bg.xpi 669318 BLAKE2B e4b166de167c1005381b0d111d1f039dfd5d011438c0e4ae9e0a123e447d236f5fde76746c92448d436d064889418ec8ee39d4cc9547e7c4583bed184d098037 SHA512 4e7120e02210db51d530e779a872f7a1358db6556006f3372b79d84bf2d276f98cb084b43b9ab2c87093ea69bc1d833113792fe4058b87b9b1ede46d87db34bf
+DIST thunderbird-60.5.0-br.xpi 580371 BLAKE2B e1a01e7ff5a20a7806fc9b75386b9808d60bd8c2ec64701e3d2c261cd3e0ac6fe8f63e89f86d004d3029996da3d73718fa1042e4814d852ef79555a4f121e45b SHA512 252e7f17c4b115127ba642dde02c09946516c799a96ed1830960deddf216c5ba51f961735273d12077e90df324eb732e23532d5749ac47ef923ced830e2a275a
+DIST thunderbird-60.5.0-ca.xpi 591971 BLAKE2B c4b20b7b80eaeed0bb4afb9d42fd2f2b79477348a99fd651ba7974e9cc1476267693f50aa1cff48a7fa912fbcf554a501a4f6380ddad046c2d84726749bd4d8a SHA512 28ee3307ae33ab4ce6d0b71378a8bdbf2a5070f43b7271a40e532e255ec3c71a6556a403ca4c498c2d886cedccf4046c27442fc1e5001177fdee299b5cd03226
+DIST thunderbird-60.5.0-cs.xpi 611203 BLAKE2B fb13c8d8954ab8086efe2aa3ef702fe6accdc5f9b2bb06735553f5d2ad10cd04e39bae8381d66e89936ecd35ff698292719b1ece3f0ba07a1173d65410a9bec9 SHA512 662383c0bfd13c440079a2462f9a8621e80d4fbceb488e9c18d13569ae10c4dfc4a6f0b6eccfd6dce20c9b22cf10bb5ab70e8b6eb763002d7fba2a03f93a69fd
+DIST thunderbird-60.5.0-cy.xpi 586038 BLAKE2B 9aefdcd8434931c8adddcd62324d62a9deca1d220a67d9a2c53bcce6a8ab0f0a111c69e33dfbaa99a307ac4d903584acff3bd02116be35ef5de1f4ac644c046e SHA512 e0031700cd628425aec0e8b5eaec2dbfd1e00a8b16681a611a21962e7c45812c8d33c1899118c32f4b704e56a62cfac44eae3685dac7d85594b80d873340f6da
+DIST thunderbird-60.5.0-da.xpi 570807 BLAKE2B 48c5eb1f770ac8a85e36f1bfdbd254a0e86330484cdf5d6ea1facc9aed5d9884683b4c999f73ca640a1970fcce54583f78ba61f4257459f3adcd48e5f1792c86 SHA512 2024090a092139e17b36ff7a7411d76ba28c8e1532f0a3b432008810a29db8f4845cfbafbea095abc50aaa2a4ade32122635a8bdfff62c7ff40029266b3395be
+DIST thunderbird-60.5.0-de.xpi 582575 BLAKE2B 01bf92a1162ee647616b37e2e608372147dd77e7dd462278511b49f91c38f294101e11d2bc1a109ad382fff962e73d320a18d337bbcb170fca40d1da095c2670 SHA512 5c5a8f1391b01068ad51f27746639fe9f0a9c53713f2b6b0c55e559b5d822cbf80ce8e7bf180ead73df9bf1d990f72138411d871faf33f93607d04ff28b350f6
+DIST thunderbird-60.5.0-el.xpi 694860 BLAKE2B e99625ef8fcdfbafa58ce9efa2602f97b54ed99c78f5d160b8008b6a4e43fc26ba0aae0d8329d47b3131a69535b0ed5484203ff7578a94ec26226df092c9da98 SHA512 436672cccb30818047645650b862515bc5aa2f6e73af7dfbc49039fe90c33c861a00294c54eaeb2adbb5729b89ff5ca14cd8357ce08b1382376357ac35cb243a
+DIST thunderbird-60.5.0-en-GB.xpi 553895 BLAKE2B d17af087905cb420a27f2a45e9cefcf248b55b5dbdeb3f0ce6a23f9bff92ac43eb9b70591ea898685be13f4cdb9dee3bb73cfd3b7a1f8eee783f33ab15f0b00f SHA512 15031df8c1a434a9bf6889f33a1acab913b0992d150a4bdfd6c33a5a9e601213af8c465a4de4bdf09663f07356da2ea605ce405ca7152f14a1ee2fb271cd18a3
+DIST thunderbird-60.5.0-es-AR.xpi 595048 BLAKE2B 4660750f8ffed6c68bd18fa6e040278d703e7d47d58e18183128ce50dfae12603febb307ab5dfa8eb849d678d7fe9ad60f9dbff58bc57d888cde6c18c092a216 SHA512 e2ac1f83b62b414b4cda8060e3c844cd7001be1a7cceecebd007486271649142e63aab79a48d5d6f15118efae7203c2a8530ab45306a7181de38dff76a593452
+DIST thunderbird-60.5.0-es-ES.xpi 492211 BLAKE2B 44bbd84901e5f41671c5abb25b63d4b5fab126bc485e9666b324a8744219cf038f3e478ee691baa8a3f60681da90ec8b3ebfec70c2be852cb571d9fdd49c5fef SHA512 f7bbef381ab621153e10d908d9cdfdada14e9f699abcb26c26083b25125fe0e3eca193bd1508d40a4e12ba54b7758be53ed0bd1044f3f9f5dd388645e8534b06
+DIST thunderbird-60.5.0-et.xpi 570867 BLAKE2B e4eb0796f23c5e820c877219fd174af659000fa1713889a3e258363877b377f7d4ccfe60df61e96cf7c6dfd7b51ccb38bffe984f2223e959e1cd5c9f054f77ce SHA512 da1b57bb5b57c1d9d966d7325923bbe761299a0395c7c3111d036a6c3805b375aa059725027ded0d3c404b8c7a7780244cb98bc708ade8164c073813398dbee0
+DIST thunderbird-60.5.0-eu.xpi 581384 BLAKE2B 3d756b21cfdb6541de087fa840f4d41834b30c38bfff2e96cde4d02537be7ab3da30dcda32afacc915c173a84b24f8a736afc1e44413607f3c728bb3add03358 SHA512 601c3195d87c09c16551cf0f2cf3e2b18e784561d73608c500d2274883b5eb6e6fe832edc34782512fdc1f7b1de3dae7cf8d7f26d9cfcdf07d450182d12dd3a8
+DIST thunderbird-60.5.0-fi.xpi 575755 BLAKE2B 52715565f551006b1da86e8b736b08c73b4d229860a09fa0ada00baeaa0e4b2b9933c653dd03867450025c3b40478b5bdffa95aeb12f2065ba668d5a2be66f0b SHA512 06e99fb9d36a92fe8db863846bc2212ebf8e8a8ccde52142ab758ba57de17fa4031af4eb207a2448462bc42ec30de79a51cc9d67b0bf74d68d8725feb99d1b35
+DIST thunderbird-60.5.0-fr.xpi 608467 BLAKE2B 7639fa8a51449929c0abcf8fe67f450160c92a328a727d45de09d7a134040eeb5b875606a790f9e3948ce02fc21650a37d38fc30d475a9c84c02db6cec4d3ca6 SHA512 165b3353e3364a8c805c6b25a75769892dc9a89753cbde1756554bf184292dbdc320d3a583b2f0b01492ffb7a476bbad063513ae82e58eb1a8233fab8d7da58b
+DIST thunderbird-60.5.0-fy-NL.xpi 593851 BLAKE2B 28bb9db71ecf7a43de3ca3b63920bc43aeba01bd49669a5ec86320a34550e20ddd42638868b93f484eacec14b2fed0d33ed222772add895c7523e0ec65c5d21d SHA512 c41219f6a39010be5f9eebfc9c041d9d50a36104ec6635774708960f6db8fe88bc25957abec3cedc712be204545cd660a1ef5edd81a1cb25739321ca522fa04a
+DIST thunderbird-60.5.0-ga-IE.xpi 603506 BLAKE2B 753d1c27a551b1bcebe999e9dd19c3cc4ceab6339495fc537ca946d4c86d3ddc82952f6b50317cc182e56c1f3d70d568c40a2e8d086f72aafef82397c936f30c SHA512 fd7cb2efc5cd004c4658da0a35587afd843a02fddc2b16e648084bc007de58f23ca279581f6a7f916b8b7135d878ed0347a9e7ae4d924b4856af45495d4c313b
+DIST thunderbird-60.5.0-gd.xpi 599262 BLAKE2B a90879789bae895252df94a77d5e7f6d8bd65df884eaacc36a85afcc9aa66e3c52e8cb3b987a48e300b079cc2f30f935694dc5549beed8ea64588091fc5bccf0 SHA512 057b0deb04c462148e9c97e8112e8846427da0e788a1dae49d6b9df6784c360dc78af516ea80859491b62162a41f453b67cbb6ed6dd9d98c63a35d01f6975836
+DIST thunderbird-60.5.0-gl.xpi 580353 BLAKE2B ed0906ca51275965b6dc3a077d4abf3ecebb57ca260b602ea54816a00c26b2c40356ddf698e0941b1084d2abce88c667cdf29bef24845dca40acf652eebec959 SHA512 4f9144fc4e38fcca19c8f63aa7932115728180fd56fe5b6e41d128722261b854cb5110fb7e493c1a1f11a2912dad76d98a36fbdd5af96240b5f3ac1d0705dbaa
+DIST thunderbird-60.5.0-he.xpi 617144 BLAKE2B bbd99769be4231de070888247137760b77038044476849b52c0e3ea289d72c03a21ed07cd67801b70b0d9b43b8c25c4eb7514c3b92e96a84e11b71faa4b4d3a3 SHA512 ef8ee05489059741c4650bc798121ce77d5b8bfcf2123c532414c765a2f9a263217e0c96756dd246ca82bc8190e22ffec0914d4efe088e9fcbd23d957ae73325
+DIST thunderbird-60.5.0-hr.xpi 582238 BLAKE2B 7801ad3065dc28769ce657ff0b09a1941523d1824cafb6e9ffaab753794069b85d22418b0de9b44a5d2312317ebbf0ebb38685c0edd1b7192deff5e9798a3151 SHA512 ad7945f47dd253099ec8bfb379e375f4c279ed0a7eb42f0521bcd8a85b10478f5f023cb8a4aec942ca3403714932271688ef89f850ffe92a79a253adc0c5cc8e
+DIST thunderbird-60.5.0-hsb.xpi 615132 BLAKE2B 0b2f0c88d7f891da420864b7c3b2c0427fb3b536a16ef15973eea73c76b4c3c8a4454b1c5bee42190828432a262663b49577b0b69d7adafd035cf13f2ac55462 SHA512 96f5010f90fa9516fc3ac55e9a2a7dba508fc5f3f92b75e74b22746101ff8d0b9ca88a3795a30cf5396b74b13e7572e31b9ddda034c6f6bac604194e86a7ca9c
+DIST thunderbird-60.5.0-hu.xpi 615346 BLAKE2B e278f4de57bddd68ccc3e5eb008a6e5356066f895bae36f864a07069dc77532039e7afe956d69de8f030889c1e01c55a40cf7e823c836bd7daffc406a1ae8a3a SHA512 65f238cd989d0c995fbf58b1752d39a261b30fea7161dee0eab9d60c5304cb6f793574dcd61858bd653185de3d58107c3c0a5cf7247305f23e7c0d7cd787e1f1
+DIST thunderbird-60.5.0-hy-AM.xpi 653530 BLAKE2B 9708b8b7755acf6e9367b90763acfa2ad125c628faba2c1333c9f84a9e74091d1062d86ec28775337bb458e7cbf3b71766eb7fe0e5fc08ce0a950bebaa6f85d2 SHA512 5e4c0dfa0d3c7ebcba64189837f8262ee2c14febf92b35f4a960290e37f486bee1b2a5d7efe168c7eb562d13bce3e9c11bdf721bacd3b76e0f3634cb4eae9d98
+DIST thunderbird-60.5.0-id.xpi 568861 BLAKE2B 5c36aeecf73228c125b6be222812f1793a6fa4f7bfe2833fc85cb85ac3bd3db40d5b0bed7fe258920d6859de27be2e5f19d6f6fded4b878cecd683b7376b6e8e SHA512 dc48360c172d793c6c149c08d1cf48ca20781a7185ccd11179f063f06bb39409c184bbe04b1e736cc2f90dcf248e22539447d980146a967566ed61496e87b8c8
+DIST thunderbird-60.5.0-is.xpi 579047 BLAKE2B dd98d59fd15a55c1f99a05d0ee3d641dd0b963ea69e3f594d3bd5f0bbfac3ea91c725fef1ef4cb824814d4d9395cf3d3b6f22de6b33cfcb297d38c3fe88bc7d7 SHA512 c5c07e69ff6ca9719b8d12d029a20476035b5a8d13e793d1fb43dfe33321ba6e3b01cf6197040b9cd9c2261726abd6d5b453aa67af2dbdab27a0511c7bfa7180
+DIST thunderbird-60.5.0-it.xpi 477500 BLAKE2B 7470f91fd7785ec8d9d2cf56a2bd2a2cc40a061a4429eec663ea67ea248b6ad79200776570c06d12d9e1a131fa602554ac894c981d510885ade0b4027a0f10fa SHA512 e6d72d77cb372f749469c3aca5994aa65a3e6994660750bec4b4b2f088305d2484845e37eabb2b11fc69261a9744dc2afde911977a510dc436c03574d0876e86
+DIST thunderbird-60.5.0-ja.xpi 653342 BLAKE2B 842a214272dd620fdbe7a20ea188d0dbae436c6e1fa68c1aea2b3d7b9d4ef44c3732471616dc3ccf8279877c0b49688fd18cbfaef02b1bcbecd99498fa9c800e SHA512 c234e0d58e60e95b0e0f9bf81977cdf27fb42e685a540c6f0065d08bd4696002060ce20c8056c7c0b069b08ce2d4edba22dce5eed327af908cfcf33b52bc279d
+DIST thunderbird-60.5.0-ko.xpi 619730 BLAKE2B 487d30d44c0d2dc4e0b4df1324339a1aa0db5a7d451bae38c3276e2e741f81c9df314f1cde3abc325a39c1b161baa00ebbe5414330ba6715220a489848d1472c SHA512 bdcff86819b04a495957a944c0041cbd8f5704aa74fec483d16a27644b048aea5acc2c7cb14487ac0b85f54939b4205b8e669aec96659087a994243117885b06
+DIST thunderbird-60.5.0-lt.xpi 605441 BLAKE2B f1b59bcd03ecb0502016a48d432b17d4f6ed3a8c03378097808abca6dd3377cd648639385d7b58ff16bbe713aa433e0ec073a83a662960fad9dadbcad345e0c3 SHA512 816aa846ccfd06f5443655d24b5169211d056072c6459d28501b898db96e95c5245ecb25c277613c190dd1f117061d7fdef76310ffb3f6db1059adc032a73dcc
+DIST thunderbird-60.5.0-nb-NO.xpi 577003 BLAKE2B 7fe44c0146094aebfa1f24041e66527d7e92f0acbd219d7d318cc397ce0127637fd899cd80762a9781c7180184198e96ce40de0481a0c45b3478151b2291c849 SHA512 a7d20a44dc28593acd612f1d7a8c98364f22e94248467d5f7f2d815deba46bb208d2490305605026a95ac4bf9b736b00bc72ab493f109289ee6d45ce7e355b41
+DIST thunderbird-60.5.0-nl.xpi 583914 BLAKE2B cee3c378290d38201af8206fc853a8e4ea9985c97f01591da8cd60db93bd0e3856c5806dd4b75daa36108f854a6c03b62c819eadd873f5d22a9d19661826cb9e SHA512 5c1c614bc732eea0ebde6cf603f0768e81a787c3be7c60a4e0b45c2d51d721bebc048dbf97b24b5724564fbd16d8fa21bb656dec279844466206f2e730b6381b
+DIST thunderbird-60.5.0-nn-NO.xpi 576422 BLAKE2B ddcb8b08402efd5f6f5cfd91a9721b13a907c45cdddd586a72a843a1163051b4912eec1ba00e7a164b993735aa62c326f233451810f0a0661291ca506de2f26a SHA512 845745331686b1ff159b45cac57591f8cfe4d86ec68b8204b5eec05707ed4ff90944cafaf277be15713b22bf76b3e50c1e460e5f04e505c46bbd62089c9d8265
+DIST thunderbird-60.5.0-pl.xpi 480725 BLAKE2B 0ca29b95e2326f1436e9adb5db62f78a56a03df31f56ef8fcd3ae96afb43d65089082f6e0e1b6704272430f9cdf615fd6d9fe456837ebd2641bfb06a2511631f SHA512 bf8b5048e8e7bac39a6c3a1e1a6434e1c86302ab57d0fdbe4bf6c44794e14a1f340d942f6732757fbdb462fa6eb31725acd1327ede30a92d70e3e82642f02b87
+DIST thunderbird-60.5.0-pt-BR.xpi 588834 BLAKE2B 8cad9d58b3c6437beb29e78adc3624f5b87ca4cf68a0c0f788868d3923754a215cef387b024d9c39605a4b593ead38292737a9d81621b95e200f06f108e6401e SHA512 947803be4aa5a8435c7cb04e41a5987081afb0bb7cc491d372756947ed908565b0c8474dbb90439d32f026196bca74b7d97b12bb73130944489a4a5285130583
+DIST thunderbird-60.5.0-pt-PT.xpi 593186 BLAKE2B ee3bbcbb859dfa26cf791ccc99009358580548e3b58b67e324689188a571ac203e1421e49b0a7afba0df21eaab57bc41ebe784595291c5495aa9086e2b7d1772 SHA512 ccdbe3b0fe4d7e04ab2a4edf15736f081ce95594fb4256a8f637210ce5a9dc309f2083487c32274723b685192b4678a22a8f88b23ee45b2d18847724b14b40f2
+DIST thunderbird-60.5.0-rm.xpi 578384 BLAKE2B dfcc8cb6b8870aef82db72a327390f056066ddf422703236f2fdbe9f82af74ea0342ba1a7e4a2d71269ce3219034db3601333867e1d8e73b500d2026dafcb6a5 SHA512 14ea772f65cd70650e8998e40f6950186a617ed19463a2496da45265bc4b67a9b332e5acfc6e4906638252aa2ab7da5fb098a0fd6aa75314e42a0a7b13e3d0ed
+DIST thunderbird-60.5.0-ro.xpi 584308 BLAKE2B b2e55942e35e1cae301643db74f9de44acbbfcbebf2e2eb89c766eedf8aeaf35e913affd3a6456eb171fc5ec633b5765b9dbda3836b74f5dc8b0128ec22e5584 SHA512 082c91c17a5b96ba7b3f8290fd5722f109194ecc319958c2e081244cf6ecaa5ff088b1aabc300159f82fb22236c442d75483a35da37cda279bfb41693a170b43
+DIST thunderbird-60.5.0-ru.xpi 694705 BLAKE2B 29ce568d6efbb410789d5238cc0cba1fd281efd57d1138540edd50f7b472d525618b6ac68dabc1c2594a29ad49e76ddf118c01417a6aa0d6e4403950e0e48d0f SHA512 b9ff341461f5200a2577366fe9cdd944860c98d1fe90f13d08cfcef659f6bb8273e7b3494b6919d1c12eea9aefa02641e104bde377dae625fff39b16f5fbe5d6
+DIST thunderbird-60.5.0-si.xpi 647596 BLAKE2B 4e11ed29beac112dd08d5bd97ed3ebcd18374daa1faa7a99f6fde17bb793e9e3a162c137c6c8b666c1ead094a5d9d1ee722c71dfb66d17f159d48d15fa9735ee SHA512 24b16eab1ef45f9509e02c681365e3afed277ef23462692e209ddbd7b97ab58af1ac556d6bdfd7d5feb0078b0ecf5cd6766f1a9b0a40632523b5453708ca202d
+DIST thunderbird-60.5.0-sk.xpi 612216 BLAKE2B d66c36c2160cf7139917fd79bae0c3b2cbea1299613c9f35f8cc2d826474917c788285928d1a58a63768f106c70369d96079ce446437d02b1a8111c49e87ae66 SHA512 7b0ad73839b306382695f9d569ffa909c549a3dc98f18b024b3bec366b8f4dbd8fe2e8c89d3a7bf0dd48460e5361bff353128f68d8b6ebd3a3dd81f475785841
+DIST thunderbird-60.5.0-sl.xpi 589947 BLAKE2B 6b3238b96a7aa8351825b36cd152934f4bdd79734faee11119206fc387448cfdacdcc065ad85599e61bf7d2f0a51bdd8e5dfe14787e1833cc6270b316ac48085 SHA512 a9b6fddbe664062381b49bf671343149230f51454b134c9b9aac50675783088a086e60dd5dc1c0204148a6a2aaab9d996931461a2654a2d5a0a0ebbb2e9275f4
+DIST thunderbird-60.5.0-sq.xpi 593096 BLAKE2B 2e2f342e29920c313b72dc1e13e90d0141efa81351e8dd2307f7bf3b89ca20d937d60c74c2436b36994ce427f0a53a4e4914565a888645dcc07a98f1bc9fe756 SHA512 ce498ef9f57c6ee2f734777cc80df937c6a1b0d33d8ab8fb5dda1f66f68e76be9698287fac1e9b32bd6f937752d068d4008c8b87b2a30c4eb90ba15302045fb6
+DIST thunderbird-60.5.0-sr.xpi 641527 BLAKE2B b19836dbc5ebc96ba4a519a61da8971ffff54b909c851a53815c9e9219ea7d9f57bf3cb1d558c890ca18b7199f16677d711565968943be2abb2c7abba156aba3 SHA512 55c7333b1fcef53c1896dec9103220e668b5ee85c7b2af46476863a2d35bd49025726da1c8ced1f7e5b492be9ae8187263805bc1e2814c5d488d36b4ffbe1829
+DIST thunderbird-60.5.0-sv-SE.xpi 594079 BLAKE2B e9f4d91e6bc690039117ad8fbfad43fd77b0c95c25478d051855b57d72553311d0d546093427261c121a95c94ecba3c04a2572238ed6c2b7172daf912484b855 SHA512 7ccedcbb804ddfa160c70955c9a14623a41d99e3475aaa973019495ceb3b30645136ddbb19f28941becbd111214de973fb477bcc239f496843db6b42bb6473ca
+DIST thunderbird-60.5.0-tr.xpi 598010 BLAKE2B 0cd0ddbf2e8c019d08c026007f320807d1d8be07f4425f52f75b7b3cc665f6b233e0481dcecd0d64be247ce9c2d6336db9281f320a806a21e817802395fbe312 SHA512 09a77642cdf5c7af170e8d12bc843a8882d5857831a3e54effca37d4698c13ed7df234230b6b7937eab3e03bed10a4fb0b6c8673fd11587fac40c4fa7d3c2f4f
+DIST thunderbird-60.5.0-uk.xpi 684154 BLAKE2B 5983c0165806f3710b2dcfbc8a4cc0c6bec0799be87919050537c27629b643310627f1cb288ea88d03c6f043ff52503061c8e74c1f7de340751dbc294d5237c1 SHA512 ef4aa8e3f74222ddfa7b2b6f815f2fd3bfb59709806eec8e38ed0508760dbfdd8caabf91a96ea4849877ee43ab51361bf566a90d353979ec4e911cf285cf8a88
+DIST thunderbird-60.5.0-vi.xpi 637199 BLAKE2B b796c67f9ec8c6eb455a7e0914c7867f2b95094ceb1e099bcc6b0fb4b88dfbf83accf8a9aa8d1727979da4953c543f0b777beebcdba138a478ebde7966e1f416 SHA512 9379035dfebaea5c69dd16b62c12c99e2e9bce13f6944aa9636958b60ab40b8efbb309932cc21002b3c743aee932db412d5bcb7b033a3e0cd442704d7c7a9e97
+DIST thunderbird-60.5.0-zh-CN.xpi 626283 BLAKE2B cf4bc1f233e73d1ca5802c50f47e166606e14272ea4270346bd202ddff236d08684da0e6e322aeb31d1f5f8d20af00c4820289646be808e6c1ac651dbb2936c0 SHA512 f33da7be766b95051a55d3186b78069e30cfc9f8a1c0db6f7422103fecf3e1b4e466ced904a80785de25363ced9b970319b5b9c74c5da15dd9ebc7bcca3bd75e
+DIST thunderbird-60.5.0-zh-TW.xpi 626190 BLAKE2B 43f34e19d95a7ec4b7e51b4e22e849925ae41f3f12e9571d5feed609be5afb0a55d6b47a9a1082ad5a706f1ebf55dd467bbd3bd0c8123e0dedebed27b3f2c8c2 SHA512 12bbe8b1f71b51be31a6311a7ed2b554e07a7b7f86e2ac4ca261d7bafc983e97652f3b95a011c2fe4628637d5220a15e176d8c7eb2023269dcb464daea69e4fd
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.4.0.tar.bz2 52473526 BLAKE2B ec4a56376e3466953453a122997024012b0ef6b8b3094722528473d6c5df412af7d999e66bcaacb8a31cc6f57ca5e769450087c3c00f89cad3f5a4d363773df8 SHA512 48b15f12274818477d6618f3d184239789b8538d63b995d48992ef170224b2ad254cabc02330e7ef9e0e4190c17663fa78489226f9cb280d38211cc6431cf413
+DIST thunderbird-bin_i686-60.5.0.tar.bz2 52522804 BLAKE2B 07c62546548eda9c9986c6322e531abb3d33cdc5ecf8b5a919d58644c4ac2f7d44c5bc12118665d4aa76af55124c769326e94ad6777312c8230bf8a6403411b7 SHA512 d4f838dc573d9efa2e2e5148cfeb0301d1e63da01bd723fdda9a76bc737e631fb232799f16dc91af2d66cc37008ec538a1d58f42a02cfcaa0333ce6e8c9134c4
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.4.0.tar.bz2 50400692 BLAKE2B afdfca188be3c6d25fc8b4838c6fe7167f63b4a65dd03a47eef5ffadfa577e5226fb34c85396f9c0b4eed822bfafb83e1b1d65e3dcb9f34ae70216d710d8dac9 SHA512 801676c0c93fd0d6730b5c4719a45888916210d8f65b06eb7b416dc596bed7a0ad2ae79cf11307167c0918b5a60ccbb4ba62e4e1c891c831817d3748f91d7221
+DIST thunderbird-bin_x86_64-60.5.0.tar.bz2 50401851 BLAKE2B a0f8df62d135a66127bc2bc9415f1a86b91faa889cac468f67504fa74eb2e41655739a11ba9efe868469a3fe4680d3ddf295ee1e1978bef116ee4cb61f8ef5bf SHA512 9794dba4bc6d6eb1d3852d1ddea087fa4561227805dbbe7ab1707d155606ed43d826b94b4a9e28a4f87b234b0c249b05cc00056a76db77af878cd4698835d469
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.4.0-r1.ebuild 5308 BLAKE2B 5503340fad2346aa87a4ea417864cf530995796098a64f46dba3a2ed6205a956cfd4808276b90785dd144e62a84cc1dce0d1f31ddd094ef13cf13532b062e1e4 SHA512 b36ff39d7c68b7f31fe35ade8ae5242c92bfbf9b3cb24a4b7922b16ef203b4b5005295ea1e4b49ee61dca4a990a681c8bd34e8250a4feafcf47de3bc4c362dbf
+EBUILD thunderbird-bin-60.5.0.ebuild 5308 BLAKE2B 5503340fad2346aa87a4ea417864cf530995796098a64f46dba3a2ed6205a956cfd4808276b90785dd144e62a84cc1dce0d1f31ddd094ef13cf13532b062e1e4 SHA512 b36ff39d7c68b7f31fe35ade8ae5242c92bfbf9b3cb24a4b7922b16ef203b4b5005295ea1e4b49ee61dca4a990a681c8bd34e8250a4feafcf47de3bc4c362dbf
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-60.5.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-60.5.0.ebuild
new file mode 100644
index 000000000000..8837f75f1404
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-60.5.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.2.1"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip
+	app-arch/zip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_prepare() {
+	default
+
+	# Lightning
+	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	local emxpi="${S}/distribution/extensions/${emid}.xpi"
+	if [[ ! -f "${emxpi}" ]]; then
+		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
+	else
+		ebegin "Add localization to Lightning ..."
+		# hide warning regarding extra bytes at beginning or within zipfile
+		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
+		rm -f "${emxpi}" || die
+
+		# Install language packs for calendar
+		mozlinguas_xpistage_langpacks \
+			"${WORKDIR}/${emid}" \
+			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+		# roll a .xpi that mimicks what upstream would roll
+		pushd "${WORKDIR}/${emid}" &>/dev/null || die
+		zip -9 -q -r "${emxpi}" * || die
+		popd &>/dev/null || die
+		eend 0
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 128"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index afc8382f545b..42220c5d3884 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,6 +6,7 @@ AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
 DIST firefox-60.0-patches-04.tar.xz 120496 BLAKE2B 4b4fd58a91d8fd9603c3a7bdb669f275f7cbd7b9add7c790a2e326f46a540e77a390e9da3f85e81feee8e5354cb25c93e140fb2f721cdcd0fe197b7c24ea0091 SHA512 d8aaa1fafe22dcef8cba609ba6e2d322c18b46f4d3b91897696651958108f887510a068295b55bb21d84b660bbe7574a6533a57d8e26f96d2877139864dba828
+DIST firefox-60.5-patches-01.tar.xz 13332 BLAKE2B 53308d415369c6814504697ed9692023e636c42b58053867fd14e8edd94baa2777ed9f33e147f796d6fcd5f30c1d2258f9fd3247392e37a921a53f41a6903e92 SHA512 de24544c5aa8ade35e4e3e0fac10399f8eb44ea4bb9063b85bbcf2db12280d23ccc5fd29032f33f3723c0a0c3c2381429e2c19bd631e90615908b4f68f745a21
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
@@ -122,6 +123,61 @@ DIST thunderbird-60.4.0-vi.xpi 638420 BLAKE2B 3b081a405cbbef4b7401628052e6a8cd35
 DIST thunderbird-60.4.0-zh-CN.xpi 622465 BLAKE2B a67a0e99d35a1eae51f2eee63cdc813c37dbc7987c96f6bfa836f27680fdb9539410377387993d958a59e9cb691f95920d0a6d485b0f321ded6167d6c4e751c9 SHA512 25d996d302a32eb837345626a848d83c4a7c59f2d0a21b08c6a67e34e71b51d975553c7845f4f9a1a344d9a958045ed06349a55d86536aad9621d0b5662a23bb
 DIST thunderbird-60.4.0-zh-TW.xpi 626189 BLAKE2B 51a6efb083d9f8cc8d0caf98ecab691cbfafefa1b091d66ea05f63b473b4f58986c653dedb5cfbc19836375a3907a95dd2dbaac7c06f266d7a7195a96086b22c SHA512 6c78a9c4f336e8ae322690ed06179195c2d230faaa0e7406c23008402e9c6a6df414ac103563d82cbecbdbbadbfc91e6694d0966206c54c4767a24a4cf4a8849
 DIST thunderbird-60.4.0.source.tar.xz 284938284 BLAKE2B aedfb71f0c2a34384777098748fb2bd3bc2b15571c46f366be9b91154630b37bdd86fbf3d4a9fc3d79aea7092abc4187392864968d8caf594d346599058d7b0a SHA512 084becec870ad1449196110ecd2d2cc397c32d9d5a682f3cf45a170b7bdf5c2197299a72034965e838af62534df870de5a46d49fd0d05a9c4c7fdf5e408e471d
+DIST thunderbird-60.5.0-ar.xpi 627179 BLAKE2B 7f6b8cffd759c9b4520ce0d53844320dfb57ef05b0ef65957e681e700d20fcfbe64efed607efc2fb3144485d5637a29b1044dab6c56b5136f385d9e038dfc8b2 SHA512 60ea5813e8c4d9701e1359552cb3de969374902316d1c4f132fd0f7a4671b199245d02f08b25cf87315ca6b78f978838f6f20843dee31731a501dbe56b89467f
+DIST thunderbird-60.5.0-ast.xpi 559643 BLAKE2B 026891e05f09f8444bb67689f5d39727645cc809f052166f0bd61d29c4bd1170cb3b8fa23544316997a912d494041afc2d17d2169102fc6c623167e605607d43 SHA512 4db0e0d348783532740be9d88634766b3baa4ddd571525ef143fcee9d350468af81e2e1bded6d25e9b2640151450061402a660b3a0abaf6de68e0584edafc66f
+DIST thunderbird-60.5.0-be.xpi 659079 BLAKE2B 7d4f6ca2b4bdc8e8df419c9bea19b470ab9d360095fbb332173dd63540aa4482db751d33f34147a433d64a3f867e9a7713b70cba2518c4b437b7394db7bf05d3 SHA512 b3a5fcabd83c8a1cfa51d0d1ae6f711bd57ca33726d896d4b10a59f70f3372c2fe6706bc4e78d1671507157024adedd6580c664162a696ade2552f8cfade4ddb
+DIST thunderbird-60.5.0-bg.xpi 669318 BLAKE2B e4b166de167c1005381b0d111d1f039dfd5d011438c0e4ae9e0a123e447d236f5fde76746c92448d436d064889418ec8ee39d4cc9547e7c4583bed184d098037 SHA512 4e7120e02210db51d530e779a872f7a1358db6556006f3372b79d84bf2d276f98cb084b43b9ab2c87093ea69bc1d833113792fe4058b87b9b1ede46d87db34bf
+DIST thunderbird-60.5.0-br.xpi 580371 BLAKE2B e1a01e7ff5a20a7806fc9b75386b9808d60bd8c2ec64701e3d2c261cd3e0ac6fe8f63e89f86d004d3029996da3d73718fa1042e4814d852ef79555a4f121e45b SHA512 252e7f17c4b115127ba642dde02c09946516c799a96ed1830960deddf216c5ba51f961735273d12077e90df324eb732e23532d5749ac47ef923ced830e2a275a
+DIST thunderbird-60.5.0-ca.xpi 591971 BLAKE2B c4b20b7b80eaeed0bb4afb9d42fd2f2b79477348a99fd651ba7974e9cc1476267693f50aa1cff48a7fa912fbcf554a501a4f6380ddad046c2d84726749bd4d8a SHA512 28ee3307ae33ab4ce6d0b71378a8bdbf2a5070f43b7271a40e532e255ec3c71a6556a403ca4c498c2d886cedccf4046c27442fc1e5001177fdee299b5cd03226
+DIST thunderbird-60.5.0-cs.xpi 611203 BLAKE2B fb13c8d8954ab8086efe2aa3ef702fe6accdc5f9b2bb06735553f5d2ad10cd04e39bae8381d66e89936ecd35ff698292719b1ece3f0ba07a1173d65410a9bec9 SHA512 662383c0bfd13c440079a2462f9a8621e80d4fbceb488e9c18d13569ae10c4dfc4a6f0b6eccfd6dce20c9b22cf10bb5ab70e8b6eb763002d7fba2a03f93a69fd
+DIST thunderbird-60.5.0-cy.xpi 586038 BLAKE2B 9aefdcd8434931c8adddcd62324d62a9deca1d220a67d9a2c53bcce6a8ab0f0a111c69e33dfbaa99a307ac4d903584acff3bd02116be35ef5de1f4ac644c046e SHA512 e0031700cd628425aec0e8b5eaec2dbfd1e00a8b16681a611a21962e7c45812c8d33c1899118c32f4b704e56a62cfac44eae3685dac7d85594b80d873340f6da
+DIST thunderbird-60.5.0-da.xpi 570807 BLAKE2B 48c5eb1f770ac8a85e36f1bfdbd254a0e86330484cdf5d6ea1facc9aed5d9884683b4c999f73ca640a1970fcce54583f78ba61f4257459f3adcd48e5f1792c86 SHA512 2024090a092139e17b36ff7a7411d76ba28c8e1532f0a3b432008810a29db8f4845cfbafbea095abc50aaa2a4ade32122635a8bdfff62c7ff40029266b3395be
+DIST thunderbird-60.5.0-de.xpi 582575 BLAKE2B 01bf92a1162ee647616b37e2e608372147dd77e7dd462278511b49f91c38f294101e11d2bc1a109ad382fff962e73d320a18d337bbcb170fca40d1da095c2670 SHA512 5c5a8f1391b01068ad51f27746639fe9f0a9c53713f2b6b0c55e559b5d822cbf80ce8e7bf180ead73df9bf1d990f72138411d871faf33f93607d04ff28b350f6
+DIST thunderbird-60.5.0-el.xpi 694860 BLAKE2B e99625ef8fcdfbafa58ce9efa2602f97b54ed99c78f5d160b8008b6a4e43fc26ba0aae0d8329d47b3131a69535b0ed5484203ff7578a94ec26226df092c9da98 SHA512 436672cccb30818047645650b862515bc5aa2f6e73af7dfbc49039fe90c33c861a00294c54eaeb2adbb5729b89ff5ca14cd8357ce08b1382376357ac35cb243a
+DIST thunderbird-60.5.0-en-GB.xpi 553895 BLAKE2B d17af087905cb420a27f2a45e9cefcf248b55b5dbdeb3f0ce6a23f9bff92ac43eb9b70591ea898685be13f4cdb9dee3bb73cfd3b7a1f8eee783f33ab15f0b00f SHA512 15031df8c1a434a9bf6889f33a1acab913b0992d150a4bdfd6c33a5a9e601213af8c465a4de4bdf09663f07356da2ea605ce405ca7152f14a1ee2fb271cd18a3
+DIST thunderbird-60.5.0-es-AR.xpi 595048 BLAKE2B 4660750f8ffed6c68bd18fa6e040278d703e7d47d58e18183128ce50dfae12603febb307ab5dfa8eb849d678d7fe9ad60f9dbff58bc57d888cde6c18c092a216 SHA512 e2ac1f83b62b414b4cda8060e3c844cd7001be1a7cceecebd007486271649142e63aab79a48d5d6f15118efae7203c2a8530ab45306a7181de38dff76a593452
+DIST thunderbird-60.5.0-es-ES.xpi 492211 BLAKE2B 44bbd84901e5f41671c5abb25b63d4b5fab126bc485e9666b324a8744219cf038f3e478ee691baa8a3f60681da90ec8b3ebfec70c2be852cb571d9fdd49c5fef SHA512 f7bbef381ab621153e10d908d9cdfdada14e9f699abcb26c26083b25125fe0e3eca193bd1508d40a4e12ba54b7758be53ed0bd1044f3f9f5dd388645e8534b06
+DIST thunderbird-60.5.0-et.xpi 570867 BLAKE2B e4eb0796f23c5e820c877219fd174af659000fa1713889a3e258363877b377f7d4ccfe60df61e96cf7c6dfd7b51ccb38bffe984f2223e959e1cd5c9f054f77ce SHA512 da1b57bb5b57c1d9d966d7325923bbe761299a0395c7c3111d036a6c3805b375aa059725027ded0d3c404b8c7a7780244cb98bc708ade8164c073813398dbee0
+DIST thunderbird-60.5.0-eu.xpi 581384 BLAKE2B 3d756b21cfdb6541de087fa840f4d41834b30c38bfff2e96cde4d02537be7ab3da30dcda32afacc915c173a84b24f8a736afc1e44413607f3c728bb3add03358 SHA512 601c3195d87c09c16551cf0f2cf3e2b18e784561d73608c500d2274883b5eb6e6fe832edc34782512fdc1f7b1de3dae7cf8d7f26d9cfcdf07d450182d12dd3a8
+DIST thunderbird-60.5.0-fi.xpi 575755 BLAKE2B 52715565f551006b1da86e8b736b08c73b4d229860a09fa0ada00baeaa0e4b2b9933c653dd03867450025c3b40478b5bdffa95aeb12f2065ba668d5a2be66f0b SHA512 06e99fb9d36a92fe8db863846bc2212ebf8e8a8ccde52142ab758ba57de17fa4031af4eb207a2448462bc42ec30de79a51cc9d67b0bf74d68d8725feb99d1b35
+DIST thunderbird-60.5.0-fr.xpi 608467 BLAKE2B 7639fa8a51449929c0abcf8fe67f450160c92a328a727d45de09d7a134040eeb5b875606a790f9e3948ce02fc21650a37d38fc30d475a9c84c02db6cec4d3ca6 SHA512 165b3353e3364a8c805c6b25a75769892dc9a89753cbde1756554bf184292dbdc320d3a583b2f0b01492ffb7a476bbad063513ae82e58eb1a8233fab8d7da58b
+DIST thunderbird-60.5.0-fy-NL.xpi 593851 BLAKE2B 28bb9db71ecf7a43de3ca3b63920bc43aeba01bd49669a5ec86320a34550e20ddd42638868b93f484eacec14b2fed0d33ed222772add895c7523e0ec65c5d21d SHA512 c41219f6a39010be5f9eebfc9c041d9d50a36104ec6635774708960f6db8fe88bc25957abec3cedc712be204545cd660a1ef5edd81a1cb25739321ca522fa04a
+DIST thunderbird-60.5.0-ga-IE.xpi 603506 BLAKE2B 753d1c27a551b1bcebe999e9dd19c3cc4ceab6339495fc537ca946d4c86d3ddc82952f6b50317cc182e56c1f3d70d568c40a2e8d086f72aafef82397c936f30c SHA512 fd7cb2efc5cd004c4658da0a35587afd843a02fddc2b16e648084bc007de58f23ca279581f6a7f916b8b7135d878ed0347a9e7ae4d924b4856af45495d4c313b
+DIST thunderbird-60.5.0-gd.xpi 599262 BLAKE2B a90879789bae895252df94a77d5e7f6d8bd65df884eaacc36a85afcc9aa66e3c52e8cb3b987a48e300b079cc2f30f935694dc5549beed8ea64588091fc5bccf0 SHA512 057b0deb04c462148e9c97e8112e8846427da0e788a1dae49d6b9df6784c360dc78af516ea80859491b62162a41f453b67cbb6ed6dd9d98c63a35d01f6975836
+DIST thunderbird-60.5.0-gl.xpi 580353 BLAKE2B ed0906ca51275965b6dc3a077d4abf3ecebb57ca260b602ea54816a00c26b2c40356ddf698e0941b1084d2abce88c667cdf29bef24845dca40acf652eebec959 SHA512 4f9144fc4e38fcca19c8f63aa7932115728180fd56fe5b6e41d128722261b854cb5110fb7e493c1a1f11a2912dad76d98a36fbdd5af96240b5f3ac1d0705dbaa
+DIST thunderbird-60.5.0-he.xpi 617144 BLAKE2B bbd99769be4231de070888247137760b77038044476849b52c0e3ea289d72c03a21ed07cd67801b70b0d9b43b8c25c4eb7514c3b92e96a84e11b71faa4b4d3a3 SHA512 ef8ee05489059741c4650bc798121ce77d5b8bfcf2123c532414c765a2f9a263217e0c96756dd246ca82bc8190e22ffec0914d4efe088e9fcbd23d957ae73325
+DIST thunderbird-60.5.0-hr.xpi 582238 BLAKE2B 7801ad3065dc28769ce657ff0b09a1941523d1824cafb6e9ffaab753794069b85d22418b0de9b44a5d2312317ebbf0ebb38685c0edd1b7192deff5e9798a3151 SHA512 ad7945f47dd253099ec8bfb379e375f4c279ed0a7eb42f0521bcd8a85b10478f5f023cb8a4aec942ca3403714932271688ef89f850ffe92a79a253adc0c5cc8e
+DIST thunderbird-60.5.0-hsb.xpi 615132 BLAKE2B 0b2f0c88d7f891da420864b7c3b2c0427fb3b536a16ef15973eea73c76b4c3c8a4454b1c5bee42190828432a262663b49577b0b69d7adafd035cf13f2ac55462 SHA512 96f5010f90fa9516fc3ac55e9a2a7dba508fc5f3f92b75e74b22746101ff8d0b9ca88a3795a30cf5396b74b13e7572e31b9ddda034c6f6bac604194e86a7ca9c
+DIST thunderbird-60.5.0-hu.xpi 615346 BLAKE2B e278f4de57bddd68ccc3e5eb008a6e5356066f895bae36f864a07069dc77532039e7afe956d69de8f030889c1e01c55a40cf7e823c836bd7daffc406a1ae8a3a SHA512 65f238cd989d0c995fbf58b1752d39a261b30fea7161dee0eab9d60c5304cb6f793574dcd61858bd653185de3d58107c3c0a5cf7247305f23e7c0d7cd787e1f1
+DIST thunderbird-60.5.0-hy-AM.xpi 653530 BLAKE2B 9708b8b7755acf6e9367b90763acfa2ad125c628faba2c1333c9f84a9e74091d1062d86ec28775337bb458e7cbf3b71766eb7fe0e5fc08ce0a950bebaa6f85d2 SHA512 5e4c0dfa0d3c7ebcba64189837f8262ee2c14febf92b35f4a960290e37f486bee1b2a5d7efe168c7eb562d13bce3e9c11bdf721bacd3b76e0f3634cb4eae9d98
+DIST thunderbird-60.5.0-id.xpi 568861 BLAKE2B 5c36aeecf73228c125b6be222812f1793a6fa4f7bfe2833fc85cb85ac3bd3db40d5b0bed7fe258920d6859de27be2e5f19d6f6fded4b878cecd683b7376b6e8e SHA512 dc48360c172d793c6c149c08d1cf48ca20781a7185ccd11179f063f06bb39409c184bbe04b1e736cc2f90dcf248e22539447d980146a967566ed61496e87b8c8
+DIST thunderbird-60.5.0-is.xpi 579047 BLAKE2B dd98d59fd15a55c1f99a05d0ee3d641dd0b963ea69e3f594d3bd5f0bbfac3ea91c725fef1ef4cb824814d4d9395cf3d3b6f22de6b33cfcb297d38c3fe88bc7d7 SHA512 c5c07e69ff6ca9719b8d12d029a20476035b5a8d13e793d1fb43dfe33321ba6e3b01cf6197040b9cd9c2261726abd6d5b453aa67af2dbdab27a0511c7bfa7180
+DIST thunderbird-60.5.0-it.xpi 477500 BLAKE2B 7470f91fd7785ec8d9d2cf56a2bd2a2cc40a061a4429eec663ea67ea248b6ad79200776570c06d12d9e1a131fa602554ac894c981d510885ade0b4027a0f10fa SHA512 e6d72d77cb372f749469c3aca5994aa65a3e6994660750bec4b4b2f088305d2484845e37eabb2b11fc69261a9744dc2afde911977a510dc436c03574d0876e86
+DIST thunderbird-60.5.0-ja.xpi 653342 BLAKE2B 842a214272dd620fdbe7a20ea188d0dbae436c6e1fa68c1aea2b3d7b9d4ef44c3732471616dc3ccf8279877c0b49688fd18cbfaef02b1bcbecd99498fa9c800e SHA512 c234e0d58e60e95b0e0f9bf81977cdf27fb42e685a540c6f0065d08bd4696002060ce20c8056c7c0b069b08ce2d4edba22dce5eed327af908cfcf33b52bc279d
+DIST thunderbird-60.5.0-ko.xpi 619730 BLAKE2B 487d30d44c0d2dc4e0b4df1324339a1aa0db5a7d451bae38c3276e2e741f81c9df314f1cde3abc325a39c1b161baa00ebbe5414330ba6715220a489848d1472c SHA512 bdcff86819b04a495957a944c0041cbd8f5704aa74fec483d16a27644b048aea5acc2c7cb14487ac0b85f54939b4205b8e669aec96659087a994243117885b06
+DIST thunderbird-60.5.0-lt.xpi 605441 BLAKE2B f1b59bcd03ecb0502016a48d432b17d4f6ed3a8c03378097808abca6dd3377cd648639385d7b58ff16bbe713aa433e0ec073a83a662960fad9dadbcad345e0c3 SHA512 816aa846ccfd06f5443655d24b5169211d056072c6459d28501b898db96e95c5245ecb25c277613c190dd1f117061d7fdef76310ffb3f6db1059adc032a73dcc
+DIST thunderbird-60.5.0-nb-NO.xpi 577003 BLAKE2B 7fe44c0146094aebfa1f24041e66527d7e92f0acbd219d7d318cc397ce0127637fd899cd80762a9781c7180184198e96ce40de0481a0c45b3478151b2291c849 SHA512 a7d20a44dc28593acd612f1d7a8c98364f22e94248467d5f7f2d815deba46bb208d2490305605026a95ac4bf9b736b00bc72ab493f109289ee6d45ce7e355b41
+DIST thunderbird-60.5.0-nl.xpi 583914 BLAKE2B cee3c378290d38201af8206fc853a8e4ea9985c97f01591da8cd60db93bd0e3856c5806dd4b75daa36108f854a6c03b62c819eadd873f5d22a9d19661826cb9e SHA512 5c1c614bc732eea0ebde6cf603f0768e81a787c3be7c60a4e0b45c2d51d721bebc048dbf97b24b5724564fbd16d8fa21bb656dec279844466206f2e730b6381b
+DIST thunderbird-60.5.0-nn-NO.xpi 576422 BLAKE2B ddcb8b08402efd5f6f5cfd91a9721b13a907c45cdddd586a72a843a1163051b4912eec1ba00e7a164b993735aa62c326f233451810f0a0661291ca506de2f26a SHA512 845745331686b1ff159b45cac57591f8cfe4d86ec68b8204b5eec05707ed4ff90944cafaf277be15713b22bf76b3e50c1e460e5f04e505c46bbd62089c9d8265
+DIST thunderbird-60.5.0-pl.xpi 480725 BLAKE2B 0ca29b95e2326f1436e9adb5db62f78a56a03df31f56ef8fcd3ae96afb43d65089082f6e0e1b6704272430f9cdf615fd6d9fe456837ebd2641bfb06a2511631f SHA512 bf8b5048e8e7bac39a6c3a1e1a6434e1c86302ab57d0fdbe4bf6c44794e14a1f340d942f6732757fbdb462fa6eb31725acd1327ede30a92d70e3e82642f02b87
+DIST thunderbird-60.5.0-pt-BR.xpi 588834 BLAKE2B 8cad9d58b3c6437beb29e78adc3624f5b87ca4cf68a0c0f788868d3923754a215cef387b024d9c39605a4b593ead38292737a9d81621b95e200f06f108e6401e SHA512 947803be4aa5a8435c7cb04e41a5987081afb0bb7cc491d372756947ed908565b0c8474dbb90439d32f026196bca74b7d97b12bb73130944489a4a5285130583
+DIST thunderbird-60.5.0-pt-PT.xpi 593186 BLAKE2B ee3bbcbb859dfa26cf791ccc99009358580548e3b58b67e324689188a571ac203e1421e49b0a7afba0df21eaab57bc41ebe784595291c5495aa9086e2b7d1772 SHA512 ccdbe3b0fe4d7e04ab2a4edf15736f081ce95594fb4256a8f637210ce5a9dc309f2083487c32274723b685192b4678a22a8f88b23ee45b2d18847724b14b40f2
+DIST thunderbird-60.5.0-rm.xpi 578384 BLAKE2B dfcc8cb6b8870aef82db72a327390f056066ddf422703236f2fdbe9f82af74ea0342ba1a7e4a2d71269ce3219034db3601333867e1d8e73b500d2026dafcb6a5 SHA512 14ea772f65cd70650e8998e40f6950186a617ed19463a2496da45265bc4b67a9b332e5acfc6e4906638252aa2ab7da5fb098a0fd6aa75314e42a0a7b13e3d0ed
+DIST thunderbird-60.5.0-ro.xpi 584308 BLAKE2B b2e55942e35e1cae301643db74f9de44acbbfcbebf2e2eb89c766eedf8aeaf35e913affd3a6456eb171fc5ec633b5765b9dbda3836b74f5dc8b0128ec22e5584 SHA512 082c91c17a5b96ba7b3f8290fd5722f109194ecc319958c2e081244cf6ecaa5ff088b1aabc300159f82fb22236c442d75483a35da37cda279bfb41693a170b43
+DIST thunderbird-60.5.0-ru.xpi 694705 BLAKE2B 29ce568d6efbb410789d5238cc0cba1fd281efd57d1138540edd50f7b472d525618b6ac68dabc1c2594a29ad49e76ddf118c01417a6aa0d6e4403950e0e48d0f SHA512 b9ff341461f5200a2577366fe9cdd944860c98d1fe90f13d08cfcef659f6bb8273e7b3494b6919d1c12eea9aefa02641e104bde377dae625fff39b16f5fbe5d6
+DIST thunderbird-60.5.0-si.xpi 647596 BLAKE2B 4e11ed29beac112dd08d5bd97ed3ebcd18374daa1faa7a99f6fde17bb793e9e3a162c137c6c8b666c1ead094a5d9d1ee722c71dfb66d17f159d48d15fa9735ee SHA512 24b16eab1ef45f9509e02c681365e3afed277ef23462692e209ddbd7b97ab58af1ac556d6bdfd7d5feb0078b0ecf5cd6766f1a9b0a40632523b5453708ca202d
+DIST thunderbird-60.5.0-sk.xpi 612216 BLAKE2B d66c36c2160cf7139917fd79bae0c3b2cbea1299613c9f35f8cc2d826474917c788285928d1a58a63768f106c70369d96079ce446437d02b1a8111c49e87ae66 SHA512 7b0ad73839b306382695f9d569ffa909c549a3dc98f18b024b3bec366b8f4dbd8fe2e8c89d3a7bf0dd48460e5361bff353128f68d8b6ebd3a3dd81f475785841
+DIST thunderbird-60.5.0-sl.xpi 589947 BLAKE2B 6b3238b96a7aa8351825b36cd152934f4bdd79734faee11119206fc387448cfdacdcc065ad85599e61bf7d2f0a51bdd8e5dfe14787e1833cc6270b316ac48085 SHA512 a9b6fddbe664062381b49bf671343149230f51454b134c9b9aac50675783088a086e60dd5dc1c0204148a6a2aaab9d996931461a2654a2d5a0a0ebbb2e9275f4
+DIST thunderbird-60.5.0-sq.xpi 593096 BLAKE2B 2e2f342e29920c313b72dc1e13e90d0141efa81351e8dd2307f7bf3b89ca20d937d60c74c2436b36994ce427f0a53a4e4914565a888645dcc07a98f1bc9fe756 SHA512 ce498ef9f57c6ee2f734777cc80df937c6a1b0d33d8ab8fb5dda1f66f68e76be9698287fac1e9b32bd6f937752d068d4008c8b87b2a30c4eb90ba15302045fb6
+DIST thunderbird-60.5.0-sr.xpi 641527 BLAKE2B b19836dbc5ebc96ba4a519a61da8971ffff54b909c851a53815c9e9219ea7d9f57bf3cb1d558c890ca18b7199f16677d711565968943be2abb2c7abba156aba3 SHA512 55c7333b1fcef53c1896dec9103220e668b5ee85c7b2af46476863a2d35bd49025726da1c8ced1f7e5b492be9ae8187263805bc1e2814c5d488d36b4ffbe1829
+DIST thunderbird-60.5.0-sv-SE.xpi 594079 BLAKE2B e9f4d91e6bc690039117ad8fbfad43fd77b0c95c25478d051855b57d72553311d0d546093427261c121a95c94ecba3c04a2572238ed6c2b7172daf912484b855 SHA512 7ccedcbb804ddfa160c70955c9a14623a41d99e3475aaa973019495ceb3b30645136ddbb19f28941becbd111214de973fb477bcc239f496843db6b42bb6473ca
+DIST thunderbird-60.5.0-tr.xpi 598010 BLAKE2B 0cd0ddbf2e8c019d08c026007f320807d1d8be07f4425f52f75b7b3cc665f6b233e0481dcecd0d64be247ce9c2d6336db9281f320a806a21e817802395fbe312 SHA512 09a77642cdf5c7af170e8d12bc843a8882d5857831a3e54effca37d4698c13ed7df234230b6b7937eab3e03bed10a4fb0b6c8673fd11587fac40c4fa7d3c2f4f
+DIST thunderbird-60.5.0-uk.xpi 684154 BLAKE2B 5983c0165806f3710b2dcfbc8a4cc0c6bec0799be87919050537c27629b643310627f1cb288ea88d03c6f043ff52503061c8e74c1f7de340751dbc294d5237c1 SHA512 ef4aa8e3f74222ddfa7b2b6f815f2fd3bfb59709806eec8e38ed0508760dbfdd8caabf91a96ea4849877ee43ab51361bf566a90d353979ec4e911cf285cf8a88
+DIST thunderbird-60.5.0-vi.xpi 637199 BLAKE2B b796c67f9ec8c6eb455a7e0914c7867f2b95094ceb1e099bcc6b0fb4b88dfbf83accf8a9aa8d1727979da4953c543f0b777beebcdba138a478ebde7966e1f416 SHA512 9379035dfebaea5c69dd16b62c12c99e2e9bce13f6944aa9636958b60ab40b8efbb309932cc21002b3c743aee932db412d5bcb7b033a3e0cd442704d7c7a9e97
+DIST thunderbird-60.5.0-zh-CN.xpi 626283 BLAKE2B cf4bc1f233e73d1ca5802c50f47e166606e14272ea4270346bd202ddff236d08684da0e6e322aeb31d1f5f8d20af00c4820289646be808e6c1ac651dbb2936c0 SHA512 f33da7be766b95051a55d3186b78069e30cfc9f8a1c0db6f7422103fecf3e1b4e466ced904a80785de25363ced9b970319b5b9c74c5da15dd9ebc7bcca3bd75e
+DIST thunderbird-60.5.0-zh-TW.xpi 626190 BLAKE2B 43f34e19d95a7ec4b7e51b4e22e849925ae41f3f12e9571d5feed609be5afb0a55d6b47a9a1082ad5a706f1ebf55dd467bbd3bd0c8123e0dedebed27b3f2c8c2 SHA512 12bbe8b1f71b51be31a6311a7ed2b554e07a7b7f86e2ac4ca261d7bafc983e97652f3b95a011c2fe4628637d5220a15e176d8c7eb2023269dcb464daea69e4fd
+DIST thunderbird-60.5.0.source.tar.xz 285636196 BLAKE2B c1b0040156017c6dbbaf16695feefa29b32d02b74655ca357201dcff22be7c61fcd3d2357e175939aada11c0d0211d0ecd8479528d08168f93f9ca1963cf9fd0 SHA512 b18bad3d0ec33a813ec8f2f7f539a9ba08bd05432a16b1838671a101a85d66b2acdd2573d9fc3117cecaa9aa1429c178d4ddbae987a3ce6e4e4211981eecb8d2
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.4.0.ebuild 17506 BLAKE2B 1545cd3099e76df51602d7758390701a89aac1dcefd44c1adfaa370b5af8b2d4ca496694e18b73f5a7398a9437e08aa49e59c483bffb2f4bf4e49bb148f3e911 SHA512 a52895b93085328c22b5b5f1dcd97a9b410bb6ebc83e6dd25e99dad50d654d4cc5759202ca5cac108e348c7a7143a748ed0370dcd072b3d80cf1ecf49ec0bfd4
+EBUILD thunderbird-60.5.0.ebuild 17508 BLAKE2B 0fd0e1ae8eeae32a00d1e44074ca3bd26a666a7dde3af364fefecd70ef23d313e75c3e139a8cd1b1b54cbab7b35a30433d5afee7a20dd787cf8d145d4d42049e SHA512 d60b52c4898ae6eec7385d341ed873ed3f7e4f30822123b8a1c5f52152b4c9f7a4607b332d926d7a174fc0bb48b157d232d7472c23f605861a58cb91025e8572
 MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/thunderbird-60.5.0.ebuild b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
new file mode 100644
index 000000000000..fc26a4a1a17d
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-60.5.0.ebuild
@@ -0,0 +1,561 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.2.1"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
+ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
+sv-SE tr uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHTB="thunderbird-60.0-patches-0"
+PATCHFF="firefox-60.5-patches-01"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug hardened jack lightning neon pulseaudio
+	selinux startup-notification system-harfbuzz system-icu system-jpeg
+	system-libevent system-libvpx system-sqlite wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/{${PATCHTB},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.36.7
+	>=dev-libs/nspr-4.19
+	>=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/gtk+-3.4.0:3
+	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-harfbuzz? (
+		>=media-libs/harfbuzz-1.4.2:0=
+		>=media-gfx/graphite2-1.3.9-r1
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	elibc_glibc? (
+		virtual/cargo
+		virtual/rust
+	)
+	elibc_musl? (
+		virtual/cargo
+		virtual/rust
+	)
+	amd64? (
+		${ASM_DEPEND}
+		virtual/opengl
+	)
+	x86? (
+		${ASM_DEPEND}
+		virtual/opengl
+	)"
+
+RDEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.9
+		)
+	)
+	selinux? (
+		sec-policy/selinux-mozilla
+		sec-policy/selinux-thunderbird
+	)"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patchset from firefox to thunderbird as well
+	rm -f   "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch \
+		"${WORKDIR}"/firefox/2005_ffmpeg4.patch \
+		"${WORKDIR}"/firefox/2012_update-cc-to-honor-CC.patch \
+		|| die
+	eapply "${WORKDIR}/firefox"
+
+	eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/comm/mail/installer/Makefile.in || die
+
+	# Apply our Thunderbird patchset
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${WORKDIR}"/thunderbird
+
+	# NOT TRIGGERED starting with 60.3, as script just maps ${PV} without any actual
+	# check on lightning version or changes:
+	#
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	#local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
+	#if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+	#	eqawarn "The version of lightning used for localization differs from the version"
+	#	eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+	#	eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	#fi
+
+	popd &>/dev/null || die
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Avoid auto-magic on linker
+	if use clang ; then
+		# This is upstream's default
+		mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+	elif tc-ld-is-gold ; then
+		mozconfig_annotate "linker is set to gold" --enable-linker=gold
+	else
+		mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]]; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --enable-ldap
+	mozconfig_annotate '' --enable-calendar
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	# Stylo is only broken on x86 builds
+	use x86 && mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Stylo is horribly broken on arm, renders GUI unusable
+	use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo
+
+	if use clang ; then
+		# libprldap60.so: terminate called after throwing an instance of 'std::runtime_error', bug 667186
+		mozconfig_annotate 'elf-hack is broken when using clang' --disable-elf-hack
+	elif use arm ; then
+		mozconfig_annotate 'elf-hack is broken on arm' --disable-elf-hack
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach build --verbose || die
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	cd "${S}" || die
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/comm/mail/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/comm/mail/branding/nightly"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/default48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+
+		# manifest.json does not allow the addon to load, put install.rdf in place
+		# note, version number needs to be set properly
+		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
+		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
+
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# thunderbird and thunderbird-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+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/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index f98a5f0cca83..5c8a496f7bf6 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index 663f26600b82..c30795b9895d 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -1,9 +1,5 @@
 AUX bayescustomize.ini 3968 BLAKE2B 99ef3ccb75d00c3615deafc9879d9a2150006df37c2d0c43a61f79ab303ee41d8c5f82ca9a1c5b43ffa0ac63867e8c5a3e89c846feaa9ac1981690984d763767 SHA512 a9608e96fb50fb42f5d0ee746b0e242e465ad072f5c449ab3298b438f314806a24610f56b7dc33473ac6bae14f0c6ad7481699b12a7fc8cc4069fc7736689441
 AUX spambayespop3proxy.rc 580 BLAKE2B 414149415c4f0b4529cdd404c6a9851ff0e233c2d68250b503947f6c9712ee36851328e777696858cae6e113fe2347cad046c9b131ec0f1e18084a4f32fce922 SHA512 414e087a9096eb05453aa57c16563b21045b049354b37aeb0b23915550993cef110650f1283b8cfd31509d58441ca5a55bbe40de8570b6b552fd424edc09ec03
-DIST spambayes-1.1a6.tar.gz 1007785 BLAKE2B 3c63b518dcaff7c14dfb5e10435ac0bc33bbe1662295355b2f5a3b9a44b241362c2ee60eb977500b0c868a88ddb99a116304bc3e2e45701d0922f85c37f8fb57 SHA512 7b8a6c54e986666064871298e70a04781ff33bddc3274734596ea577860707d61f95408caefd5511f586e285f8d7620d18fe3e6efcbdd0b26a39808abe44e189
-DIST spambayes-1.1b1.tar.gz 1008891 BLAKE2B 8f823498f0174ddef4b6f44493d93f6812ea0529ae6fc0ece10f566fa4b31247a23992c80b1868588e31404826b3e089615a788de758d4a2ce7c892bd024b202 SHA512 988acd799e9f4530099891f1d8582b29a4c156ddb5cf280623d2e9ac3566c1c9b9cbfa5f85d32161d7f1954364320f3795d500ac51e8944d140fcd3b626c3124
 DIST spambayes-1.1b2.tar.gz 1001993 BLAKE2B 71d5d1f900f144e83844e25e8fa72f2ce99cb4248263f056ebbe65f949172aecea40e7f68164f44b8f5e2300d3f48b6adb3998e32bad2cb22013525222d17ac1 SHA512 0f8e88a2b7d3200fbb08a8e55f549a06530cb2068215023f079bf2f4e399f2f7850bf4e9f01addb6a48f1e41a75872cc3909ca76b7567e2c93a9701bec7b2a39
-EBUILD spambayes-1.1_alpha6-r2.ebuild 825 BLAKE2B 24f1fc47eddb7165b0100f29271cef5eeb4e7b9ed93df69d5995e7df813c92255dcd995ec36427139b1e4f3702e0887936bda71b4b8a3a8a44d09ac69fb89fe7 SHA512 ec6bdae6ba39d485870228f4abacfa178251e54b05915bfb4cee7e29f844df953140adcb972a8d1fd78b3d6f50d507250bcdfa905db50a9dc2e753de0e4f2bec
-EBUILD spambayes-1.1_beta1.ebuild 824 BLAKE2B 5acb5f3ae38939bdfde9da6a432fdba5f17136a4b993196e0a14713971cfd672fcc03b064e0e75c4aa3e7d0a7b451bd0aea1b4dcb3bdb81249082a62ee9a3505 SHA512 a63e85e1042a9a266dd223ee194bb7152a0bbaefc7aa698863a3f77b71398fdc6d17b84bb16417fca50c8bfd5b05a994737b2ee126ba1c5d42aa6a6f4a3625dc
 EBUILD spambayes-1.1_beta2.ebuild 890 BLAKE2B ca1dc35aae8f0c67e25db4535578d53176f94cdf8f994956a2ff0b2a097d1d11dfe53b7533923b3993c3394463527396ae9ed8d930f72124256a76a4ae8fdbd9 SHA512 6d29acc56f2d851e6845667324a5fac12c2b58c3c1fde971b54ac5dd9978bc5cd78b4bd2a34363b632648f3c2bfa590f5b3ee14adb3d6c3375013b051f068478
 MISC metadata.xml 300 BLAKE2B 5c5d0f1fee6cdfeaa64711764815f4d56af882ac8bf8745a702bfb9ab73f1a9b3b8800f55285cebe4735faaa5c76d44dada70585526321588872a0354f563458 SHA512 70cd147426080843aa4be83710c922d59fdf446e59b273808a3cbb856f8940fe1b4fc32fc62da65e57e142aa4b4efe761c636dd40aef2b5f950f263d72718598
diff --git a/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild b/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild
deleted file mode 100644
index 7cbb2c926682..000000000000
--- a/mail-filter/spambayes/spambayes-1.1_alpha6-r2.ebuild
+++ /dev/null
@@ -1,40 +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
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="An anti-spam filter using on Bayesian filtering"
-HOMEPAGE="http://spambayes.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/lockfile[${PYTHON_USEDEP}]
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc -r *.txt contrib utilities testtools
-
-	newinitd "${FILESDIR}"/spambayespop3proxy.rc spambayespop3proxy
-
-	insinto /etc
-	doins "${FILESDIR}"/bayescustomize.ini
-
-	keepdir /var/lib/spambayes
-}
diff --git a/mail-filter/spambayes/spambayes-1.1_beta1.ebuild b/mail-filter/spambayes/spambayes-1.1_beta1.ebuild
deleted file mode 100644
index 389070b0ef58..000000000000
--- a/mail-filter/spambayes/spambayes-1.1_beta1.ebuild
+++ /dev/null
@@ -1,40 +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
-
-MY_P="${P/_beta/b}"
-
-DESCRIPTION="An anti-spam filter using on Bayesian filtering"
-HOMEPAGE="http://spambayes.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/lockfile[${PYTHON_USEDEP}]
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc -r *.txt contrib utilities testtools
-
-	newinitd "${FILESDIR}"/spambayespop3proxy.rc spambayespop3proxy
-
-	insinto /etc
-	doins "${FILESDIR}"/bayescustomize.ini
-
-	keepdir /var/lib/spambayes
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 495c0b800cc3..0bf69938a5ae 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 32d4a10566e9..fb56988d6752 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -10,5 +10,5 @@ EBUILD courier-0.75.0-r1.ebuild 9430 BLAKE2B 7bb9c5b9fe5a8f50ec6c17a9c4b99e2e07a
 EBUILD courier-0.75.0.ebuild 9325 BLAKE2B 7103206f2ba73b4acc5097ab7e14595013c051042f64ec42b4a3c2b3430d7830638cef2386c38495fafbd8eb2002396b853a1eb43548fce6460541f3b8724823 SHA512 71aa350b36bb024805fd56adcb56b30a100d5cf0ce5da1bf14027dd51d8abf4d933a6153064e0f688b80019771e427d689d59bdc1e5839f600013c9fb8f5af18
 EBUILD courier-0.76.4.ebuild 9327 BLAKE2B 6daccaf5e311202f157887017b63e5e890595ed73a0c52cd87e1ddcf0b3d31666c4bbd443116868efe9b555661b94da8c575d1cb21dabf6c3fe64248f2488ec3 SHA512 91a9cf8f9f2953b97793e6c1fe3db0e3e0eeb81692a8604eef46736b58584235bff3194db8d4de2d062e4d90a267c2e578623f8a2c4e710b7092273096672a90
 EBUILD courier-0.78.2.ebuild 9326 BLAKE2B 67554fcb0129810772ff951205ea84f640fb24da44a2b65f87535b14069e58868f7c7c55e77f6533a5530710954eb4c3d8d5545191f190c13ca95b4f95da6628 SHA512 e4993a1480d23f2b75400626d9f5ba0ef5f212ed44181383ced92c3648ed99efe59d684128c55296240c80f85ff42d7161412856f7eea2754f319078278fcf0f
-EBUILD courier-1.0.5.ebuild 9545 BLAKE2B 9e3d067c95ebe4f034485bfecce091d472f0f3837a04af8d39ac5d5030e92c4422049d737f760ee25813cac241e3feac41acc9d8513f8d13f57b50d56f157c89 SHA512 6a6889d94e3f1dbf0dd9e07b329b515031a2dcd87355ab484fd42a1300775b61e5b0b56d752f407d4de77bebc5483248cb3e7f689f36ff11dd1c67e2efbc5af9
+EBUILD courier-1.0.5.ebuild 9555 BLAKE2B d94eedb6c394d58e0fad1a101e1bf4c162df58b406f5310e8146322b037a6d00b7cf752577b5c8b0087eef0702df76f56b2c271100575c4773e2f9d0edcd7388 SHA512 f04c1c05dafb1e11c7f44e7417633edf505d5524cace2a5a727a02fb706a8839fd72f705d4661ff2722cc59c3ea6be9746a31187cd275f104ba7aea0f5107487
 MISC metadata.xml 860 BLAKE2B 7d4e6eed638b9c07079d56a5c195a27d77ede8f9be9400b2f7158214f6d065c836422ef64110e3ff580be7c1936ef6c470f4ed6ca7cbe6e2744487fd6bb637a2 SHA512 00c4c31649f17ac2fba94122762bcd4c2f9b57ad3117645c1f0607d6d214ecd6c9c789a7b2d48b1945472e38da49257ea2903b1abec3294cfecbc25ff4501c7e
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index ac78da64e520..1a2cdd1f5412 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -34,13 +34,13 @@ DEPEND="
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
-	!mail-mta/msmtp
+	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/postfix
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
-	!mail-mta/ssmtp
+	!mail-mta/ssmtp[mta]
 	!mail-mta/opensmtpd
 	!net-mail/dot-forward
 	!sys-apps/ucspi-tcp
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 24ba51579333..a29855c4abad 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/polarsys-b612-fonts/Manifest b/media-fonts/polarsys-b612-fonts/Manifest
new file mode 100644
index 000000000000..fd4e0042e2a6
--- /dev/null
+++ b/media-fonts/polarsys-b612-fonts/Manifest
@@ -0,0 +1,3 @@
+DIST polarsys-b612-fonts-1.003.tar.bz2 2823506 BLAKE2B 31c918285f6072d6cc8bd44c2b57114eb027447b0002ea16d737dd75772299169fe1d9f20620fd09fd96c34b61cf41544848d945c339db02224f045d979d4d22 SHA512 7ffb6fa858eb20d02bc2fc12788fdfd3fd15117b1a5e1ed2cc70fd19bc9fad5ec92c714dee07c85dd954911862f5852716eeccc6b72d63ba32993f3d03e35f44
+EBUILD polarsys-b612-fonts-1.003.ebuild 477 BLAKE2B 5100ed3e3cf796fbb6717d8e42eef4664a78c370ab2a17c5775ea546d7ad3f1f04c3c9e060865a05bb5ab5b02799f6218533a2e608c1bed4e98912fbaac4093f SHA512 f09f68f90c4b71ad3011f39aaf0e69fede63cd01ae4fad4f1aa4ca933e77ce0ed5725df3aeb83e363c359b9caaabc6277bbe34e2d7fcddd7c05d2fdad877439a
+MISC metadata.xml 547 BLAKE2B 8f7833eed4fe368c250fcf32a0abc4993c4a5966ffe1085ac2826a3c0924eb126aae96914f2235993a2d47d878e10fc34a3aa42e9dccf1cd3cbe5275a13831fc SHA512 6da5fd376c417a7a0d995c7259d11369ee93715f35b298f0e00c412fe9d1b8a1e34beb2a7929ea38380646bdef11282b82777bb2729a2ddc4022120b19f5a697
diff --git a/media-fonts/polarsys-b612-fonts/metadata.xml b/media-fonts/polarsys-b612-fonts/metadata.xml
new file mode 100644
index 000000000000..8503115f591d
--- /dev/null
+++ b/media-fonts/polarsys-b612-fonts/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		B612 is a highly legible open source font family designed
+		and tested to be used on aircraft cockpit screens. Published
+		on the PolarSys project.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
new file mode 100644
index 000000000000..f2581c71b71a
--- /dev/null
+++ b/media-fonts/polarsys-b612-fonts/polarsys-b612-fonts-1.003.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font vcs-snapshot
+
+DESCRIPTION="Font designed for aircraft cockpit displays"
+HOMEPAGE="http://b612-font.com/"
+SRC_URI="https://git.polarsys.org/c/b612/b612.git/snapshot/b612-bd14fde2544566e620eab106eb8d6f2b7fb1347e.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+FONT_S="${S}/TTF"
+FONT_SUFFIX="ttf"
+
+DOCS=( README.md )
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 474758874097..7164bb37e34e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 4976f3a8c6fe..ed172c4d3d7a 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -5,5 +5,5 @@ DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
 EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
-EBUILD dcraw-9.28.0.ebuild 2964 BLAKE2B a538ea284ef09c2d544fc87281cf2ea2f76ff16fe9d99877830f805f54f43ae302b2b4b552c7313851fc5074c11c31fcf6d4e8e2baead14b38bfb97abafb4a35 SHA512 af6eeb8898d9c35472d382139816aa4a62afaad0ceb62d4ae70a7933701631d5026af8f381b69d09136e92c8ad2c28d41c9672e43cd6594f254fda2c2e4df653
+EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0.ebuild b/media-gfx/dcraw/dcraw-9.28.0.ebuild
index cbd814dae666..78f643559b3c 100644
--- a/media-gfx/dcraw/dcraw-9.28.0.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index 3ea42f6cc482..6d2ab8fae8a2 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -1,4 +1,4 @@
 DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d
-EBUILD mkgallery-1.1-r1.ebuild 512 BLAKE2B 2ac706c6420d4fffadd0d150342b1cfeec1216ad730212eeb8ceb16861647e19c63862e6b8eb46c2e8ab51d2aa12879de0be2236ce7120b00063dde50e106387 SHA512 24a12dec85a61730c93cc93febb87e1dca2b62412c00ab6e7e7e180de74ed879681f292f7bcca27f676e462bda197636d4c3cc3ad15d52bad8cdba6d767d4068
+EBUILD mkgallery-1.1-r1.ebuild 511 BLAKE2B 8d4610fa40b9bd30c9bf13a78819dab355fb07d1f5df23fc3985c5e1734f1ee5a1ce0fabb10f44c955b48fc9896e31146aa0be8d072592b1478fce016152ef96 SHA512 24e19a2b32a691851bff5babd4ea57f8a3fe0a4a8ce84f7d1530038994f32e1a7083e213f9abd14df8ef35a72ad5dde0a3b4db0d19ac409970a8652a06c5c94c
 EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82
 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651
diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
index 3795844f753b..11a3d4b39d3f 100644
--- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.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=7
@@ -8,7 +8,7 @@ HOMEPAGE="http://mkgallery.sourceforge.net/"
 SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 SLOT="0"
 
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 6a47cd0d80ed..7dfcf9e72d4f 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,6 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
-DIST openscad-2015.03-2.src.tar.gz 13307974 BLAKE2B f3532d77db15250abba444949cbaee012bef02410b6c66cf2abfb6aa2a174f6438c2469b8db9ee043d5d77799ccb1f82c608015df14924670d843a6807eb7fe2 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
-EBUILD openscad-2015.03_p2-r3.ebuild 1572 BLAKE2B 747dcdacc2a08772b1d64d2908978fe16a6a04496e7ad2d053d622c733835f0055edbae1d3a400a0a3293168ee5935b7ab17b4379ee80531df0654ea49559833 SHA512 c7cbef11976633ccad4f0f947a07fffb1a7974220f46af1a2bb81ca577236126ce14d642bff0d5a182cb2c5519bbe669fcbe4806678294795cc0afe71aeca589
 EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
 EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
 MISC metadata.xml 754 BLAKE2B d8247b4210f8e5470a0e2bbbb21c4b0755b7aa0beac0f75845bdda5135eb86a9214888cca436a02b7e566520865aae7714a9942bb5871c8e8fd54240b933abb4 SHA512 23905b2fb9ff937bdaee469086c9eefc3404de22e72be73f470ee51b9d078da20c856918d320c7156221708c11855a7e12ff6f277f4d5cfad671dcb4d9911c40
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
deleted file mode 100644
index 815a2c46da75..000000000000
--- a/media-gfx/openscad/openscad-2015.03_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=6
-
-inherit elisp-common qmake-utils xdg-utils
-
-MY_PV="2015.03-2"
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtopengl:5
-	media-gfx/opencsg
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/glew-2.0.0:*
-	media-libs/harfbuzz
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( virtual/emacs )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/recoverjpeg/Manifest b/media-gfx/recoverjpeg/Manifest
index 7c4224c17569..a170126cf245 100644
--- a/media-gfx/recoverjpeg/Manifest
+++ b/media-gfx/recoverjpeg/Manifest
@@ -1,11 +1,3 @@
-DIST recoverjpeg-2.0.tar.gz 83762 BLAKE2B f854c2c82179551fcd96a17c89e110bd32adaa2af728f74ee164344e146d094f7b773bbec586a553ca83a93b032dc4ffa60095f384862ae9ac668f138db798fc SHA512 c736a95011ea124eb4792c7d182b1da43b675323fbdeed06d15abc2586bd4010204bdf4529a8bc2c5f2d95c33a7963b8a6115c33f5e65495290ddb69ec4b600c
-DIST recoverjpeg-2.1.1.tar.gz 87445 BLAKE2B 2d8b317b819556a177342096dfc1c07b8980d09340aca3dbe968e00b3549c011bba3600311ba34cb1d40e6f82b06e3ce3261b3341e90a2ec673a6fd8dba57dc1 SHA512 aca4a9cf5403db8c56f357c5f6f12b17e5be428e4846af65add19bfacc990e3e2e2afc27cfaac1635cf4edb9289ab8353a239d32053c570bb8976992d30e721f
-DIST recoverjpeg-2.2.1.tar.gz 88391 BLAKE2B 587350bbe74122b9e08130579cfcc65829c3a1ff958e43945f86494d0a16a62683692983981997b6cee75cc5132fe510ed6d8b46fd577aa09fda533d5b156de1 SHA512 1308542c25cccb0daefa9248f7a41451f59374e33c3ad4a82ad2195aafb66548b98bbc57c56436902a6c5732a5b20f69658567378f0a211a61f258cd62d699b1
-DIST recoverjpeg-2.2.2.tar.gz 91440 BLAKE2B 16a84d7bc43ac63e8633f6ed08504861906add7e734af5f6eb289ba175dea33f64eb5c10a14a0080bb0d4b03c249742abd690bd87089d1a13f828b6b2c002aa4 SHA512 fc609aa47a96b44e10aef4137b92f7b8e99d9f40ab559870225042acd85a97bc745a494cabb29fe21b3b374243c4589eeae8da7ec09a3bacbf9462762782ffc6
 DIST recoverjpeg-2.2.3.tar.gz 91672 BLAKE2B bb324b7810b5aa3103ad0a9a67df9f855ea1a479b9b9651cb4b7d1a4c511a87e8fd891664d76049b450b5077355fb718489904d3d7daaca3865a451b41980f4f SHA512 67f923193c9b012302ad4e374141803992bfa4e4ac4c2384c8d44df29927c06a5224caefc936e30cef3fe1ca6dcf9f3544fc5171e4f76d17a83df974d0253c23
-EBUILD recoverjpeg-2.0-r2.ebuild 464 BLAKE2B 1518232bba21a32d0bd5cea332475c552682b54a8e35b632e84a297b2eb2cf9a4b41060138f06b87129e9eddaac763c759dbbbe456b39381fa9e4ae45a956760 SHA512 996544863a00c0f747d548f021cd8225383e92d788ac29c92f4f4903393cc3902020a9ec3a7dc29faedaa22e5c322984b6c05e71bd6fa46dbe3fd892679228aa
-EBUILD recoverjpeg-2.1.1-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f5982aba84f9cd41fe0ad221227422f2394b4fd11586563a023367b55eade5d09dba5972e279880a20baa5d8334f1174ffc SHA512 ccebb94370c5c9ed496ccf7eba0f6e992d11d5c2d680517fa5f5273be0e6b2a827b51b7495bc24ba229f8fe1881c2cf0a097cfa3e40aee876a1b35e532d51d5a
-EBUILD recoverjpeg-2.2.1-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
-EBUILD recoverjpeg-2.2.2-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f5982aba84f9cd41fe0ad221227422f2394b4fd11586563a023367b55eade5d09dba5972e279880a20baa5d8334f1174ffc SHA512 ccebb94370c5c9ed496ccf7eba0f6e992d11d5c2d680517fa5f5273be0e6b2a827b51b7495bc24ba229f8fe1881c2cf0a097cfa3e40aee876a1b35e532d51d5a
 EBUILD recoverjpeg-2.2.3-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild
deleted file mode 100644
index 0d7e2b17aa45..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild
deleted file mode 100644
index 1cefa1795ef4..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild
deleted file mode 100644
index 2ecd6e8acb5c..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild
deleted file mode 100644
index 1cefa1795ef4..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index ce26a44de0d9..8ef1455ac893 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -11,5 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 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-r2.ebuild 8140 BLAKE2B 8637061b459d53e5ea2c46815ffa2ded960825a2b134e52da6063eb8869a577c9fd4b5dfd6d9e000d4a9978ed2d148dfe755355f1eb10d247ce21d54d1ad50cf SHA512 507035bcab7598e62fba58c2323c9ed61c773a3af4b080fe2a9f65db5a89711027ce9881b0f38c8e903e1d577af57b4d9759f9e6007b6f7687e94cb06dcdb5de
+EBUILD sane-backends-1.0.27-r2.ebuild 8136 BLAKE2B 7f5569990041d9a169e4fd3f2f75c8664e7f6689db297d40dcd2c9d6d4bc68c9f458310d388e2ed8c89792d8e0b0df3f92a2e19315ba96bb4930cb032cc04a4e SHA512 5b58ad63b8dd093a2a5e68a72f1afbb3e8691de2c050f96a660efeb9e84cc3e64bc9e8b6998798f409e67ad51c0dc40e2dcf6fb011592bf4d6d6360c4882b3ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
index 4ce3733007d1..d6fd1790ccab 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-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
@@ -122,7 +122,7 @@ 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"
+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}] )
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index c46e98dbefdf..e543b9d11425 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,6 +3,6 @@ DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 EBUILD scrot-0.8-r1.ebuild 662 BLAKE2B b4b30806cfb63597a748b4924687259224dd09c0d2eb8a698786681595ec0124434621cf11de7d16b0c8a25188a6bdf230d9117f76bb6a5da4965e21652f379f SHA512 edd9a48e946ea4e3cbaedf277c1d80f9bd8c5a727da72ce1e6167fe1d23bbe9103b804197e4e46ef0a47500c54221d2299bae5abfd709eb5deeceae6ba10c66a
-EBUILD scrot-0.8_p13-r1.ebuild 1002 BLAKE2B 6043785eb7f737503e59c6835f054600e357374cd1b73e33d009dddbc4fa6996a37cf28ecdd735b21330a7fad42740142aaf0636a941b3ae59f0cf2bc4db8ffc SHA512 dd5bbb9672729f53fee54b7d2fde70d0c15f8459f27df3dd47c3d612f876c9bf96f240798501afc3563577da4ffe57c9d20fc17ce100c74f109f8172252dad6f
+EBUILD scrot-0.8_p13-r1.ebuild 1000 BLAKE2B a0c67967afffa40e9b16768dbf78090899ed5304fa2f4d8103c52898179d1816eb1b483792776e0c9b657c34a9e5d876df1ba98bb65c4aeb961617da8e7315c8 SHA512 2155cf6a25f10636fb11053434b1256d29040e891590fcdbc8e1119fb451a3ed9e7966f2b57be46ba865156e74737b7e36b5213d23b427c88a3cda971b5e0578
 EBUILD scrot-0.8_p13.ebuild 909 BLAKE2B b7848136b4b9c6bebc4ca18f6d562dbf0e2bdd164a92aeb60adee4b75352e08977dc9ca2938fc235b06761e7057f72f3de4e03547bd738f1f757b1703b31ffeb SHA512 98b9ef9f2a381fb4f33a87d51b0115ea38edea097bba1a5c71f96be1da04e6182e3e2586deee1e64962d2ed14ef2ec57458a1ffd842952cb8981bab8122224fa
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 46e7b729c2cc..f3270d6118dc 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.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
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc || die
+	rm -r "${ED}"/usr/doc || die
 	dodoc AUTHORS ChangeLog
 
 	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index fb2176fbdc3e..0cb873b92fac 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -2,8 +2,6 @@ AUX videorbits-2.201-libpng15.patch 826 BLAKE2B e3051587a3198b2d3df970e01b4a38ec
 AUX videorbits-2.205-fix-buildsystem.patch 635 BLAKE2B 89499ec57ce08722b0e8fcaa0bfc37cabf11627fe867e905b0cb329323453052cbe92ccd00f06d26beef11a134d5430163ac158b40fb398bdf448087f9709b6f SHA512 46462bdf437424f3af86526c1f2dfef68884f504646357ff3e5779f4629fdf22742a26e2dcf9df9b03a20da8125e87cb3b4772600d7590428d6d0a31f711ae9a
 AUX videorbits-2.205-qa-implicit-declarations.patch 712 BLAKE2B 5b24e38dc2951659f2c45ad50e853796d91338e59b1c55e6ffc396c4d3c221e80a559dc0aceb999a3e594ca9b61beeffcd0177d98c5daa6758582af2a25e314a SHA512 cfcab0079719ca2595b83e65ded05b8154a139304c23184823f0c957bb06af09465d486f8763a83baf8cc298b16f9e3b0b53f6218977972555bf2142ab3e43f8
 AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd1f9de5a49e3f5cf552e74bd9953985cbea5bff6002bd34c90cae057cd8a41272232760310f510418c0fef5c1ae9fbe3a93b1fb5 SHA512 cca1aa22cab689537248b9c0026acbf33114b359c1ab7b66cf23ac6f038dfb7653c48229b0b581552b23ced35ccdeae00b3676059745775aeac91ee7f5fe8d7e
-DIST videorbits-2.201.tgz 648187 BLAKE2B c279c6bb045412d3a2fbecc7a0955694b761c929ea3f0c73b6e64b1ff9a14e69a168b37eadeb8f99e6e1a2daf4863be87a268b74a619f16efaaeacc4e708ebb3 SHA512 eeb233487ac33702ff58f9434ff1850aac5ede9ecfebe4b1d313f07451c1cbb911ba6adca013136639bc0d01480acd71e5cffddcbf48af5aef58d40f48d6655a
 DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
-EBUILD videorbits-2.201.ebuild 839 BLAKE2B 0723c77e35508dd0fb030c4b082fced02ade44190c57428870da4788c78da86b030bdfbdc0fba7c7298bb6385540d971a3a12b6e6b9c6fc26abbc9395b9ffa2b SHA512 03e5513d9354c81464e54f3718653bd5e726d507b0eed2089e4ee7f8f57e239a6804f48167fb756ad11a606370b83d0cfb552e2b4caaa18ef740a230004443a5
-EBUILD videorbits-2.205.ebuild 810 BLAKE2B cfc2af76fea850ff5aaeeae9b75ff3df34708bfebc17b10534e62039b0bdc303b94f5bdf2b590838fa9bed3c8a4446839f2ed612989a754ba421b471b215a043 SHA512 ec9919b1745701dcb0f0a265bd394fa0a50eadff84d6a16b5d1ff795937085866e4233dd8915c609aa82117fa8faf84b6faa3dbf59752211d7b5f0a975caff6f
+EBUILD videorbits-2.205.ebuild 806 BLAKE2B fbd4d3fa5da3be4bc15684e792b9a951c7ddbab5db83ada4c7be8c35438248f221934cb415f23863aaea2408a65f8a348fd612eb214347a89fdeea69d0042883 SHA512 2c92add8732840b7de77f6341a83d14b060ff09cde893070c43b212419d4653edaad6e9a9ea970713fad4d75de235bd12b2c7f85d19dce50603085aa56064323
 MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/videorbits-2.201.ebuild b/media-gfx/videorbits/videorbits-2.201.ebuild
deleted file mode 100644
index db5db4dd3924..000000000000
--- a/media-gfx/videorbits/videorbits-2.201.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a collection of programs for creating high dynamic range images"
-HOMEPAGE="http://comparametric.sourceforge.net/"
-SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	sys-libs/zlib
-	media-libs/libpng
-	virtual/jpeg"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.MORE )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	sed -i \
-		-e "s:\$(prefix)/images:\$(prefix)/share/${PN}/images:" \
-		images/Makefile.in || die
-
-	sed -i \
-		-e "s:\$(prefix)/lookuptables:\$(prefix)/share/${PN}/lookuptables:" \
-		lookuptables/Makefile.in || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
index 0f066360aafc..6628294ba749 100644
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ b/media-gfx/videorbits/videorbits-2.205.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/comparametric/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a773f9bf08d9..3dd415d5b0ef 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -9,5 +9,5 @@ DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa86
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
 EBUILD xv-3.10a-r17.ebuild 2598 BLAKE2B 035bf28413f30b3a615f59d3266c59b4e9833f8d26ec84b2351e0a9ec3a1da90dcf12f2ae3e8afae1d79369bb5258fb6532ef76dca72c0c0539f4e981f4aef61 SHA512 6f56e5bc72b1912a8901355ed6847bbaea44bc4c11f05e5537e1921bb1b177537604116683e2f80d523675d778ca182fb474eb2070ee3c9d002ea621b467dd24
-EBUILD xv-3.10a-r19.ebuild 2455 BLAKE2B 121aad34e034f9ea8a2366f5179b24e5378f963ec8401e48a8fd64719ba9fc74a0c94f2f0089d0cafca501e3bf6b9194ebe3199865c9a29b516b0800a0b0dc80 SHA512 580e634dc26b86c8b5ad6cc8076d9ef3d76777b1725a37dd46c0fa1ff8e5528ed5d5a81cf8474549263e77c657726330805cf963a98367af5c2cef7860df587c
+EBUILD xv-3.10a-r19.ebuild 2451 BLAKE2B e381a13d824fc74a19f93f676e7375ed7ece8cb82aff2fd76780eb1f7880a58f501ccdaf99e2d8901eb3091531c7572dc573149fbfbd431b1473f1e12ee1dcd9 SHA512 5f76112e4c9b8f06c22ca4919a0cc0e63f4c6b47b427edc9af166968040e3d7ccc84523c04b153213785bd466e050820fece2597814d9b5d2434fb28747f054e
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 1b021ad5df62..9adb4d4493f1 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.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://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a6bfffdbf0e4..4623e81e8d19 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 6a7ec58c85dd..a97581ad1bff 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -9,8 +9,7 @@ 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
-EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
-EBUILD allegro-4.4.2-r2.ebuild 2590 BLAKE2B 11772937e0a9b43f9ed52a26467ac5ac219caaca7f2171df009bf33047d0596750c9ee2a92b3cb322a49bcac5067ae43e5d696b88cb020fca82773a0f5ba07ba SHA512 9929afa8ea5647e957ee1070b304fb1ac0532a9261569c93d29addfcc6a9fd342249cdcd0d4595cdce6862c6dae8109b6096481c5ddb4e04e0ab4b07e2f68252
+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
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
deleted file mode 100644
index 06ed3de8d269..000000000000
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop
-
-DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="Allegro MIT GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
-IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	svga? ( media-libs/svgalib )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-		opengl? (
-			virtual/glu
-			virtual/opengl
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shared.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-rpath.patch
-	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
-		docs/CMakeLists.txt || die
-}
-
-src_configure() {
-	# WANT_LINUX_CONSOLE is by default OFF
-	# WANT_EXAMPLES doesn't install anything
-	local mycmakeargs=(
-		-DDOCDIR=share/doc
-		-DINFODIR=share/info
-		-DMANDIR=share/man
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_EXAMPLES=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JPGALLEG=$(usex jpeg)
-		-DWANT_LINUX_CONSOLE=OFF
-		-DWANT_LINUX_FBCON=$(usex fbcon)
-		-DWANT_LINUX_SVGALIB=$(usex svga)
-		-DWANT_LINUX_VGA=$(usex vga)
-		-DWANT_LOADPNG=$(usex png)
-		-DWANT_LOGG=$(usex vorbis)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TOOLS=$(usex X)
-		-DWANT_X11=$(usex X)
-	)
-
-	if use X; then
-		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
-	else
-		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	rm -r docs/html/{build,tmpfile.txt} || die
-	local HTML_DOCS=( docs/html/. )
-
-	cmake-utils_src_install
-
-	#176020 (init_dialog.3), #409305 (key.3)
-	pushd docs/man >/dev/null
-	local manpage
-	for manpage in $(ls -d *.3); do
-		newman ${manpage} ${PN}-${manpage}
-	done
-	popd >/dev/null
-
-	if use X; then
-		newbin setup/setup ${PN}-setup
-		insinto /usr/share/${PN}
-		doins {keyboard,language,setup/setup}.dat
-		newicon misc/icon.png ${PN}.png
-		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
-	fi
-}
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 19cd6bed639b..5797f5829b3f 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="Allegro MIT GPL-2+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
 
 RDEPEND="
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index f4367ad25205..e56c9a0899ea 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -2,5 +2,5 @@ AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1250 BLAKE2B 6208b2113961830c37440d0e91b2c052ad954714d53376e4c71af8606c88252c5e8423e0b332dcf0e4e8f85cc8e54f0454c0c42ad30f9b59147ea36949d5f3e5 SHA512 b56923e3d3f4b856f9f0387e1290d2c8e95d72b2b2de718430d5760b384bef3099b918de021c16d8c2ec112d25f0cd1969404b5b08d535f88f707cb9b2e7b3a4
+EBUILD ftgl-2.1.3_rc5.ebuild 1252 BLAKE2B fed9a7a8e2a4868e2c2457f070f5a889d17758cadcb69c6ad11bcae79fcaaf43504dfe2d00e7c220847f524f1f4b9f426bf264e6988fb41494b7d70355f03ecd SHA512 7cc82f40baeae60b3510dbdb3f1ab9792bf9141f52a95e97b610b35d56622e459e2807ac1ab3e6562cc9efc3554d6dae070d7258607d1c7744456cb2ca98ef74
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 068c13cabe6e..4081b052c58b 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.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}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 5fa8151309b0..0e70d164a8c5 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,7 +2,7 @@ AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5df
 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
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10-r1.ebuild 1824 BLAKE2B 524284f047a6cbbfaede824ed246504f8f979166e007d58bfb82faabaccc11a361364deaa031102652b8864bdc9e8d72070eb3bc45828e03770e52909d900513 SHA512 83dcd434159cccef0002a7a13588b69665a905a9326eecec4f6ccd993b29919c249fa33d4346bff4b9c079f8daef54b486df492cad71e3e86778996dfee39af2
+EBUILD gexiv2-0.10.10-r1.ebuild 1851 BLAKE2B d0c935df31f103eb166f4fe97805875a54041023c12802baba94ba6ce92a22bf536b8dca069df2a3f07909226194359638525ea191a14c99ecd74d435bf50632 SHA512 fa830b8f1bd1ca5ecd9f1c9a3e459654c63ac82db1c2ac717931f6085fb25bbf7a50bca36d607a10aefde01783ff7610deb20f87791a5a30f918f3458cb3466e
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-9999.ebuild 1621 BLAKE2B 20ec61c95e9cd66dd9a835363a27a439fa7fd70daf50ef79553d17e2e7347913fc7f27755118f109d7f74ea97c9d517e5dab4b30e0f118675d310e8d55771c5b SHA512 48a71d0c0fa913989b741b31810703781a7adbda6031d3030c152d5db25650638ce80de614551f7336b99986d57bfd361a1c743e1063259ffc8ef77eccf0c6ce
+EBUILD gexiv2-9999.ebuild 1652 BLAKE2B 5a00ff2ccdd58025bdc614384e70975f871ea4c861ad7ec91ccdc5b942dc621ca4fcdbcefcf40e2016c548bd0874b168609dc1939ec54d4a13be163872f70bcd SHA512 b5d591aa541ec76e8aff3372b28815500815ca686ddca872ebbb3c6a082077e285a69b37794f676cb7b83dae5fe3a24531e35141b2f166ffd5702be2c0151a73
 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 d0fea160c649..8d41339ca452 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"
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
 	test? (
 		dev-python/pygobject:3
 		media-gfx/exiv2[xmp]
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 1c6c54fc4d10..b5d7c56dc951 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
 	test? (
 		dev-python/pygobject:3
 		media-gfx/exiv2[xmp]
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 469c3fbb551b..6e2b4e0794ce 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -5,6 +5,6 @@ DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa
 DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 EBUILD glew-1.10.0-r100.ebuild 1948 BLAKE2B 49358c8d4969c8ed80c551d6a8dc504a2368ddb5a96f6f8a3e41d38bc028e70f88b714913f6b55cf85d101cb4b8f5a1d8eeef0a64803291e3e553dfb3234fb5b SHA512 97b574ef48d5d88bd86299fd6a9cf3fb85440af015e50ecd5ed841b214b0e9fd278c4d9e70b57c3c6224a3105582cbbfd7da1d2fcb48a6165d51a9421d9c797c
 EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
-EBUILD glew-2.1.0-r1.ebuild 2528 BLAKE2B 740ca5b8368eb073dd23a5a13ba44e1093eeefb1118486139e4f1ebf5d7ade4016ee1898e9f2b9ce73a5dc743f6aaa58ec660f4bf1bca9679cecd04d489a07a5 SHA512 846403dba906bfeb499b7f5320cc642f29161082e5ca32c48114bd019447dd971c97005f76791157a52fc62b9b39e2bd2012a8a3c9c6bcedfb911391dc107c05
+EBUILD glew-2.1.0-r1.ebuild 2527 BLAKE2B 2ca9fa9a24a8c2bd5ab9fc562920494776e07b905064f29741a51a6e1b43d1c6e2d17cc8aa7255972b963633d3a134b43383eca16a1aa8e91d1fd89b51f1fb02 SHA512 7ca838f0309594fcb935e851380b40f8fafab3e3d175dfc0ea48783fc29df8c4fb8f279faab729f9ee852eedc9abd2560694570ce9a9de12dd302babdc1dd274
 EBUILD glew-2.1.0.ebuild 2513 BLAKE2B b8c9f8cac57435196d09f9536a6d2dd11c7236922b99d2df76584c1a04f57fcf505fb21589696e7267b1ab4e63834cad1c84f58cc99f35a9961870950eb431a1 SHA512 40be22ce95d3e618803791ff13ecd40554ceb56cbc8a8cdc1a5cb10800f02b00c22b417fd35b70323a27a718ba68f4a56daec0a0ac06d87a8778b774cbc4c0e3
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index 4b13c557e272..ddf1077b5fb9 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/icc-profiles-openicc/Manifest b/media-libs/icc-profiles-openicc/Manifest
index 650b978c9ba3..1b43fd99f629 100644
--- a/media-libs/icc-profiles-openicc/Manifest
+++ b/media-libs/icc-profiles-openicc/Manifest
@@ -1,5 +1,3 @@
-DIST icc-profiles-openicc-1.3.0.tar.bz2 398917 BLAKE2B 0c3f20a9c00cde7ef462d10301e1bed99072c4e3fb99b0b3c4aa9ff0b96c266caab2af9a31169bd10069de2b572307781f7dc0f9fd95b1104aabb09b6256948c SHA512 97a63dcfacd16afef20052eb36ede78d8182d08d147d49d61781a684856720db81f2f83d3638bfac6c46c03f3311c776dc1624c26fb89d5c23db96542c4a2a07
 DIST icc-profiles-openicc-1.3.1.tar.bz2 399620 BLAKE2B 6b08d2509f74687dc1a1d70f3a18bfb0657c544d798fc5658e01840aa4da9a8a1ce953992bd8175e454323fa978c64806f2614768d7df904a9ff248d8853940a SHA512 c0e9f50bc14ac54522f5c34eacc89b1531a74572e8062a63f00f8a0a9d5efe4ba52c8f46dda336cb589043c39482d3acd9ec9fbdc79aca689303b54a7d86a996
-EBUILD icc-profiles-openicc-1.3.0.ebuild 353 BLAKE2B 96d4e638300e1073ac48d098b77473ec80e6a8394301260289979c2b33347cf82c68230a83ceb7afb1572ab6d03e49c559143673ccf0c35b3203d4cfe2fd2a1d SHA512 7fe3a752e334db90e20c5aa111bb09c164640b4f2137e6e7322e117e3edfd4884629b4acdb31789dcfe70509c7523f2105c682b41ca14325f4792956b67166e4
 EBUILD icc-profiles-openicc-1.3.1.ebuild 353 BLAKE2B 96d4e638300e1073ac48d098b77473ec80e6a8394301260289979c2b33347cf82c68230a83ceb7afb1572ab6d03e49c559143673ccf0c35b3203d4cfe2fd2a1d SHA512 7fe3a752e334db90e20c5aa111bb09c164640b4f2137e6e7322e117e3edfd4884629b4acdb31789dcfe70509c7523f2105c682b41ca14325f4792956b67166e4
 MISC metadata.xml 244 BLAKE2B 48d34a24b8668feb977ba690b36e51455d6ffe9a6ca2a043d2d03d0f6db51d89be9f204d1c8de51692432eb4ed7458e93c68cc07b982cb6a0ead63b1b454efff SHA512 c032efc420638179f311623592df6e2916b55eb46ae4bec7c019d05312011ae33a5fb50066b1583bc0a394bf1cfc13eed57d2735290be58644d114fe56ab3c6b
diff --git a/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.0.ebuild b/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.0.ebuild
deleted file mode 100644
index 09dcb1dd1d6d..000000000000
--- a/media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="ICC color profiles by OpenICC"
-HOMEPAGE="https://www.freedesktop.org/wiki/OpenIcc/ProfilePackages"
-SRC_URI="mirror://sourceforge/openicc/OpenICC-Profiles/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index eac01e3238a6..e28446a457d6 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,7 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0-r1.ebuild 1836 BLAKE2B 30c6c553c5f822cd41b1f122ea2c4d57cd299612b11cd6ebb079ba5788441aa45ecd851506edb63f965ec1b66826eceaf4a8bb62ad431580a592c7cdb1e0a329 SHA512 0e061dbfd3ee07d2108fac3948a77aa7d9ffbed102bba78615e0e65da01820ca445df6a2bbf77724090b5f9db0cbf7366475ccb603675b5ba01545701aa1c23b
+EBUILD kvazaar-1.2.0-r1.ebuild 1835 BLAKE2B 6b3ee6b603eba30378b34c8fc55a5b2a7aa0d065d4e6ae4bbfee5eb64908aa94a2f8fb32f58addac509c7af29bc60e18a83d7749c5a0d1d8bc1f9fb23c46443d SHA512 70528e49ca5a590ee808aad88cc87d666c1c2e95ddbc6a1d321cf42d5e197ca7e73564fb58f9a7f3c94695a6f0e92c64ab996e4d15b224315e6747f6b02f696d
 EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index 46ab86914897..59d808abaa46 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/libasdcp-cth/Manifest b/media-libs/libasdcp-cth/Manifest
index 64835e5e2e7e..e875c0a2140c 100644
--- a/media-libs/libasdcp-cth/Manifest
+++ b/media-libs/libasdcp-cth/Manifest
@@ -1,7 +1,5 @@
 AUX libasdcp-cth-0.1.1-no-ldconfig.patch 269 BLAKE2B ca93c78ba61e48f0e7de857e762d7f80390862822508610bfdf879edfac65dfd6ec427ad499ff4101c03f95a69caa99053cac63ba34db1f6777612acc16a70f1 SHA512 72bd96dd5a93c3b17b488ee67a8b5297b5f5f712e024cee17fe8c0b6669f15f267dd9ab7c7cb3b81a266d5ad3aca1cab2b9c49eaf6e9486883a61442f87786fb
 AUX libasdcp-cth-0.1.2-respect-cxxflags.patch 423 BLAKE2B 0b87a20f15e36e839893cead97f259abed082b02e5801f81d291aba1056c1868ae72102164225d25df2d933cf584a6a6a9f6c0f0fb02f4e16af577bfea3808e2 SHA512 9c363d6705f6f0b1da7387ab9366ec1f14334325958ab56bb005b3ef8cede0a67953def0033ccee098d7cde42df5ade3aad99a98fdd69ffad5ec4c8c54a287a5
-DIST libasdcp-cth-0.1.2.tar.bz2 636832 BLAKE2B 8b2500108da3670337e5c4b18d483aacac54e22f19eaf9cb9e789821183ef77ace8eb7c5fff256ea26b49ea26d63ffc40757746172094dfea9ee6ee5fd899c89 SHA512 c0bcbc9dfba9ee24f67dcbfdce44cc45c6836c1ada32de6631857dc02eeb94817e591118237bc8173e47940cebac3113b4fef8a038462abb1a184a2f706ba9ab
 DIST libasdcp-cth-0.1.3.tar.bz2 637004 BLAKE2B 5c8a5a63f9d8b8a3e6ea245d7ad66715f4dc4f73af41bacc66d2259d25ecf52e2f1c951b240478fd674f34c8c9581a2867acd05e2bd23c5ad95609a22b5f7680 SHA512 db707a39e79ce4dcda7f20610b4fc3d1609d75dc9cc1f14a6bf7627231993882e843a3ebd9abb540a3f746c2898f94fa7bfd0617eb7c85d243585e4647e218c6
-EBUILD libasdcp-cth-0.1.2.ebuild 824 BLAKE2B 9d5189fa5ceaf6176ec48724594d659b1a187c8b11fe324aa80ad32281396654fbb2bc544d843b3082ea31efd76b61de39c6c5f9b6fbbf291bab75149cfde543 SHA512 c7aa2b52c94e20328d66f5c48336cc1aa1fec85da29ceb0790d7aef5a950c8c80ae68fea10d44ad16728e9c27d5a91a80686d3a1dea6bcd0818fbaa9aba2db6e
 EBUILD libasdcp-cth-0.1.3.ebuild 824 BLAKE2B 9d5189fa5ceaf6176ec48724594d659b1a187c8b11fe324aa80ad32281396654fbb2bc544d843b3082ea31efd76b61de39c6c5f9b6fbbf291bab75149cfde543 SHA512 c7aa2b52c94e20328d66f5c48336cc1aa1fec85da29ceb0790d7aef5a950c8c80ae68fea10d44ad16728e9c27d5a91a80686d3a1dea6bcd0818fbaa9aba2db6e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libasdcp-cth/libasdcp-cth-0.1.2.ebuild b/media-libs/libasdcp-cth/libasdcp-cth-0.1.2.ebuild
deleted file mode 100644
index 06b2c20ea9c1..000000000000
--- a/media-libs/libasdcp-cth/libasdcp-cth-0.1.2.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 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="implementation of SMPTE and the MXF Interop Sound & Picture Track File format"
-HOMEPAGE="http://carlh.net/asdcplib"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.1-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-0.1.2-respect-cxxflags.patch)
-
-src_prepare() {
-	rm -r waf aclocal.m4 m4 configure{,.ac} Makefile.{am,in} || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	default
-}
diff --git a/media-libs/libdcp/Manifest b/media-libs/libdcp/Manifest
index 75bdba122a2f..cd87d4dd3899 100644
--- a/media-libs/libdcp/Manifest
+++ b/media-libs/libdcp/Manifest
@@ -1,10 +1,6 @@
 AUX libdcp-1.3.3-no-ldconfig.patch 253 BLAKE2B ad3ccf48bf1655889765ceb6e6bf1e5fcd145124cf4bbca1503381a297257f4433c55aa8f7ec165f24ce29ae490e512df50e6a07bd1f478525e42bc0fb9a7088 SHA512 23ef7c9c04e9720443f1ac9ecc1e8015d7223f69711d092dd596b5d1798deab69fb05359bb51e50c8447fb5929e278415182e61e82b327396b242afa72976a00
 AUX libdcp-1.3.4-respect-cxxflags.patch 2832 BLAKE2B dc053cf167777a8b806792c4188ce5fbc1c44cb72a0f312625242f1ca0c1d63abd7592676a1a76784ef31a61dafc4fbb51460524d0725dce8b98559d757f4f9c SHA512 453e1407eb97d4e015382ccf7184ad7ca21048da97deef7156e4b59c5bf6e736ae67276e5517378aa42c6035326a7d178fe6923a1db00e0b2553136541119b34
-DIST libdcp-1.3.4.tar.bz2 737458 BLAKE2B 6780222106677bc91b1093c470a078d8bb16dff11d32515e3296438beb4fbed084e8a0fbc09601243d6a348d5ae75019b098be09e9ac3f0b92659872d3c28d11 SHA512 bcf7c2218a55d3cc4cb1edf4c84592ce5952892d7f57a652cd3157aa5d34f041a4759aa7fd50451bfbe13985195424ba29a62c9c3a163367583e4c65ec5b19b1
-DIST libdcp-1.4.4.tar.bz2 739413 BLAKE2B dd04da12fd24cc4ec01fb5eb2a04d73cbe0ed1eb8e4c11a6ea0c52806715a1de20ab22924635b8bf3a271a8509959fcd6ac8dbbd5d87cb402273b8b8ca887f8a SHA512 589634eb56bc23437752a9b32e849332cd8e0f04991c63f583ce06ab7343f02226bc1e2faead13edba2dab9bca86c89adaf83df7779c427f167e461c2d6dabbd
 DIST libdcp-1.5.2.tar.bz2 754546 BLAKE2B 69cedd7a782fe89e538b893a6f919515e87bbb24331a189cde6d16bafcc9d2a442156a5db58eb963088511ca2b233a24695d1a124a7830f955f8074b1b059d30 SHA512 717486e06af2f89795dcaff09ccea38eeba786a55bc3df01acc576749a475df4a6dbd74b3edaceb08af5615468c24f45fec0527b315e2e5842683333f9118499
-EBUILD libdcp-1.3.4.ebuild 1362 BLAKE2B ec2a188c1a50db9df6d7c3c6acef8a2d58a3f1b22df1002daf857ade13b608d2a1b1bacdd04581e72cd1e6f1cdc526d33b6f4d1f2f5e1b83dfce624017c99d21 SHA512 37ab4ea441e9be271474cbbb51740eba15b4f6f97f9368ce8cb642118c52408de39c6c08b3cb5ffc68beda40199a0133aabc6b800f16f1f9c932b5ff858cd839
-EBUILD libdcp-1.4.4.ebuild 1359 BLAKE2B 8a64df2e5608d7d11ef2b3320d531bd5b1d1ab755d0196320aa455bbe27f690c4c88bdab42ea7004561a35042b3a5955f8886ee7f4b1a7774488cfe603a75a93 SHA512 fb2ada46637fad653e66f149f5886e7be47a83dff176b008371d13c6ece70afca33eddacb26702baf1b57acfaed1c1af12e9daf5c1901c0fc8857dcbaf32cd98
 EBUILD libdcp-1.5.2.ebuild 1359 BLAKE2B 2762cd217f106acc364ad9f40bd2b2d6c381cb900eed4603b0d05cd5cec9866565c2348a2242c6dbc96840ec790e476e78d34a1635167965881bdb63cddfd34c SHA512 34ee803ab2200b3b81bea9d32ffc0e8874d5793a1368098d840b30e4eeced15933812c47b4b3ebb0bc7b69deac8086e5ca578a997bee9119b4805448724ca537
 EBUILD libdcp-9999.ebuild 1374 BLAKE2B fa1732446f031f0f7341608d72f3025f94ec822ce3540bd575822f3e9fac1642f2925acbd562539c82f1d0d9703944743bcc4074ab148609b20777b4577f5948 SHA512 05ccfdf925e37f2393994141ebb0d484a4875a3b2b99864652201fd6e592be12d75bbdaa10953d26e2691adc859e72495da748043990a643b0dd726565dca1ea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libdcp/libdcp-1.3.4.ebuild b/media-libs/libdcp/libdcp-1.3.4.ebuild
deleted file mode 100644
index e3d2d30063fe..000000000000
--- a/media-libs/libdcp/libdcp-1.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	<dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	media-libs/libasdcp-cth
-	media-libs/openjpeg:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}
diff --git a/media-libs/libdcp/libdcp-1.4.4.ebuild b/media-libs/libdcp/libdcp-1.4.4.ebuild
deleted file mode 100644
index 0c8aa9be3675..000000000000
--- a/media-libs/libdcp/libdcp-1.4.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="create and read Digital Cinema Packages using JPEG2000 and WAV files"
-HOMEPAGE="http://carlh.net/libdcp"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.61.0
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/libsigc++:2
-	dev-libs/libxml2
-	dev-libs/openssl:0
-	dev-libs/xmlsec
-	>=media-libs/libasdcp-cth-0.1.3
-	media-libs/openjpeg:2
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	test? ( app-text/xmldiff )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.3-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.3.4-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/atmos_test.cc/d' \
-		-e '/certificates_test.cc/d' \
-		-e '/dcp_test.cc/d' \
-		-e '/decryption_test.cc/d' \
-		-e '/read_smpte_subtitle_test.cc/d' \
-		-e '/sound_frame_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./build/test/tests || die
-}
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index 6c7bdc075fde..656bf45acaa5 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -2,5 +2,5 @@ AUX libemf-1.0.4-amd64-alpha.patch 3194 BLAKE2B 323edc7677dda422d6a3669ee7cd117f
 DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
 DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
 EBUILD libemf-1.0.4-r1.ebuild 888 BLAKE2B 8b234f8240cfb50c30a80ef7c5a7a2fce0b5a57f9e6ce5668b80f91a7915e39df7a1f01592278aa2cfaf1bcb5fcdc414aad2d43926217b2d24728fc54e882ca0 SHA512 0954d6e0eba01dcef17513577600ccc980e1810aef7b06283dc165505e0ee32d4815c9c15fc2b3b839791885bbf6a3081d15937507c591d1508f5854b73cd362
-EBUILD libemf-1.0.7.ebuild 843 BLAKE2B 4cd7ebfa9aa5cf554f9c437e3d4df323156800d471ef85a03f3f602eb0d65ba7cb87cdcd0ee2eb8ba1b960bad8ecb6f4673a6ef257db003eef62fa0e6d4def13 SHA512 d4214b9f103b7e9af3acd19029ca71d7a134a5f963c7e08a923a84e585406131ac39f1d514df6402a79c3d9441e3b28e4afe594feee1045aed6ef151ef79b504
+EBUILD libemf-1.0.7.ebuild 839 BLAKE2B e7ccff391dfe1f9e72daa0b542b84b6a1f08419b42fe3a9de180071119d1239518833c06ce53d6d6f5910a012389db8f85cc8129f48b52aa7f060380f37a458b SHA512 ee38834d8175dd8e6a464089ac6946992be391d456fa562bce882264f8a2605af3ef57261c743196336bf93016f6805ed9539de0016884821522ef35374c8e57
 MISC metadata.xml 248 BLAKE2B dce07ccd35cdf8117e7f05bbe068c807c381bb91d899d48834974c1d362cc25c3d114dffba55b67c669b96893cfcb7cc56451a6ad833cc5b5cf89f577e714b27 SHA512 89826cb9b2687c78bf585335d0f103d00a5c58d9e5902003e18710e9a8afff7304bc39f3909de99f2b14b4b8a6a007a1f0e3aa5f90bf31d0b8d7314a3c7edf05
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
index b2a7ee2e1848..9d476603923b 100644
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ b/media-libs/libemf/libemf-1.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://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 -arm ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index cfe2cc56f517..56b42643df6f 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
-EBUILD libgphoto2-2.5.16.ebuild 6224 BLAKE2B 1476fe208ddb0d72622e532722173f743aad470b19bf2e7bfc6d0fbd3dfcbe0da994f15297a79f95d457e7d5d48f676cb1a265b75ae5a555554273ca5e2f2bc5 SHA512 4129d67158d3f443a407e979d11fbe563b7c759e5c742e1f6fec79edbadc085e482e54e5c6152ab45e7998149ac4dc8b2c73dd29d697b5d384428403c7924dc3
-EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B c87d500b7401ccf5d140eb5fc42deb98a2d6a96d6d4c0c0b777620c03183fb424d82221ce5307574344ed369f155d6aa53cb7c70016a5c69f28176f15cc0ddb9 SHA512 8aa7c58e779b1a4bc548ef2400f707c9e5aca4954232279e6435c79f44f357df8dbee6da906a0f57d806d79a2727cd7a208109ced955d0184ad5b533566165da
+EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
+EBUILD libgphoto2-2.5.20.ebuild 6239 BLAKE2B 2fd9815fc3a3739455c511bb0674a74f023f098403e5f87b697768d8cc00f5fe6e9833f0a01aea2ad094617d687d12b900af216039135e763ef56178e9cce4bd SHA512 62ceef36668d07096784f243b1dcbb2e92ed7299725db4189fbc2056cf34578d52e7df52bf430352f5a3e10add49fa527bbed228d3e996f54223716e1e579604
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 2575e4781e8c..cee28f15d64a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.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 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/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
index 02cbf96621a3..244269d65884 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.20.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
 
 # TODO
@@ -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 ~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/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index f1c8d74d8d0b..c58f820e5005 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,8 +1,5 @@
-DIST libmetalink-0.1.0.tar.bz2 324033 BLAKE2B 98325fe23d17e8e2a5e47305e83ef36535818274c43ff1d9b64ca3ff2157ccc04a1ff08ed1b6a5d16213fbe005d2901bcb99515c80e58711395b4ff83dac825b SHA512 50d6dd0a7def447261d44a586a2971b646f69d82e67e7c181c01a876e9177f164f3e9d67268dd0064b6b4ba9555ce2932eb9753e2d291f5263f5622af6e06bda
 DIST libmetalink-0.1.1.tar.bz2 324472 BLAKE2B 7ce82dd8954c96b31d15633995f5e1cad9e3aa56568241601e3f79c25e217a5ea3333df397bc2ed2e96ca790ae1e187d5ebe32113e11cd43f2ecbae9eb6cdf32 SHA512 9e9a2bf17b3696b199844703377cf6615bab44fd61b89be9afef579c21b0ac462f156719f60df9b8e7f7a9edb259d9bf461f20cd11ad9960d8376bf20e04f62c
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
-EBUILD libmetalink-0.1.0-r1.ebuild 674 BLAKE2B c677bcc0cd9efbf1e176d6e10e9aaf4f4c23ea8e9ff307b565229ed3a8bbecb8b61cb1dc6167bd7b1ef6e3a8ba6af08063f6231e871b7f724e154c58b439a85f SHA512 6c4bf0b755868769b9c78d7e4ea7aacdb585040279e02337aa8b32019c82ed2ee14e614ca37688f4f9f4b6fd2be67513711d6f7dfce3dda307748351d8a2299a
 EBUILD libmetalink-0.1.1-r1.ebuild 798 BLAKE2B c2ccd770a6e05721b42daefd89a9a399eb5b88b86db97aa5bda3ae0518f844075a08129257113179d12a48bc9fdcd231afb94d5ab15fb10a22983d20f71f3975 SHA512 12facd74a93ca688f5f56194ef677e572a91bac2905798f0c4550df76f83a35daf28a1926c4199894a3199bb98ac67cbf0d0e185b1a06af59e2ba711ed36acd5
-EBUILD libmetalink-0.1.1.ebuild 660 BLAKE2B a0aae78f310ae5eb95b8656f2b101bae4270a58be13bc6028397ff7dd98bc856fc7bbebca4d9bb4eb3a2491f0039c57db592b859b1214ebf3d08ff1836e46ace SHA512 c1ccc97da9eaebda18732102ed62d6c03c6166b75e8d0e31699e292973228f6bf79a475bf3d51cdc4e1f225213866b141de5b35d085a8ecfc3c4b170cff6d4e4
 EBUILD libmetalink-0.1.3.ebuild 817 BLAKE2B e1b2a48973a259f98fcca7e00f801e01dde50e25158c707a0adfa9dc2e0996749841a729092c60df88de34ee7a780790c13af12b8f82f7e72c5e5bbc29f73999 SHA512 d95a4979c37deb8948d6e58d64e49f297e73c38119a25548a51f9a564a1f3b7325afc0bdb78e09a1513116e01a98db3102aa605fb16f20ae9b9df9b9fbd2fb00
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild b/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild
deleted file mode 100644
index aa4cd52b876b..000000000000
--- a/media-libs/libmetalink/libmetalink-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-DESCRIPTION="Library for handling Metalink files"
-HOMEPAGE="https://launchpad.net/libmetalink"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="expat static-libs test xml"
-
-RDEPEND="expat? ( dev-libs/expat )
-	 xml? ( >=dev-libs/libxml2-2.6.24 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cunit )"
-
-REQUIRED_USE="^^ ( expat xml )"
-
-src_configure() {
-	econf \
-		$(use_with expat libexpat) \
-		$(use_with xml libxml2) \
-		$(use_enable static-libs static)
-}
diff --git a/media-libs/libmetalink/libmetalink-0.1.1.ebuild b/media-libs/libmetalink/libmetalink-0.1.1.ebuild
deleted file mode 100644
index d0fc86dd457c..000000000000
--- a/media-libs/libmetalink/libmetalink-0.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Library for handling Metalink files"
-HOMEPAGE="https://launchpad.net/libmetalink"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="expat static-libs test xml"
-
-RDEPEND="expat? ( dev-libs/expat )
-	 xml? ( >=dev-libs/libxml2-2.6.24 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cunit )"
-
-REQUIRED_USE="^^ ( expat xml )"
-
-src_configure() {
-	econf \
-		$(use_with expat libexpat) \
-		$(use_with xml libxml2) \
-		$(use_enable static-libs static)
-}
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 91be0e3eaed2..2072af535bb4 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,6 +1,4 @@
 AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3bc3bf4a626f1f9186ae6e5ac65dd0da517dde4461353f594a8b1d54ad4ea8974be289833984c77a49b351e1b9e0a49288ed993f9f175b097e SHA512 6fdfc0e8d4a2325389a530d166c5bb504ab71a5274d037a07b579d2855c425197bf0e88349204aadcbdfc9e8efd246f10ca3d20378055f739e1d4d8fba97d7c2
-DIST libopenshot-audio-0.1.2.tar.gz 2964758 BLAKE2B a8407bcb14a24195e48adae0e575a2cabc6e864a4e9a439966e7c6af55549a220f8c4536e642e7dcf2ed76f7c9f204ce42607b861bc7adde6f78b99cd18aa23c SHA512 955f9c20ebf06474702208845fe49d031e29b0614fd15c0e1784c52d1c406fb7a980940bba1f297543305a9611fefd6b9232328cd39c5edbc8908018c5b12f1c
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
-EBUILD libopenshot-audio-0.1.2-r1.ebuild 769 BLAKE2B 77dd7304a74566b9624997133aa5b66da6b77d6a17ac7f5fbda15b3f9a1fec18991e02aa476448fd2e8fef5e22dff980c581bd6fe620d5923815aac31299698d SHA512 451ba2ead3eab864099cc42fe3a9de08f37c01bf7553f8a16425965d2f2db70d78d0d1c9e2a6772fe5f4426e6b325ecf94d7bd5a0fb7ddb341d7fd996f7e14ed
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
 MISC metadata.xml 386 BLAKE2B 152c514030a3927ea9779da2cccb6ab74a68aa6f8dbc01cf05dc0ed521d9afaa04783cc7a0c877154a57431da71eb64886ac9c2030eba905de29c32fba58d86e SHA512 65064e6f488f977b5dd7f16ee9b58c43a5ea0aa15193dbfe79f145e0da8f145d4ff8e0968524c2c6962311ee10d8e4ccd157f5710a00a922b3e1c42dfedc8491
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.2-r1.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.2-r1.ebuild
deleted file mode 100644
index 794938b206e6..000000000000
--- a/media-libs/libopenshot-audio/libopenshot-audio-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Audio library used by OpenShot"
-HOMEPAGE="https://www.openshot.org/ https://launchpad.net/libopenshot"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix under-linking
-	# https://github.com/OpenShot/libopenshot-audio/issues/3
-	sed -i 's/^\(target_link_libraries(.*\))$/\1 dl pthread)/' \
-		src/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index 0bbf31421700..98621ef515ae 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,3 +1,5 @@
+DIST libopusenc-0.2.1.tar.gz 388071 BLAKE2B de3a69aeb6bb955352e097e41b12cf0c627ce5278687124d00996f52ccf5e8e39277e7c345bb26e75dd7d29b6a70f50396fa5a157913e0906a18acd007b1621b SHA512 adf30cacea9ac2e5889a40147f53943a1bec5279c5ff3a9b09de8ca52727a6cbaeecd338417fc5856e337ae183c85b0d366d14ec4ec329de12d50709a6f6507a
 DIST libopusenc-0.2.tar.gz 388027 BLAKE2B 5822d09ec56ce9dc0182241e7182b71c9c21def5645a2ef3472af380b25af1b1f8a08311c2cfb8bacdfde845dff81ee426401f1ab098b6598e41e664ccaf9c34 SHA512 82b9a60bf6fa0c8bc485b221bc633456245f8909875fb9e86876076bc37857d53a366bbc66f2e1e331adddcf12c4d5a29f0047e21d0fae2f8bd8a3199bd6f78f
+EBUILD libopusenc-0.2.1.ebuild 611 BLAKE2B 9d294c9879802e24a3e6ef84535cad08e037e5bbee0c74c0d72491aeacc69e1363562cece1cd8479e11992398314048ca5adc5318c5cc85636fba7119e2e7aa4 SHA512 e953a21cfd3d1278327dc74d87aae431297b8205b3cf842162dc55766b3f3e87f2702a510a7df8d57b8cc9cb90cf5986b1544e46490bc9027be37082cc75e076
 EBUILD libopusenc-0.2.ebuild 629 BLAKE2B e96df2a2e4f82998005c081c499ab97c94980b89be20521a2a6a296afb2b8896dc4543817139e0a1b613e1461edbe63624598061dc02809fd31bee6da4c3bf5a SHA512 9e387028b5f40c4a0d4423eec21a6542011fdb923a9b27d9309b42874dd257a3a04c63293e965258648040ad8259ff4ce6b003844d9b7cdc3ed104de528c74de
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libopusenc/libopusenc-0.2.1.ebuild b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
new file mode 100644
index 000000000000..eaa29c509519
--- /dev/null
+++ b/media-libs/libopusenc/libopusenc-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="High-level API for encoding .opus files"
+HOMEPAGE="https://www.opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=media-libs/opus-1.1:="
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		$(use_enable doc)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 116563f375e8..d9b2a5f4723d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
 EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
-EBUILD libsdl2-2.0.9.ebuild 5401 BLAKE2B 119b0f185223b09d6541cb5671b17878c0b9dd7f550c6115dd33a8f81bb11dc7a0016f60b334c7d7b5177205b140198af62fc456f5a84cad616eaad316ae08c5 SHA512 ebfbcc8889fbdbf34e99ba516b515568d14183396cc860891a8090788338a38c4b02938e3cd7ece290cfe66fceaf35129f0529e244b973a1af764907078ffaec
+EBUILD libsdl2-2.0.9.ebuild 5400 BLAKE2B 5a8353c7ccd97ea07a2a52dd954b1364ca482e228045f17b14e551ff8cd4bcf53d1eee893b56c063d7f4417e3392276b84dbfdbdae7eba7b302d72fd4e5a1be4 SHA512 072020cc1e5eaf99d8fbbd800b3b7eb9ee880cc4e66121f48a0e4273f3079e772e8deca49d1fd1993de46453cc127f3e17b414cc9816ded79bf0c02abd054548
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index e8b3b92f6ea6..10bfd29ff223 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 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="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsub/Manifest b/media-libs/libsub/Manifest
index 45856a73f5f5..92c6455b370a 100644
--- a/media-libs/libsub/Manifest
+++ b/media-libs/libsub/Manifest
@@ -1,4 +1,3 @@
-AUX libsub-1.1.12-no-ldconfig.patch 196 BLAKE2B c2ce3011a75997dfd005ab2f75faaf011f33b1babb097fe2195bd5c0c30a29ded11a4cbf077f8e05fcaa0d3fbff0fccf8353aeea138e2eaad56bf58af4ed019e SHA512 75e9412a12761f9d98033c8e2a4df0fed90379d4688ec28534db92163beb2cc0677a57ba79dce952de27f6b1c350e6001dcf34cd0422aa1e015b8ec05593d0f7
 AUX libsub-1.1.13-respect-cxxflags.patch 445 BLAKE2B 883d31f736af71c6c808a970841d4fce005c7342eea1ea721865d1da22b31fc9e01338845e34e3e82f9af72c4cf4268cd09483f802d58d72fe63a83ac2b6029a SHA512 9c0d4ee9995dd91715c8e8404eb2f685849a1125133f5f13f259e89e298fe6b55b3702d6f5d0cbaa80ca9bb50fb091ed2281ae5e46b69d235d1c126deeeae8d3
 AUX libsub-1.2.4-no-ldconfig.patch 253 BLAKE2B c1df9d585d182c2d6929eaacfbef19e5393137ee5c09aff0d77fb6bc6d467d31fd51a6b5b69703e2a1dbe1ea1d2a56a5ae6d9bc8448532ecff2a29da5c57bcee SHA512 1791882bf490c01a03a799e065562ba27b65bc14ce92a6ddab910bc8a0acafafc58db64baa11267d40c4aadabd34bffb68772adbc4b2a8b5855ab38ba3965ed8
 AUX libsub-9999-boost.patch 945 BLAKE2B 32503acc4f22b7bb035884cc9dee3c1f46491fb015563bcdb6341d7a52863a633f624d7aba8e6335f2b2750712a9254e8948cea5559d3f754561117d6e773238 SHA512 44b83444dadd21db782d0ad3b7a4b139f984a7161be48f4a20c9484e489cdcdfa15b60e74da3ab9cbbbc334305a34953d9c010be63ccfb2bbd89cb7ef27f9096
@@ -6,11 +5,7 @@ AUX libsub-9999-iostream.patch 2097 BLAKE2B d86fef50ced4f8b9e0abec65e0a85925458b
 AUX libsub-9999-libcxml-9999.patch 433 BLAKE2B c2a44207ba7306101edd9a56770f5c46763b2f967ca394e950155042763cbd012cd90c8b658ea47617b0fcab88c35cc0a98d2cd8755c48be29c9854583ff631c SHA512 e24858f1cc1a46e744fcdbc3b06c775a2e04521676d000d138bc05f625e48f4b66c5a81f5cf071a4dffef0265a2df1d94cd782ad8f4ff04b2358c0aaa5389d5b
 AUX libsub-9999-no-ldconfig.patch 196 BLAKE2B 4320523c01bbd5723024c0cbb91eae17be44429b02b1b6f419e78d25a57d90c88a045a8fa34b87d23f26577c797525f0802062b8aaca0c9f572f4f3dfe5939f9 SHA512 543f8f5d0ef6e855fc43eafd594d8bf1259abc23a878108a7ec28353a05430ec05b1e05627b7a2f0a7993512bb4867066d2ca533a48950683c022d3283b0a62f
 AUX libsub-9999-respect-cxxflags.patch 418 BLAKE2B 9cd542d12ea973007b7c5e807f635bdc4b9a983e6dfb9a683bed162f2188939f0225c5a1f0b5a2792226a409803909de656c6ce534a7b01a1dcb8a78138e85c3 SHA512 1a0d6cff7c3d8bb04d4f71f7c05b1f74cd7f7b3cfed98aff1b2f5ba9b484b7a5040f26849a93eaa5d0de35dfbb22ad8d34e3038e4e3204bf2dcbcb07cd640179
-DIST libsub-1.1.13.tar.bz2 178168 BLAKE2B cce6a1e5038aa07dfa9a55d70ceae40c6892e2aeca627ef0ed43eb37a0fc9de9ad80a0788311b3b24dda106e042b6e43ffe0d3f6c0eebbec026d472869ba6603 SHA512 85785ce69e52ce8d5746a9cf15178a9e98d13f63a4c899d13ff5df40ab871fd8ddbea0261b7e01ab9220973c0f9b6f0faeefe94c7f0755eaf43ae2674c367ea6
-DIST libsub-1.2.4.tar.bz2 179025 BLAKE2B 7760b46864e6a30616003fef84953c6b57b2ec990c7dc0d787210904eecebd8ada35822b0e690c15425854449c4fd4754926108a5ffe444fbad74e500d542981 SHA512 c7e5f73b5e46322434c5ad3235c374311e30df0e4d794645a716867e696683883b1576fb206e85db6aebe649c9e59299abac86a513c9ac93bd5ebefec826a63e
 DIST libsub-1.3.1.tar.bz2 178834 BLAKE2B 3b25d16ec9578445091ae393408ff33cb8ad4f18610a8ee4fd098897306635cea8171b37c8a0d4afc5136b53fc670fbab9fd12493af33ad166ff54e35c1d09b1 SHA512 650725d1a0f1b5c4be3d1df79f4645661a33d8086e0c239847176d8725f0b522f74aa4f6e52acb90b9de9d865dc975876311f3748be63eea998f77f33299e534
-EBUILD libsub-1.1.13.ebuild 1045 BLAKE2B 443ec15efa9bb901f26e7e29112e5fb501cd21921d4fc6b96a09367463d1b54e0fe8f3840e8ab27bdcc40e81627f486a9da99ff05b82487db6ec0915714b50cd SHA512 81167be1b26e4180385954640511f9eafdf7bfb0f55d28d50a47384c981486609f06598f79d48ec60957bc1627150a5a23309ce596c8e869b2994bfd1054d2b5
-EBUILD libsub-1.2.4.ebuild 1057 BLAKE2B 9ee68d66339e9d8a09843855b9a83343d71b6aaec144901109ace501aa353895d3e26b46b3ddbd713687bb6ee6b7929f32ee12e2e8376ee1781312632bd04673 SHA512 460d8cf7d7ebe9fc40245a869f601194d51ca8fc3bc0c0857e58b12099cd2b312f439bf86230379a2ca03481e58f4009677f0a3a2c6b69b621c075a877d60e63
 EBUILD libsub-1.3.1.ebuild 1057 BLAKE2B 752553f72594ab04e0d7751ab07e0c121ec8d174ad99be31c8f9e096a3b1da9383a877ec99c61239a43cddb8147e80f66332e80b34a94613da2fbeb8f3e2c6f0 SHA512 b87dbb76e6e74b595f636591b2ed1cbec4dbb6f2dd2b1afd2aa8c6b962de4cd2fbdaf1b7351d0ae8690fd4eb7b92d9a02a8696a1fd332939de7f410f20714c70
 EBUILD libsub-9999.ebuild 1163 BLAKE2B 464e6c3c138893d628599a5b4764bdd163b921d343b6bfb55c45b3f7966e8937320537562fe174395b7214d683a2f1339622f9306386a519224e7af43b21feb4 SHA512 7268af4529c0f9b81a56e0b82fb568fc87f95b9f30a2504ccca23d1b304a597aa6135082f26460bb9235a2ac5c61fbb350a46b3c0b7363744aeea3749df5d7e8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libsub/files/libsub-1.1.12-no-ldconfig.patch b/media-libs/libsub/files/libsub-1.1.12-no-ldconfig.patch
deleted file mode 100644
index b0752b28e1ec..000000000000
--- a/media-libs/libsub/files/libsub-1.1.12-no-ldconfig.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- libsub-1.1.12/wscript
-+++ libsub-1.1.12/wscript
-@@ -148,5 +148,4 @@
-         sys.exit(-1)
- 
- def post(ctx):
--    if ctx.cmd == 'install':
--        ctx.exec_command('/sbin/ldconfig')
-+    pass
diff --git a/media-libs/libsub/libsub-1.1.13.ebuild b/media-libs/libsub/libsub-1.1.13.ebuild
deleted file mode 100644
index 82342db5c408..000000000000
--- a/media-libs/libsub/libsub-1.1.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	<dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	media-libs/libasdcp-cth"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1.12-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.1.13-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/subrip_reader_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-libs/libsub/libsub-1.2.4.ebuild b/media-libs/libsub/libsub-1.2.4.ebuild
deleted file mode 100644
index 9bfbce8a6305..000000000000
--- a/media-libs/libsub/libsub-1.2.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="read and write subtitles in a few different formats"
-HOMEPAGE="http://carlh.net/libsub"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	>=dev-libs/libcxml-0.15.4
-	dev-libs/openssl:0
-	>=media-libs/libasdcp-cth-0.1.3"
-DEPEND="${RDEPEND}
-	dev-util/waf
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.4-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-1.1.13-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY=${EROOT}usr/bin/waf
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed -e '/ssa_reader_test.cc/d' \
-		-e '/dcp_to_stl_binary_test.cc/d' \
-		-i test/wscript || die
-
-	default
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 4d4740b2aa6e..f1885b9e53e8 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -10,5 +10,5 @@ AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
 EBUILD libwmf-0.2.8.4-r6.ebuild 2758 BLAKE2B 3f2da42e0f8619f587962fc64bcfef793e243c478907cf3d5e3a0843a70e7a68e4a17c77ac959220ea340e83c84e4849650ffe0ff7ba66d65ee1e54118ddb2ca SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4
-EBUILD libwmf-0.2.8.4-r7.ebuild 2496 BLAKE2B c38f5ca9d24dda46febb618e9e398001d2244a7692f77410b8db9c1982d74d1fc9ca70da7f00875e51a942e650e385e41189ea9daf30233d03481f6d1ae36b69 SHA512 fdc94e1ffe59453171bb06c62ad2af0bf1767085251e689d0c8a3944d35ef84f37b3a7075a80e1f6c752d10b58ce94158300c0425c894c45d2985ccb45b6cc73
+EBUILD libwmf-0.2.8.4-r7.ebuild 2492 BLAKE2B 23caaa4926be33ee13dd47f87daffb1304138010e864371e06b203c51238482e42c9cd22735dbd1293ff7493bad704d0373c1164ce1831f1f0923d9d4bf502cf SHA512 56fbdd309df3e8c189abfd4b853f76bd28c0401303e9f7b12711da3f301d399c3fd140dffdfc36742bc3b56b1329f98bd65d5897c249d791a98184ce0ddd0cf1
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 48585c307475..5f3e1991a9b1 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.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 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-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="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index 6fdb6ef43b1f..28b073187941 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
-EBUILD libzmf-0.0.2.ebuild 1019 BLAKE2B 37f04d254c06d8ceccb70b2a29b1f4d46f81bc1b87fba7ba36ead8b9bd78147445c778ca16db5c7c33ea522a06bd780a48e366556ae7669cb4e867f077b6e9af SHA512 b55c96ce5ab47f3550fdb28952e10c7c45b91965a835bd15f5a53a19dbe66d323a7a03243fdaab03ca31431bb05aa930e93a5d9922e6b5f26ddcf8effddc2461
+EBUILD libzmf-0.0.2.ebuild 1021 BLAKE2B 55f96513a5997ddb28f6a856101bfbc292745ddf4e26a02f7708fb3b15d7286b513b28853aaa80552d26196a5e00eddcd72e99e8395ff2bc177cf156c0bdc9db SHA512 252610f74127de873a347e178288c05f015ead98e7dd0b2ab5e7a786f84d34608a110faa8872d171fd5ad44117e643e0cb9c9c7e596b1ba028575b39bab5dd5a
 EBUILD libzmf-9999.ebuild 1014 BLAKE2B 255a8b8d4297d17e4ebc7040156a964bf9b474d7c1bcc140d2331aff5b2018815d1e2bdb4a81a6b779a7525294055de52d59422fd1d19837f7822cb78522e0ba SHA512 19d2c912737d51cffd1a1908316ccb2a3784e3c2f5ebc3c5c7fe212fe6fd3d08ef7b226cd72a74000554bb9b6ca84e4618ced4c7463b97da34148bcc486f532b
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-0.0.2.ebuild b/media-libs/libzmf/libzmf-0.0.2.ebuild
index 987ad03573c1..001ebcf418bb 100644
--- a/media-libs/libzmf/libzmf-0.0.2.ebuild
+++ b/media-libs/libzmf/libzmf-0.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=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="debug doc test tools"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 9e068f633c19..0d7c43a84c89 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,6 @@
 DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B c6fbf71e2ab6837f91dfa996cf7e89e9cae22e219cac56bd4201f7a62c787ddd2f65e7d162a329971018f0b1a796ee1a5b252ee6b43bb3b27a233d67b6cdf615 SHA512 04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7
 DIST mesa-18.3.2.tar.xz 11868440 BLAKE2B 49612671fd4187e71441bc88094f2cde2057b8b45ad2546357be715a7c69dd38f5ef03b837369e302509e0b9882ba209e7901b172dc3f7d797804fa4ab383c91 SHA512 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
-EBUILD mesa-18.2.8.ebuild 13581 BLAKE2B d8b0c94bad6f307241ab84b2c589622cf63213a5c35912295c68d6eb165d15563eb24663c1fd5ac50464162a21fb8609893d97aba24e1f15fe712d7fd6564960 SHA512 fc736135a306b36b10f5397853df288b59246cf026a3be4c65499271ccc2b53868b0e9aef76ac62920e3de029846f917a1699c01022b2661f9be4a6f750bce80
-EBUILD mesa-18.3.2.ebuild 13704 BLAKE2B c0ab4b8bf22d733ae4a5e4d9703a83b7c0db3898a68dcfbd102a2f0da657a1345a5775988f2abb8054468ef8293171af84e5a5c383f78a1d67e14904cfbcf30d SHA512 2a8ebc6f054a8fa1a4672425ae7d6c8f26270a3c8af58ef382341e28a5fadc07d50c0dbec21cd0e2ca4b529705f2df393c7c322d29ca39b43267146706a30391
-EBUILD mesa-9999.ebuild 13725 BLAKE2B b786f2832136dc5a4973377513d90b1573b065917d971dcce13910cfc2cc1e7b4e329faae108741fd7c23a4c9856e2dc3bd141a80d979e82447312f98739f2eb SHA512 df291492547683d74be6712f180971a0c64e18aa011b7ec69e599a0c54166b63c95c4ec148292c05a13bb7cb58a31b3f8fca45590d2fdd5525d0a2f6b251ffee
+EBUILD mesa-18.2.8.ebuild 13591 BLAKE2B 29f4923e1c70708aeac2c19dae53f8a8828cf82721fb784e9fb38f30b7ec8e12d695dfed6798dfd9bd4b4dcb34a3a6ca9e4f32f7bc58de3bbd96d22d7e4e09b3 SHA512 7d3d04230d0e99d6610a2be403c8d37abc204f7e268435ae555b0f955dfe1d2f9f5e28e08c3ceaf08deb4d9eb45de19ff3ebf2901556ff03f23c85f21408dd3b
+EBUILD mesa-18.3.2.ebuild 13714 BLAKE2B 57285a680baf772c7659bf05dd83307a39ff9f75e7e618c8904581377584cccfbe440558c9f7cb150fbf3fe6867c8f204e68e6a4c8057190f4be6f9fc8172f24 SHA512 3c67d77219aaedc739e1ad4a26c5f785ce7763099eafa3f24cef79961afe1a6eec7824c1750eef067e5b492b56105c6a014bdb6007ca1bff34e8649f2ce99cff
+EBUILD mesa-9999.ebuild 13735 BLAKE2B ab2b93afd39cf8cc87512cd0a3082eb2541ba23b037fb3a08baa6c7753ea0f159c61fe555aeb3c1b60f309be6baee9e55e743746b5829fc9b40942674a12e598 SHA512 4713922b3080b60e8ab2f4b18b83bc2f05c8ac2b0874dfbacaf04c85816d9e6379c685763d2a6b238da32ec3216084b0258b7e3b1ebab4328383489b19a4a2c0
 MISC metadata.xml 1865 BLAKE2B 5c972239c02d0b4c212306d21326706af866576673802c7e28f28434bf1afe4145e89b7fc26947ba2126ecc9b5e57e41f248c9a23dc3e097efaddee177a4b904 SHA512 11a4e9b63b8d7fa041c76ff39694f138781443f80ae8942f845f6b9c30d560c25de83c62ca53f94f5129e42f2ca11c8478e4b5beae427c8352f7489f66e84795
diff --git a/media-libs/mesa/mesa-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild
index 86f334decee6..39037788af05 100644
--- a/media-libs/mesa/mesa-18.2.8.ebuild
+++ b/media-libs/mesa/mesa-18.2.8.ebuild
@@ -360,7 +360,7 @@ multilib_src_configure() {
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
 			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+			use vaapi && emesonargs+=( -Dva-libs-path=${EPREFIX}/usr/$(get_libdir)/va/drivers )
 		else
 			emesonargs+=(-Dgallium-va=false)
 		fi
diff --git a/media-libs/mesa/mesa-18.3.2.ebuild b/media-libs/mesa/mesa-18.3.2.ebuild
index cbfaa1caeb6e..ed992366d16b 100644
--- a/media-libs/mesa/mesa-18.3.2.ebuild
+++ b/media-libs/mesa/mesa-18.3.2.ebuild
@@ -364,7 +364,7 @@ multilib_src_configure() {
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
 			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+			use vaapi && emesonargs+=( -Dva-libs-path=${EPREFIX}/usr/$(get_libdir)/va/drivers )
 		else
 			emesonargs+=(-Dgallium-va=false)
 		fi
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bbc496e71565..34f5ae7dd7e8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -364,7 +364,7 @@ multilib_src_configure() {
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau; then
 			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+			use vaapi && emesonargs+=( -Dva-libs-path=${EPREFIX}/usr/$(get_libdir)/va/drivers )
 		else
 			emesonargs+=(-Dgallium-va=false)
 		fi
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index f7df0aeae28c..415528ecd0be 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -2,9 +2,7 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8
 AUX mlt-6.12.0-frei0r-w-tractor.patch 1469 BLAKE2B 50cb2d6360548299bf49755f16b32b0dfda69ec4992f4964bf56ca5e4cc5b5b4016af43bcae2cb686b6b26e46834b461cc7c66f29f57280b13537f108b4d611c SHA512 45abb6f650f34d707e9a7b762a801023684b6d046eb747193be94ff7d8c780b6a3ecde19e6200dd1e74efae956e5f8b8cf999b1ddb11ba5e7049c8a6e17f704b
 AUX mlt-6.12.0-rgb-to-yuv-accuracy.patch 7735 BLAKE2B 122c51cb168a4c921cb180fb219795fffc98caee9d199fe8ce40b6ccf09b6be373b0eb20dcdc2d09f8674d679694018ed950fdaad7297e8a7b13e2eb4a0e0124 SHA512 4e09f0d324cb54ae638fe8281b9a7f3d4878568ac323738a9a2398c67e507e4a122fc02842f7642f895ddfba2c28a2afe79e923ebea4db8fe66dbbd460048824
 AUX mlt-6.12.0-seconds-digits.patch 829 BLAKE2B a696c33a9eb97ef5ca07a7d7e302f3b83ab07a46de61f32aa7b84c60bb8174b8683fe4f08ac6b6b8506fa0a3da84a611c9e06ab190774427bfb5372881772479 SHA512 b96f47dea8532c9b98112bfcd284dac521e5b91a2d852a4570adb26082870f27e2d32f567ee1e9b49ee315013f657c7c68ba61e2b8d2d8edfc8648e4f11800a5
-DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
-EBUILD mlt-6.10.0-r1.ebuild 5406 BLAKE2B d6a93ca06b4027aa6a4ab00519e10ab9faada3b5e9339a0591f99079ac7ee023ed34563f124919c690f975427b23edc5207e2f7715418739aa565575a01809cf SHA512 48dfe59716bc90bdc743e07a0ec2dab81d10cb88a169f4fe21f84694de92457b8cfa47716b50b524d4fc5d193af709d3f79885a37b937aa5e02b205f1e44d762
 EBUILD mlt-6.12.0-r1.ebuild 5547 BLAKE2B b8d37f7308ba98ee532f1ec436adf80dc96a9ab3de147943d1d4dc135d66690de50a4d4dce664b3f45fb1b5a4fb3a96ae029b1293e86fe4d26508e328adc993f SHA512 200d06b1afed6063f899ae97375ce12f7c1b8dc880bc6b0f546e4c292289cc5671a34c1693a847b23e7ca0213db1dc21e4762d0fffd532ad6c7e8b42be04765f
 EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451
 MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.10.0-r1.ebuild b/media-libs/mlt/mlt-6.10.0-r1.ebuild
deleted file mode 100644
index c17755dd3697..000000000000
--- a/media-libs/mlt/mlt-6.10.0-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-# this ebuild currently only supports installing ruby bindings for a single ruby version
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
-# /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby24"
-inherit python-single-r1 ruby-single toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
-# java perl php tcl vidstab
-IUSE="${IUSE} kernel_linux"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-#rtaudio will use OSS on non linux OSes
-RDEPEND="
-	>=media-libs/libebur128-1.2.2
-	ffmpeg? (
-		libav? ( >=media-video/libav-12:0=[vdpau?] )
-		!libav? ( media-video/ffmpeg:0=[vdpau?] )
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	ruby? ( ${RUBY_DEPS} )
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-#	vidstab? ( media-libs/libvidstab )
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-swig-underlinking.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
-	done
-	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-
-	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use compressed-lumas && echo ' --luma-compress')
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable gtk gtk2)
-		$(use_enable jack jackrack)
-		$(use_enable ffmpeg avformat)
-		$(use ffmpeg && echo ' --avformat-swscale')
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable libsamplerate resample)
-		$(use_enable rtaudio)
-		$(use vdpau && echo ' --avformat-vdpau')
-		$(use_enable sdl sdl2)
-		$(use_enable xml)
-		$(use_enable xine)
-		$(use_enable kdenlive)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	if use qt5 ; then
-		myconf+=(
-			--enable-qt
-			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
-			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
-		)
-	else
-		myconf+=( --disable-qt )
-	fi
-
-	if use x86 || use amd64 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang="none"
-
-	econf ${myconf[@]} --swig-languages="${swig_lang}"
-
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua || die
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
-		dodoc play.py
-		python_optimize
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby || die
-		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
-		doexe mlt.so
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 73f1f20b08d3..73f385c29776 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -17,5 +17,5 @@ DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.66.00.ebuild 5635 BLAKE2B 67ac7c65d38383dcbb448c4f3d4ebc47e7bc290a1f5c47e394d5946fc15ab6635c2980993472da0a3ecad886414bd4ce17e9b429914fa162b84ff357350a4d99 SHA512 768b550d7dd600b849fd31ce60204c76194eaebca4de61709e1c214d7e13841f701096915d4d1357148d7533a40946598a77799378216242f9da7645113b9a15
 EBUILD netpbm-10.70.00.ebuild 5376 BLAKE2B 0bbf72c60c2c6fd4c843885b2674d3120e48c172a5932cf3d43db0334851a240038ecb3fb14e5ab31c7bbff26dff20021cc1aa429df8897e642dfc6ed3a0448b SHA512 9787fae7edf2669e450896a65c0cd99f23d2d9acefbb108fb6dd12580ce0f87d3fa0de136648c7ba681e06f9f6109d8ad1b8525cb340d01415947df75103cd34
-EBUILD netpbm-10.76.00.ebuild 5273 BLAKE2B 0cec23a3a558aecf0dee29936cc8118f56d208be0079d1e78529cd3bb5ae1ad287cbb13ae2ffad6ca1433649eb0427e064bf78e9250f16f0662b23eaa9528daf SHA512 f357f5d08446ef77919a869823d208b402d0ac132e850c3873f15ed34865fa3064750fc5634fbdac948940dea2d74d3931260da44e7ffdb78b9a5f628ba9daf5
+EBUILD netpbm-10.76.00.ebuild 5272 BLAKE2B 78812684f94ae0041b0c564b114ffae275856acc832d1e7161eb8848c749617fabfdb8d789bb9ea27d18ee9853a962fb2b699533ec64583ff3e4c338135d72e1 SHA512 7360495346c8bca32542d9c0d65942cb1c4aa3a15cd880c5f367180c2a865172394af45874a57a4d065ec9d9c70ee3ce40a7a187a20eec1730e9711ce62ecba9
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 228339c25000..908bf94485ad 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.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="mirror://gentoo/${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 59c90acac202..877bf35f5d30 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -4,6 +4,6 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572b
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
-EBUILD openjpeg-2.3.0-r1.ebuild 4216 BLAKE2B 42d1a0d8eb060f1534fe121015bd13e4076b6f83aaea3e71dd9f1fa579217aec2abf3347d1aafe233f97c0fe8ccb8ba4dc4dab6a632b9318c52c8e7f794bebd4 SHA512 5cf6873ffd7f679a73faa21cc8bd763232b5c82b9e99eab34221d4fbf8238a055245223f041fc7b5dd95e6d6730a4e6a6fdc1d8eba9c7dd47fa37ca3907f45c4
+EBUILD openjpeg-2.3.0-r1.ebuild 4215 BLAKE2B 17350556cee3baf31e26d9f1bddf7a42879b088c84cf8fccad099b1316d3eb5fe469b3b7edb6d2828da3171105d873cf5f89285e2d04ea6b4c94bcde356a3b61 SHA512 3007c71e7ae8117f2ca934d0fc022646718d1f39a95fcaed671afe57092ecf40919c3f6fe913128ffee0b195c0f4d946ea319ab33485cae7fe099e21a9c2f12b
 EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index f292e53179e6..cb02969ce248 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 7d9e4444df81..adca3cb3a873 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
-EBUILD sdl2-image-2.0.3.ebuild 1524 BLAKE2B 3bd4371703ad10beca949c54d87094e52ff1d6a0a0c5423d75eefa355e9bb0700082c5df94dcba93a5fe497efbbba6239eea4932c4e40dceec4d206d8c80e010 SHA512 316594122cb65267148c7478bdd40a52af21021992a6335a8b030152f24320b1f1a096aec5c0e5c23e446c1adeea62d51432a9f5d7ccb63255a07d2af2607439
-EBUILD sdl2-image-2.0.4.ebuild 1534 BLAKE2B 734db2dcb15f784842b012bbef411314c9a88672464a6564b83858cf0b90d609abe3341686c87ec89ea5873b06a7faa170779506bbd349fa2cbad84807a1c453 SHA512 054eaaa74eff655abdcb5b6915117e7f28639786197ed462042bce82adfadac44a03bacc45c94f6f33755911273dc7e0582d2025e834322d51b6ad8fe92cee67
+EBUILD sdl2-image-2.0.3.ebuild 1518 BLAKE2B 2a1fa4029e2a0ca9c555f291dce592fde48e1b2f17ae05f686999b8599ee4a820cb46be0821687c6b16adcb4654e622d5b38fe9b560dafe7c14ebc8c81ff8910 SHA512 57b1abc7ca0ca0c4c7233ad639b6901db722503f577aae933653fc742a4b4e9bfeab96ff68ff41dff4ed4720c0d52c41635beb2b910da2eaeda952cbddf8a64c
+EBUILD sdl2-image-2.0.4.ebuild 1531 BLAKE2B 4da0a00877f3392f06a4c709ce057751d9efebf74e58cc44bf6c22a7e29b4ce97cdbf015f4656dd31a603f64f45d4cf0b1d7aeeb54287cd1c192e9dc37de0007 SHA512 b81dc92ab4cc1fcda37802fefcf499997bc13576ea1d644c5bd59eb4e4428d4724251deaa78cf8a4d6eabac83f02283e148a5350898fe62548ee465d119bc7ea
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
index f3a5ccfcb4bb..bbb163c9f538 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.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
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
index 461162602407..de0aae6bd4b1 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 37131b3ce87e..c813255833a2 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,4 +1,6 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 DIST SDL2_ttf-2.0.14.tar.gz 4147462 BLAKE2B c676c8880d26ee61900f82c418474d0eee9844842eb006f44c80f0cc3384dd2a3f0a1da0dc8a7e50f78caa6420cc494a4a4be1ef7a294310084d5a91b8ec3c44 SHA512 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
+DIST SDL2_ttf-2.0.15.tar.gz 4479718 BLAKE2B 8401ed4979dade5affa86be4463958d0c90f72d3b2874540cf868e460c5d6773a2b11eaf6d13792d23193085050970ebf877b707b0febaba9be29c4329be9d7c SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd
 EBUILD sdl2-ttf-2.0.14.ebuild 1099 BLAKE2B 0295afa0a1c642fe8bbab2e71d52e53b5c00a812cd42be08b5f950f7dd61cab1ec196a39e600be3a275ac3c03f2f1557278b42c1fd1af64463d7c8d12d8c67ab SHA512 3c7099971f3c7e1980bfb6765f38dc2ec8fe9abf28cd5028517dfdb7d38ce5c86545ac9aee0fa5ac6ec0f62f677e2bd54c920e61ef4da363c3e366368c4f98a0
+EBUILD sdl2-ttf-2.0.15.ebuild 962 BLAKE2B b7e59f19984aab7f957c55d4e414eace4efbdb53e86387d795950112f28d3e575039b5b23ab42b86d18831c4a2458662d03a3ac74648c5cc1e78362a39d9380d SHA512 be2832eb482046d939b1537bf0e562dd793ca16abe3164ae606dfe88e69f2f4cc4dfe5c13603b166295ba1b96def38411c90a095087d9fea361e2377684e3831
 MISC metadata.xml 501 BLAKE2B bf59cfab67a21e983789c97ca2b7c457ff228546a9b9a0649c84751d8dad50b79d3bd1c00317e1710e93cbaca727cbec5e648546556e724c12745462e746e709 SHA512 90a6e2793665a3e29fa719b5dad023be6ebf2a5aa4c0ea1f33f99210829b33602fefc8b4722ae0df05085e7190f828bb49aa53c9ff004c91e0f6c9f2338a09b7
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
new file mode 100644
index 000000000000..3a6aae37a7df
--- /dev/null
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+MY_P="SDL2_ttf-${PV}"
+DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
+SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs X"
+
+RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with X x)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index e8f08b62013c..a07bd231122f 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -4,5 +4,5 @@ AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32
 DIST taglib-1.11.1.tar.gz 1261620 BLAKE2B b33212df2a63d8d6bbca62b175812ec52783fdbfed8fb7bc5dedde845ac01e4f89a64d96b231e1db1e5e609e84dd84d83a2266c1f9ed371f1fad7ffca50486ac SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
 EBUILD taglib-1.11.1-r1.ebuild 1450 BLAKE2B cf7bcbc10d1dd4860d2b86095266fc6b55d8e021edc9a0bd0ae94277b92fe0d360c9937b380a20a9a1c75953c64790ebb46ab6f80a08fddbdc632ac19e982570 SHA512 cc8076635f8c1992d8c27c578336cd96fd502064bdcb9fc21693e966cc79835e96f6b9da72e126c2d2fc87852f38d76f5bf440dc35eb93ba6407afe99004ed27
-EBUILD taglib-1.11.1_p20181028.ebuild 1438 BLAKE2B dfc4d36a394a18d605124f8e26f802697a9a4f81171b81af932bfab8bc1de3b2023ee2a1b2d68753e768fd2a32541d7d3e32161951320745c39e66b46148a5d0 SHA512 c9e4559ab1ed66a874829deef6e27d051781c67c800d33eb77af7891f68d1220bbad4cf9d831d6a58b7030334d3be4b6f2f3308318effda21ee6db6cfa893b15
+EBUILD taglib-1.11.1_p20181028.ebuild 1437 BLAKE2B 122540d7355aea03b95a830cdfe7552525ef97ebc6515d2efa9c260e2e42eb6142957640e918d519e337ed4534f3e5bc6f971df18ef70ffdeb5971bdb72b47de SHA512 913e72168f9c622280b4ec5d4b82ed52bf7159b4c795e2deca6c048d63e4476bdea98a02985bc77b01bdc8c7952d1adca70a219b21ccf3fbdae5957373e33e64
 MISC metadata.xml 425 BLAKE2B 47fff2e6d248780975e5b7748de1cdce6f09d614b79ee055da57dc9062c7567f46864bc306bfabf17a7c61dbfca0d16df41d9c8a574a8fc220e359d41f247b1e SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index 0b424ee9999e..7f03fd3b8c4c 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.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 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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-solaris"
 SLOT="0"
 IUSE="debug examples test"
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 52856ef2b843..7c9100ee78d2 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index bd8f24ce97c1..74f641a22ce9 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -2,7 +2,7 @@ AUX calf-0.0.60-cpp14.patch 3259 BLAKE2B 1a76d9170088bc6adf466c06d026f7e9adc11c3
 DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
 DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
 EBUILD calf-0.0.60-r1.ebuild 1114 BLAKE2B f1e5f69121e7bb9c8c32a7fbd425b0d54884f4ab7bf99a51e705490a008426833470404866fba6d62fb5b60d5f5fdd4492ff6c8cceb9ebc3005c1332303cc867 SHA512 5dc27ad36ca4677882cfde392e8b89a09d7cb86ea8f804f4259ef8802f174612cd011f6644e14d2e5d15269e8a276d627ff37b803d8409d64dbbfdca7f6aac58
-EBUILD calf-0.90.0-r1.ebuild 1253 BLAKE2B 5a215266efeacbb08fa6562eff8de48b310dd4cba37abab08cd9c086d8eee955b9d1c584c83314e3c509661b033d8c03118e2e4be60ef02633ea09088d5a20a5 SHA512 0889a1bf91c00eddd1f700c9b9e0b5c7862bf041a386ba55b3bcf60a6c1667b718817acaed689e3a5e53f953389f1609ae222601512f1f8b1bc31828e9c2b574
-EBUILD calf-0.90.0.ebuild 1211 BLAKE2B 914852fa62e92132c497116c238b99512d343dcd954315870df35c9e6b66ec25da18f5c2a78160b2f5cccd553f7a449bbd48c73405167c3143309d01e2185f5d SHA512 600d8b739ab04d1a74d750684fc904ff33d8477925559c77475cca0e9f92ca573105db81df585b808cc79a5e9cdb4f792ee2c52a57a482f31d8f66e0f9d69a89
-EBUILD calf-9999.ebuild 1253 BLAKE2B 5a215266efeacbb08fa6562eff8de48b310dd4cba37abab08cd9c086d8eee955b9d1c584c83314e3c509661b033d8c03118e2e4be60ef02633ea09088d5a20a5 SHA512 0889a1bf91c00eddd1f700c9b9e0b5c7862bf041a386ba55b3bcf60a6c1667b718817acaed689e3a5e53f953389f1609ae222601512f1f8b1bc31828e9c2b574
+EBUILD calf-0.90.0-r2.ebuild 1382 BLAKE2B 2080b6a17d503c43dac7a2ec2f60ed32eacbf32afcba5bc0d3308feab3e52e02c4fb21038ac022657ec923c1fe1eaa4caff8e449fa0ca103808ff199ff506175 SHA512 5100e445ee378800b36d51c8d01a3d9ec5e43ce2f27a73a851d7c81bb1163d763f1566fe0589ff42145816b9acbc637d1c53eef6455480e35620be55b3acf2c1
+EBUILD calf-0.90.0.ebuild 1240 BLAKE2B d25d5384de1227348e8df740323e0ea462b7ea6af9fc4810b82f3ddad1f4244f1d60719290155aa97e694d903cfcdd112766cd0d340161f74578580fa40b0004 SHA512 bfc4c1580ed472d483e42804f2404f02d56f6cc9159c36e10b69570670d1bcb3a525dd348fb4e4aa08f9d6dba1a50ab93d6668fe2c7159ff481b6cbced81cf68
+EBUILD calf-9999.ebuild 1382 BLAKE2B 2080b6a17d503c43dac7a2ec2f60ed32eacbf32afcba5bc0d3308feab3e52e02c4fb21038ac022657ec923c1fe1eaa4caff8e449fa0ca103808ff199ff506175 SHA512 5100e445ee378800b36d51c8d01a3d9ec5e43ce2f27a73a851d7c81bb1163d763f1566fe0589ff42145816b9acbc637d1c53eef6455480e35620be55b3acf2c1
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
diff --git a/media-plugins/calf/calf-0.90.0-r1.ebuild b/media-plugins/calf/calf-0.90.0-r1.ebuild
deleted file mode 100644
index a065b446eb2b..000000000000
--- a/media-plugins/calf/calf-0.90.0-r1.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
-
-DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
-HOMEPAGE="http://calf-studio-gear.org/"
-
-if [[ "${PV}" = "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
-else
-	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
-
-RDEPEND="dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	media-sound/fluidsynth
-	jack? ( virtual/jack )
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gdk-pixbuf
-		x11-libs/pango
-	)
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# automagic...
-	#$(use_with gtk gui)
-	#$(use_with jack)
-	econf \
-		--prefix="${EPREFIX}"/usr \
-		$(use_with lash) \
-		$(use_with lv2 lv2) \
-		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable experimental)
-}
diff --git a/media-plugins/calf/calf-0.90.0-r2.ebuild b/media-plugins/calf/calf-0.90.0-r2.ebuild
new file mode 100644
index 000000000000..f39ee8bb02a9
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2-utils
+
+DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf-studio-gear.org/"
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
+
+RDEPEND="dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	media-sound/fluidsynth
+	jack? ( virtual/jack )
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+	)
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# automagic...
+	#$(use_with gtk gui)
+	#$(use_with jack)
+	econf \
+		--prefix="${EPREFIX}"/usr \
+		--without-obsolete-check \
+		$(use_with lash) \
+		$(use_with lv2 lv2) \
+		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable experimental)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-plugins/calf/calf-0.90.0.ebuild b/media-plugins/calf/calf-0.90.0.ebuild
index 4d9473406b0a..820905fdc57e 100644
--- a/media-plugins/calf/calf-0.90.0.ebuild
+++ b/media-plugins/calf/calf-0.90.0.ebuild
@@ -45,6 +45,7 @@ src_configure() {
 	#$(use_with gtk gui)
 	#$(use_with jack)
 	econf \
+		--without-obsolete-check \
 		$(use_with lash) \
 		$(use_with lv2 lv2) \
 		$(usex lv2 "--with-lv2-dir=/usr/$(get_libdir)/lv2" "") \
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index a065b446eb2b..f39ee8bb02a9 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-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 autotools
+inherit autotools gnome2-utils
 
 DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="http://calf-studio-gear.org/"
@@ -46,6 +46,7 @@ src_configure() {
 	#$(use_with jack)
 	econf \
 		--prefix="${EPREFIX}"/usr \
+		--without-obsolete-check \
 		$(use_with lash) \
 		$(use_with lv2 lv2) \
 		$(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") \
@@ -53,3 +54,11 @@ src_configure() {
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable experimental)
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index adbc0f9048d5..de2bda2ab760 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,6 +1,7 @@
 DIST kodi-audiodecoder-timidity-1.1.0.tar.gz 1785627 BLAKE2B 4adcb4c2331174d5f023b5698b5fa2a589df81575eb6e9b8b162f9054aa673ca49d516b94eb07b6c769f9301f6c991cfbbf9cd50eaea12d8580f3db97111d8d3 SHA512 d6bf19761a60306cfd89bf4cd654f8e6c6725c29d15da80bd22236add62051671cde1363ea9df1e5488cc8dcf8c31fc8b432466480d44af0141e639f5cf36a88
 DIST kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz 1787950 BLAKE2B d0547f80eff154f2129d91077e25b0f51d19ee66ff371c7a11d4a7d0e3f479506961ea290a9a71643fd4a707dfe1ae29de7b5ed5fc7ccfd6e1d5625cf6d7138f SHA512 91db2fa954d441901ebce35189d642931882f5b20ca815af45dce67d3dbcb201a8920fb76e0e8074038f476a1dba1192cba28de7c374c76800cc50161f6915f1
 EBUILD kodi-audiodecoder-timidity-1.1.0-r1.ebuild 656 BLAKE2B beba8a19bb335695156398f9d662174073e596a70994027dc2a094dcec7e2b56ce2bdd0ecb204ca3368cca24215444a0b607c1d727d17cbde79a8e3de4140c09 SHA512 054da9c730713c80101442674ae5dd8430811982907bca2e4d5de5452864aa4c35b6b75d7c2cd96eb7debeae1721b7775223a977b0cce4defd3dffe7fb91c268
+EBUILD kodi-audiodecoder-timidity-2.0.1-r1.ebuild 734 BLAKE2B b68536d4c91317fb9ac15e22aab32e8277b21fcb8a8285c6ef20a8d032584252b9c428d7cd51b6a66cf594f07fda58267b6560e1594ee6693376938b0c303f29 SHA512 fa8e6195b67b43fb5db248aa9d63beb353ae5a06540a6aedf9e87fc3a9d5f4ef43b55962c54b3f3e372847328e7e39f2667a4a9826a4d2fe3c8388c9d5ec0d1d
 EBUILD kodi-audiodecoder-timidity-2.0.1.ebuild 708 BLAKE2B dbe849e00740a969bd20c0d281fd5599239ed989585af2fa0fc62ca2f574cbf44419b04131d3fe7cd9fa9c6e1ac7582ca20d41c74c99325baf4fb8ef842f98fc SHA512 fdada114d5c02b47f1b8827f38360ce740527e124c43f8c9cd4dafb98eb8dcfbaec5dbce238defebafa33c9361f644631cf4b48972af30047b9078fb22607703
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 709 BLAKE2B 8f59b4deb65f9955ed356860e86d7146d030a96946f57494790d8a13c9df95f3d9223e4adc0257fdccfe668eaad3655e759e5bc2a77039e6b0e007879a913797 SHA512 b4fd91cf8aa918bb97d271d87d893107182b43ebe781ba853e35ea1ff4e2d665144ee87def9ab641e96f773464413a17959af774544a3e01decffb5b56f8416c
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 735 BLAKE2B bf90509fac7e82b7cebecb1c4ca237059b9de46d1eb9bd552578603577685e0319ef27ee5713a9ac7fe8ebf72eb66e6ae1f02a9c2447496ba808dc9ae5d15d4b SHA512 622ba2fa10dbe9e69ade56372288455ec6ebec90948556ba4cebf52dccdb195f4da6baba6c58be20212d945f62b26b018b6d7c9fa8294b4d1e70b495793fe899
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..bb7b4c8e3489
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
index 9bcec2d315b5..e99b24fbb324 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-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
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index 80c728d7b21b..aef7a7cf338a 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-pvr-mediaportal-tvserver-2.4.19.tar.gz 385817 BLAKE2B 2cd89d3940ef6a52a78be8791152715db8a55683120405eea2c42c3c58df58ac905b4f3c7aa50a6c45f8b94fe32e6d2d05811242c741a8ba7b10d8801d5d959f SHA512 d017d3d4b01fc86aaf22a1f44612e35c55b07888d8d0548cfad644d94aadedc4c86a50dd3d9c681c5e01e744971d25869f8bfa1a106c780492e4f3ee1b017e0f
 DIST kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz 398113 BLAKE2B e944a49bd5d996d2c62325ec7c8b8dd6f69ca2918331cca198afbc11a1badafd4ad7ffd15f562016d540c5777cef285fcd090be28662988f71187899a43609f8 SHA512 4784b97d1826a8846156910b658a32b6b133dda04a8b2366f0dd67445fb4247132da427f63ada4284cf9889b8c5e7ca5f66785998e23b8ee5845ffdb352a83ea
+DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77bb5f79709f322b980aa29ca4e5077efc20894b610eaf81bd0d6f2a23de72bd3bf768ca0d819d57b920573515e0b134465b4f5399db966f35 SHA512 916d3a2f5ef8802a49c70f62bfb94145c3aa8f140ff3674ed3fef21c4d644a85a0cfb1088f1fc893b677635263f47455c0ffbe6554ca484659a1b7c8ebd47207
 EBUILD kodi-pvr-mediaportal-tvserver-2.4.19.ebuild 777 BLAKE2B 72f39af2662728f76c97f989dda6ca17dc59f99449edbaaa582323d51fb029763e5e1d275ddfde37c58344d22107d572b03ea4fff6788f376b5190abb531b9bb SHA512 c8f6c6091704045c2431970dcd8c081d58a275d19ab9ebcf47ebe490516e1b230d494fdbdaa86f8f535d7372e3eb1aff1bdd8a5becf72e90d072d5465c755148
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.16.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
+EBUILD kodi-pvr-mediaportal-tvserver-3.5.17.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
 EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 769 BLAKE2B dded0d563c6ab53e0d31b350aac8608fc73752926220ff2064f7c73202af6f0f9b1e870980cb931c4ad8cda21c7af9a6547edca83f945f899bbd649ed71652b7 SHA512 d78b613e7d099d59ae9b26363eba804638879b7288bb41ad65228bff6c0158d2f9358978164657fdd837aa4ad844cdcf9ca5a5f651fb003222c843319a6d1f38
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.17.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.17.ebuild
new file mode 100644
index 000000000000..15c92436c88e
--- /dev/null
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.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
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's MediaPortal TVServer client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index 6c2c6c419f92..1781540e7743 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-visualization-shadertoy-1.1.5.tar.gz 11826868 BLAKE2B a18512c811e1412d63d4cfcd97804eaf90047603de592ed21fe2b1c24b77a21a3f9e859d86ab23f8f59ba3eacfa40f3028f5848c8b6d6f7e8acde19c1522e640 SHA512 557cc9567707ab53c63537f760b552c4129f45a4c99346acf9d00f8fea5249af1a8af9ea6fc8587e7ab6e24c8a686356e5bacf0a2cb34dcc8b38059c36127e43
 DIST kodi-visualization-shadertoy-1.1.8.tar.gz 11825753 BLAKE2B 1ab30e261d9e48806d7b6629b5aac687831f735b05d1cc48d6bacf146fe2f3e2d75758c490c474838e9d861f2bc1776d0fc9cee00d6dca9d5e87ec874dbd02fd SHA512 5cee18db177c0cc61bc46a4d457b559bd1a023d3ff51261eee8d4c4828df77571beda12dd726f30554bd16c7ad67e12d836c5a211a3d55321d92551eb337ddc6
+DIST kodi-visualization-shadertoy-1.1.9.tar.gz 11825717 BLAKE2B 683b89be6b02574bec6db39446d1adb03ed09ed0da4be03245e8012980de8f1ff5d10fba22e40f74f022263c853fd076f3079feb6d82b34901975682cf8ecbdb SHA512 f829505525f46cb54ac205a52561dbf99f776350c0c34487438663d1c42dcd734f8c2e543c23550b4be61bab00d7f09beb63824935cd68de14328aaca44a5b95
 EBUILD kodi-visualization-shadertoy-1.1.5.ebuild 703 BLAKE2B 8db9e065d98d01ea38a745e032590053081479d13fe8f2031403ec2576326ecf6fe11dc182b157a8b87939ad2cf754a9d97132081f7e3ba3a61d663b02f05e78 SHA512 e6616a30af82973f51dbdaa0ef2897a8983a572d3a7456a2eb1da6f6f126a88579aa9bfe703c07e100515f5635b6ae1fc7de09fbd25057e128cd8a75280d7cce
 EBUILD kodi-visualization-shadertoy-1.1.8.ebuild 733 BLAKE2B c29892cccfc9bbbfb6169ec53187408ae0885a7ffa1236e784885098ff931987ef3aec40855831b69e657507bcdcc4b374b6af415482b33034318e2b6ba9cfca SHA512 4b1ea57c7a6fe31fbbb3e7da47d2469e3c8e9d521119d8eee4384d49fdd57dc242ce180a012a1d4ebdcac551c1bb6015b9fc41a6a71eebe07c712cc1ad5cfa9d
+EBUILD kodi-visualization-shadertoy-1.1.9.ebuild 733 BLAKE2B b70e59671f5d3a92bed86531b1053a4a2e19b9f02d6bf7bc90ae2d7d3686f03f04f03eed97e07c451fff12343ecb753a2146582055d3449567c8e36eee0eab3b SHA512 8050a8c641107b37b4940e3d09a783d2f2b8f911d3a9e6c5613bc22b992ed4173e385c3513cdcfe5ab24cb4a86d4ce86b02a7229f606b643b325b5bef61c51aa
 EBUILD kodi-visualization-shadertoy-9999.ebuild 734 BLAKE2B ee341b0ff6825f7f034d0c62eeaf4c8abf2305f269b5fabb19bc0882b8df8e6a99161b438923237177025c5c0c27c9b8209ac685ce7aea22af296825202cc366 SHA512 eacd80122b385da5b1744415128dc1b83e06886565a5f902464f381142bbdb8424465e70f1dcaa7a2979a322c22df2a298c154b57a0e1180887f6f12d1aa8a49
 MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.9.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.9.ebuild
new file mode 100644
index 000000000000..e87d16765980
--- /dev/null
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.1.9.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="Shadertoy visualizer for Kodi"
+HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-tv/kodi-18*
+	virtual/opengl
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/vdr-imonlcd/Manifest b/media-plugins/vdr-imonlcd/Manifest
index 7d592a62f32b..0cd9a7850432 100644
--- a/media-plugins/vdr-imonlcd/Manifest
+++ b/media-plugins/vdr-imonlcd/Manifest
@@ -2,10 +2,6 @@ AUX 99-imonlcd.rules 125 BLAKE2B 70328389d6a2aaf93333eedf4db4c7ec798b058dd4fcc86
 AUX confd 197 BLAKE2B 6ae3b143d152860d5343859feb4a054c0c733e6bf91767b3d9ecaf9fc7cbf3313a1776c38b7538265c585d5bed6bf7efe66e9ae50aa5296f3735aeaf175f610d SHA512 4a118a89160ad63208cdfb1fee80063bcc1487e8fd98205a442babc892411018293313fe8db9741180d483a6787cd8cc7a04cea644d3967c46a680e74afa94c1
 AUX rc-addon.sh 165 BLAKE2B 7d761ab823ae86d365047cfb01251077e2f3d880953888ef2fdcd943d30299fac8af23e24c668b0969ae22a04264ecb2f88e78a81d5d9b06870d292705b110e5 SHA512 6d805256adeed3719ff7d7edb7ed5b434654e23a0a709e1761be48877f7572f35a6c66ca732219de73c6be49338593aa5d98af507558a1ec76be6acb1ad95f16
 AUX vdr-imonlcd-1.0.2-freetype_pkgconfig.patch 816 BLAKE2B f0494f58adff0fbab89262ebc65a65c0610e3a6198014139c860f705a9e0011759b471d9c1f5c7f4472a08b98a533ee1d0cf34a0ec7a13773e97b5a027c9bc39 SHA512 9d008137b6b8bd42051f6019f7b3d35aebae510536124dfe3e59d9a677fc2223910af9f5012bc334f5c3c0f3fc5539ec2a381cffe5039338804e015fc02da572
-DIST vdr-imonlcd-0.0.5.tgz 43380 BLAKE2B fad5f62bc15a02819508157a07326ccfc2bf8afcd903f7b3b53d94321bf7fcd512b75ff9dfc3e469114d52d6f290c19ae04686205fc0b14aee33f345816d5638 SHA512 89082591c953d8f5883efc1d6e65d8c5fa54087b8baaff70b2de264323086cc76b33d9aa16e0bbe39c4f23ce94f5f1c31649c286b2034ea0d91fe8d8aa26edd6
-DIST vdr-imonlcd-1.0.1.tgz 44423 BLAKE2B 82351e2b13fb8f932057f38ab6075e90ea020afeb8f32c4cae1411683ffa3770cc48af079c6078d7a923445137e04285800b4a002eb468db05c6c7fc586c3ffa SHA512 5912a51d01eab45c7a71cf9939e3947bde69ebbe413aefd5601734b60fb853bff6b2ae7a4c3e68aba7f5bd75b33921fec664d66128942ce0f223d4a2bbe53512
 DIST vdr-imonlcd-1.0.2.tgz 44517 BLAKE2B 1cc675978ca2c8270592c552ca383468628382c28aca08f74c55aa40dfc4154797f0e49e038cb2a8c07d66dbbf9d3fed190256809e08c4dea9b379a29cd96acf SHA512 ad1f70c3c3f4754251bd47d23ac2c56503860461edfb6e91d8dfa8e1d585da9fdd36ad300821eb29ef727e5a0875aa41d5def5f6f89f36f06efbd4a5da2b2fae
-EBUILD vdr-imonlcd-0.0.5-r1.ebuild 860 BLAKE2B 9b4c0e48197e5318d5e0220dacd8b6cb5acc62734f44e0b8902ae8d3fa6ad4a343f4c7586e6e1760835b0c3c45d0ff8ce2a8f61dc95e9e28144fe926c8b5a1c8 SHA512 1eebbd6b58f29f5b7baf044b1ec493eb666b31f6857445df6596b98875a7a77c871a76c20302175f7279ac1f406e97633f84ade6f976ac467121f2ebd3c09cff
-EBUILD vdr-imonlcd-1.0.1.ebuild 756 BLAKE2B a3fd48fe7cb514c97e97894f1cb6bd2d600133a4af2c53a207130d488422b06069e2d2b95e76ebd190c93771728ce47a1734fbe6414031ea5c1cf30374492480 SHA512 01e27f9a3e5656a3a6b55600aaf52d4190862e3b5ae38ca697ce91b0a7cf32a20d6caa32269c5b64fd661e5f90d1a2972372ab60ba764353b43e7a397bde3275
 EBUILD vdr-imonlcd-1.0.2.ebuild 821 BLAKE2B c75853d027b05b2cd73e3cabd97d6b2836564a593f2760f840aeea475c476dfeb8f301ac4366adf6fa12abdc1922b832d4d0ebbb5eca15ec55bfa5612290fc3c SHA512 52725a36ad64c527ca2f7bd8e73eb16a8162fddddcef1765f1df7f569df3adfbb7fb61233069b7d155fcc97bc7dd656538e20ae7df3353acdceaf3471cde0008
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-plugins/vdr-imonlcd/vdr-imonlcd-0.0.5-r1.ebuild b/media-plugins/vdr-imonlcd/vdr-imonlcd-0.0.5-r1.ebuild
deleted file mode 100644
index 25d334690af6..000000000000
--- a/media-plugins/vdr-imonlcd/vdr-imonlcd-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info vdr-plugin-2 udev
-
-DESCRIPTION="VDR Plugin: shows information about the current state of VDR on iMON LCD"
-HOMEPAGE="http://projects.vdr-developer.org/wiki/plg-imonlcd"
-SRC_URI="mirror://vdr-developerorg/408/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="media-libs/freetype"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="~IR_IMON"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	vdr-plugin-2_pkg_setup
-}
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if ! use nls; then
-		sed -i -e 's/\(all: libvdr-$(PLUGIN).so\) i18n/\1/' Makefile || die
-	fi
-}
-
-src_install() {
-	rm -f README.git
-	vdr-plugin-2_src_install
-
-	insinto $(get_udevdir)/rules.d
-	doins "${FILESDIR}"/99-imonlcd.rules || die
-}
diff --git a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.1.ebuild b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.1.ebuild
deleted file mode 100644
index e3b27c21408c..000000000000
--- a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2 linux-info udev
-
-VERSION="1327" # every bump, new version
-
-DESCRIPTION="VDR Plugin: shows information about the current state of VDR on iMON LCD"
-HOMEPAGE="http://projects.vdr-developer.org/wiki/plg-imonlcd"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype"
-DEPEND="${RDEPEND}
-		media-video/vdr"
-
-CONFIG_CHECK="~IR_IMON"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	vdr-plugin-2_pkg_setup
-}
-
-src_install() {
-	rm -f README.git
-	vdr-plugin-2_src_install
-
-	insinto $(get_udevdir)/rules.d
-	doins "${FILESDIR}"/99-imonlcd.rules || die
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 9c6e2b31fe72..24e606d69d07 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index ec64b9ae7063..516770de8fa5 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,8 +1,6 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
-DIST fldigi-4.0.16.tar.gz 3727379 BLAKE2B 249516d338d3c70365213673fc4ad3ecd1298f5230e682a74b3f166c36538143d4d7bcc5dee0d1903ba79d8a95bbba89021bfb6bc2a28657ae42edc38129d163 SHA512 cb8eb7eb64be755bcf2021ff27fd8d6982b2fde44f3d49f46478a60c7dfb4120e1d929666c1f0cc42ae91d480be9871aa4705bf613ec78adf4c3d20ecfc9df42
-DIST fldigi-4.0.17.tar.gz 3757991 BLAKE2B 1203ccbfafcb74cc6a48f22465473acbcbf47485d22d191f4aeb64d51059d8dd9a0dd743e62f10fbea08404567f2551d9b42a47562beb70325dfbc6854a8af2b SHA512 566a424037aa1199da63c44895ddaa3afb51b45f7fb1dfd43992f9b3c8b26dbecf649df6f77d0758f8cc6e35fa94598d3c6e64236621f3a64bfc50897e74f722
 DIST fldigi-4.0.18.tar.gz 3757912 BLAKE2B f50f9233bf077c8d53bafffe153c319778fc0f0efa5123b1c6169bce70f91bb6cd799944486b4c2eb31ecdf0f15e75d9d6b700d6c21f4a256382d947d4e14f68 SHA512 b585845b83b8f108a0aefa108349a73e53378e39c545d426c5846dc451653bcbc13d2239e33e69e6045eaeb605c4ac7dc1ae3e9cc0173962f6e0cb86bc6a4f5c
-EBUILD fldigi-4.0.16.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8f7c5f5d53c71a11677242f51f109efb51ebedb86dbc36592e11b694398f0537a49d52f2aa49f55de0509f918 SHA512 cd049738e4d063b4a23121e0a7890875b5dc19dc70bc183dcd748063717e03ab143a6c588a7c1383f0a1425517bb8b7b35e9af517567cfde82078456c367cc9d
-EBUILD fldigi-4.0.17.ebuild 1290 BLAKE2B fd7e80b6a24c917b069ce86df423f4901eef49ebff53376f624c3948bab8a57696d02498ca729255216be3e0448a3d50bedaf01e3ae4f89120d24d87a87ae66b SHA512 05ac310aade6dd5e55fda3a1d898f809efba3c57e40336bd5f986e9736ee69ea5db6a6185b6474181ffa18a069d1ad020ad7e6bd98fe9595c2699e882178b228
+DIST fldigi-4.1.00.tar.gz 3916169 BLAKE2B d41d254eb42ea4ae5cc361faf637e471b1d6ebdc08e1b2b1f9ff21e5467bbd399e219c0b350429cf68e5cc75d75492dd5614bf8630abca81376e8a6da544e90d SHA512 49673c1a45bc438ce38dd539e926f7700f6b06364a1a53592ace21387751eb782936cc619a08d94315cca33872cd9874d090d3503b087252f69a9ef99fbb392f
 EBUILD fldigi-4.0.18.ebuild 1288 BLAKE2B 19aa7dac107d65f02853cad2393389046d6ef606b46016380f94ae2b3aee1b7f261181d780a823b9fce4f2d73c2471064b9d305a1cba960f9da2f7a3c3c5b62c SHA512 528468b25b576326eed9cba4254607438c452b8915d03c7341558f1e780b4266c5fec5a80971f570be1adb6ec8205cae85f0799ca369871a0a76b61ebf72eb64
+EBUILD fldigi-4.1.00.ebuild 1290 BLAKE2B ec9e779275fed3b2c5b7464a2b1062b1a4ab98290e78449b47687e2fb2fa7b4adfaea6533607976af298a84ad2844c507d9765f2e37463b6051abebc929be497 SHA512 b86cf76fe0ae34cd02285f5ed1da2abf09081017f9213d7ffdc299f8195e94c31556da0303a308c2a9a9e1cbcc0101f51c54b4159f3aefa7158592363caf75f7
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.0.16.ebuild b/media-radio/fldigi/fldigi-4.0.16.ebuild
deleted file mode 100644
index 5f82ae983153..000000000000
--- a/media-radio/fldigi/fldigi-4.0.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	>=media-libs/portaudio-19_pre20071207
-	hamlib? ( media-libs/hamlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	epatch "$FILESDIR"/$PN-c++11.patch
-}
-
-src_configure() {
-	econf --with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.0.17.ebuild b/media-radio/fldigi/fldigi-4.0.17.ebuild
deleted file mode 100644
index 81f8dc09f51c..000000000000
--- a/media-radio/fldigi/fldigi-4.0.17.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
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "$FILESDIR"/$PN-c++11.patch )
-
-src_configure() {
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.1.00.ebuild b/media-radio/fldigi/fldigi-4.1.00.ebuild
new file mode 100644
index 000000000000..8f56029eafdc
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+IUSE_CPU_FLAGS=" sse sse2 sse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	|| (
+		media-libs/portaudio[oss]
+		media-libs/portaudio[alsa]
+	)
+	hamlib? ( media-libs/hamlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=( "$FILESDIR"/$PN-c++11.patch )
+
+src_configure() {
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3a74f40e48d4..3408f440fcb1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index a8585a854aff..ed875a44f20e 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,7 +2,9 @@ AUX clementine-1.3.1_p20181201-cmake.patch 5224 BLAKE2B bd5ca791fc6d67f2ae1e7338
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
 DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
+DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
 EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
+EBUILD clementine-1.3.1_p20190127.ebuild 5210 BLAKE2B 64ae03883bd8f11022d3dc57fbb1911986a9e648af52174afc3ba7144b725e69673be6b84b7f7aa880cbb2ac97971d1cded04fdc020809f1000489929c35280b SHA512 3c975e954e62a8603f6dd54235865e7ce88a46f96f705c871d4f387fe6d6045d8f53c276f07da57379cfaa1ecf3fb0f4d3edc8a15d1a26973614fb0ddfa77c8b
 EBUILD clementine-9999.ebuild 5153 BLAKE2B 1f43fd1abb60716a257dea4892036352fa419fa38ec606c9cfe7a12ebf10e31d817f44f8e7744eb043cf71e8a08057bccd58c5bc8416185d22dc4f8bd23cf8bc SHA512 ca24106145c5fe3a1ecf1a80fd6667ef02330a3da854b33e35cc0e303023e60bc177fc51cf89c9a050ddc99eb7c00a4bf017359b2824be6bdf94d08edd451cbe
 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
new file mode 100644
index 000000000000..e80f66f40cc1
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	GIT_ECLASS="git-r3"
+else
+	COMMIT=610566d25271c67d1625fd62041f6a27435b0a9d
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
+unset GIT_ECLASS
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_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
+	)
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	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 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	projectm? ( dev-qt/qtopengl:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN^}-${COMMIT}"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="cryptopp"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
index ab0842d2347d..bd68e7ed6e86 100644
--- a/media-sound/fmit/Manifest
+++ b/media-sound/fmit/Manifest
@@ -1,4 +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.ebuild 1702 BLAKE2B 2cb10fce66b66420b46a5a15b529bda99fcdc4e1ebbcc45ad2884fd9b80a15f97306abeb037ff8a64d94eed93b0748d081a6ab6045f77e01e09ef49489ac74fa SHA512 99c1ab579fe5b3bc63129eeaa333abacdd2c2e45513c6195fc2dee2594729a5134b481650e1609b4fa6ca97d41d354816017bc25c76e41c30a0fff7ffe122696
 MISC metadata.xml 251 BLAKE2B 41d57d683fe855b6ee6b161b1c9bcc193e33ed5c184df3738f693f0c078978a6d7bfde323243822cd5e0679122e6241158f0e6ecd237fe8f0e7e770c95d7fd19 SHA512 16072c41732d3c5486b4066a8f17cc829688c24772a002ea72c1deae3dcd78f4ee72bd7948782ca970fdb2e5cba66a16db205a384de036186814b2345f2f103c
diff --git a/media-sound/fmit/fmit-1.0.15.ebuild b/media-sound/fmit/fmit-1.0.15.ebuild
deleted file mode 100644
index 57d69ae6f6ac..000000000000
--- a/media-sound/fmit/fmit-1.0.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-MY_PN="v${PV}"
-
-DESCRIPTION="Free Music Instrument Tuner"
-HOMEPAGE="https://gillesdegottex.github.io/fmit"
-SRC_URI="https://github.com/gillesdegottex/fmit/archive/${MY_PN}.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
-	media-libs/freeglut
-	dev-qt/qtmultimedia:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsvg:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )"
-
-DEPEND="${RDEPEND}"
-
-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
-	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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/share/doc/"${PF}"/
-	doins README.txt
-	docompress -x /usr/share/doc/"${PF}"/
-}
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
index 8c52933db6c5..05d69553e123 100644
--- a/media-sound/helm/Manifest
+++ b/media-sound/helm/Manifest
@@ -1,4 +1,7 @@
 AUX helm-0.4.1-gcc6.patch 991 BLAKE2B 22826f5a2785bf9e275792dd151af41fa6e265a9e43e11a883473594eb9a64029a698d2f5e1e1717b6dc07a73eeb1521e182f4c09da548a054496ac021237b16 SHA512 71ff5a34942badc8b95e06e2cbe3f725a98a82cec6ed25df72e44ea3e3ebd17e8d48c8c48c19f5ee9b232dc987fb2f82d621eee30d8c68ee5dea40feb10f89b2
+AUX helm-0.9.0-nomancompress.patch 698 BLAKE2B 3b68312c117fb8c1e8496ae02145a66466849de77d51159064b65e51b208b503530ac5b92c1a50e4e8fdc6113121bd26ca20e491adde72f1f1b5b626258c92ec SHA512 e2b0143be141e26a093369c151a87d002508442543482d81e4b67f67475232ec53bc80e11ecad096952e4941efc82889b8cf267a0bfebb13104204b02a50aaed
 DIST helm-0.4.1.tar.gz 10170154 BLAKE2B 8939a365c5cec2f1ced1d03855cc76ab532e168866b566e8adc575be8d16b9825bf1259c912c9e74f5465d68e7984a525c430cf57eb1439814d15fb38d3cf02e SHA512 093abfd47a7f3e25d168df675b8a9c067a361ae1891af208c75ec4bc02d8a30cc5de4ab2433179bcbb6074c142c8ef9b4ef11b1854fdde0551fcd340dd6b8fe0
+DIST helm-0.9.0.tar.gz 15544141 BLAKE2B 1b6811f32cf36a1c1f954cc071cd64f3dca656ee0bd420c01d0be3db516210a92adc3694ac49731cf2d7cf057a9eccf2c2dcefc14d24cf8582a3eb69efe1d0e1 SHA512 241c6bf3aec422e9ccaf7c7113eec7e30a11baadd30fe8f05f0abfac9c41d0c8a9fb284f0cae49bcaf0d3d08aa952737f6ff3eb7d48c2b2e22c60932738aeaa4
 EBUILD helm-0.4.1-r2.ebuild 932 BLAKE2B 8eca715d05913079a31344b9876487918301baa94feff5dc738ce3a874b512572700a7a0406aec5ba155cdfc96b5ad7cce8f03f5daac6c1ae00e670291707726 SHA512 6aafbb5a2f72703f282bf5e34b99b2b4fd713be7f7ac86358a8de2eeafc1bbfc34b5b8baeb1d3c69c1404c240fe2a45f2dbd93e33b68bbad6572913a4c8a916e
+EBUILD helm-0.9.0.ebuild 1042 BLAKE2B a9445bba5f248a64e666a36f28cbce575733546aa879768c4c38d0e2b913f813f75bb09c0400647a09508488a153bde64c47917d21c2098c342ddaac693892df SHA512 eacde54921ac3998f582dc901598d935b5a8cfa34c99c1e225c81b73b3670e90503c41d8a713f98ce0f0c9b3e0bffd3f35b89f2e35a2750db64f4725ee3a5e3d
 MISC metadata.xml 345 BLAKE2B d09e73c628cf4bd16d554753a7dd3b46be36821bed7e601ab0b2e73ef49a5c102b9330379ec24409c6b724f05271b5319a7fe334b800dd8f8e8baa8aa2b58c03 SHA512 108d91618be46a32b2c316336b1a109494a19882ca250d92a0c189093ebae632729bc67cb023370ae0fc7ff5f32d5d6bd32a2d64a985f1c66c7eeed1eec12176
diff --git a/media-sound/helm/files/helm-0.9.0-nomancompress.patch b/media-sound/helm/files/helm-0.9.0-nomancompress.patch
new file mode 100644
index 000000000000..fab394688736
--- /dev/null
+++ b/media-sound/helm/files/helm-0.9.0-nomancompress.patch
@@ -0,0 +1,24 @@
+--- a/Makefile  2018-11-13 23:44:54.081925553 +0000
++++ b/Makefile    2018-11-13 23:45:34.136381471 +0000
+@@ -91,7 +91,6 @@
+ 	$(MAKE) clean -C builds/linux/VST CONFIG=$(CONFIG)
+ 
+ install_patches:
+-	rm -rf $(PATCHES)
+ 	install -d $(PATCHES)
+ 	cp -rf patches/* $(PATCHES)
+
+@@ -100,11 +99,8 @@
+	install standalone/builds/linux/build/$(PROGRAM) $(BIN)
+	install -m644 standalone/helm.desktop $(DESKTOP)/helm.desktop
+	install -m644 images/* $(IMAGES)
+-	cp changelog changes
+-	gzip -n -9 changelog
+-	mv changes changelog
+-	mv changelog.gz $(CHANGES)/changelog.gz
+-	cp docs/helm.1.gz $(MAN)
++	gunzip docs/helm.1.gz
++	cp docs/helm.1 $(MAN)
+ 
+ install_lv2: lv2 install_patches
+	install -d $(PATCHES) $(LV2)
diff --git a/media-sound/helm/helm-0.9.0.ebuild b/media-sound/helm/helm-0.9.0.ebuild
new file mode 100644
index 000000000000..5ca560251ae0
--- /dev/null
+++ b/media-sound/helm/helm-0.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Open source polyphonic software synthesizer with lots of modulation"
+HOMEPAGE="https://tytel.org/helm/"
+SRC_URI="https://github.com/mtytel/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/freetype
+	media-libs/lv2
+	virtual/jack
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+RDEPEND="${DEPEND}
+	!app-admin/helm
+"
+
+DOCS=( changelog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-nomancompress.patch" )
+
+src_prepare() {
+	default
+	sed -e "s|/usr/lib/|/usr/$(get_libdir)/|" -i Makefile || die
+}
+
+src_compile() {
+	emake PREFIX=/usr all
+}
+
+src_install() {
+	default
+	make_desktop_entry /usr/bin/helm Helm /usr/share/helm/icons/helm_icon_32_1x.png
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 8383365e8ae4..571420ecfaea 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,7 +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.0.0.tar.bz2 1318939 BLAKE2B 75454863e0c56518f2a423ee11567758e1605c450389e6c723d76913319d6bd7ad25c4853d9f1982551c256848fd671f257004f1fc77fb6928b252007830c0f3 SHA512 f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441
 DIST linuxsampler-2.1.0.tar.bz2 1154834 BLAKE2B 1be8a14bb6c13d90f4068cc2e25211dccc8253a114234ba560136d9da9a806d101db49116698fe53353a649c77513d244700d7bb65be04d0eb4d10ef057898d6 SHA512 503db074437b07e3e8dc8d1cb0aa3a510a62d183148157c1a4757681a4319e531bd6a1486a83c0ab9721dde82e27306150f3be87476c9298b2335438670e19a7
-EBUILD linuxsampler-2.0.0-r2.ebuild 1239 BLAKE2B 36ad9b046dffaa8822d2754fb6b86416f035fdb11f942bd2e7ff9bf314759ffcd572fd1dd01e2e017d1f3508ffd8260cfbb36b189befc5a6e3d52d3e695bc23c SHA512 a2b299f2a9484fc156bdb07d1e5144504a2464c987ad093d33aeb27664367844c006a734b5c3c1041a48a99249a09710cbcb5c82ab8f40976b175c7e21611f9c
 EBUILD linuxsampler-2.1.0.ebuild 1680 BLAKE2B 68947407aee89f1c052dbe90bc1e44508c2a23b8427d5b6fc609c18716d8d71a3c2a439d74a76b50545e3c19e9be633503b57ba8f181d9b073fc29de43212691 SHA512 707d00fe926eb04d2e4ab5781093c065ff5ba70fa3bec2e83ed32591bba3b5c8cc803fb828bca35a99eb2584d2fde962891c5bd453a53b03d0d5eac1a4798c09
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
deleted file mode 100644
index 5caedabd5610..000000000000
--- a/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc jack lv2 sqlite static-libs"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
-	>=media-libs/libgig-4.0.0
-	media-libs/alsa-lib
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	lv2? ( media-libs/lv2 )"
-PATCHES=(
-	"${FILESDIR}/${P}-nptl-hardened.patch"
-	"${FILESDIR}/${P}-lv2-automagic.patch"
-)
-
-src_prepare() {
-	default
-	# Force regeneration of the file to let it build with all bison
-	# versions, bug #556204
-	rm src/network/lscpparser.cpp || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-alsa-driver \
-		--disable-arts-driver \
-		$(use_enable jack jack-driver) \
-		$(use_enable lv2) \
-		$(use_enable sqlite instruments-db) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-	use doc && dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index f8be0bc66fb7..aa197fd23ea7 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,5 @@
 DIST paprefs-0.9.11_pre20180621.tar.xz 221100 BLAKE2B d8f79865a0ce6d4491ea252fdef65e700d1ad4cfc253d8b0415a6cd454fe60685a3d647c8720cb50f85033a7bb0d411c404b4d50c43b320bd728390a8056c1de SHA512 650e365b77d9d9beee4dc62b7ba5d367b55a9f0e95f39ca1e75d210dab05820b4d3485a34366e6e341fafe55b5c6ee458088666937e0220c3d91bd68aa327c53
+DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
 EBUILD paprefs-0.9.11_pre20180621.ebuild 1070 BLAKE2B 834097d5a7696c4ec3a079b2e59290fd7c519c8c154b8a9c1cf40f3713187d9186f428d50d813075f54aa0e2f2e5ecfa37361a24169b4e70b9dc93be89adc88a SHA512 2aecf44049793efa91cc7497c5c539cb26476c1c2e68523e1571478250db6f7f0ab9e41febac757a5767285704d350ce8d9c66b09b6810749086ea5ed41a0178
+EBUILD paprefs-1.1.ebuild 947 BLAKE2B 4fb3dbbd7224f2737d91b118c725c5cf886fc1da58f13670f89eb36831e5889f330d7bfd7a73f06af3c1840645cfd90e3692f8aa080da6b857031f53b2010600 SHA512 98bec4f983f3b21607f2d507686faf169e13a5e78e83e77a42a6a7f2684b32f8968eda2c9b8ed932bb6baff2bed5b7b0da169ee3916aba52d13b9677bf8c232a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/paprefs/paprefs-1.1.ebuild b/media-sound/paprefs/paprefs-1.1.ebuild
new file mode 100644
index 000000000000..5918d87e6375
--- /dev/null
+++ b/media-sound/paprefs/paprefs-1.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 flag-o-matic meson xdg-utils
+
+DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+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
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cxxflags -std=c++11 #568590
+	local mymesonargs=(
+		-Dlynx=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 9c8e88afe758..e347ba8802a0 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,4 @@
-AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
-AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
-DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
-EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
 EBUILD picard-2.0.4.ebuild 1754 BLAKE2B bdccd3bc45d0f800379a38872bbd5667b20f0a32605816e3879efea7619891cb99f72f773c72d9ff1da08bfd9a9209a4fef3a95d2eaa5c7538be57fa26c7f2e1 SHA512 194a79fd4f7f467802e14f2919b647ef98bc34b5b9445a68359db86d9a8db264516411c75ddbe4389a8ea528410da588886c32b750a59016d7db0612cb17afde
 EBUILD picard-9999.ebuild 1696 BLAKE2B 0923250ae18bc8d129649750325e0d8cbe0a9de61caa574f3f73a6023d5b915de3d4615447961ae5c9be24162ed4f6e2cdf69d263b3f80347f92337d0380faa7 SHA512 f85dfa4b86c95e3dcc3cecc4ab04efc14d0cda35e402850b3f2bae56fd278ac9bc9cbb9091367a6c6b1393b16ce055f0618f2e44aa16daa83d2e589ff5ac05e7
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/files/picard-2.0.3-crashfix.patch b/media-sound/picard/files/picard-2.0.3-crashfix.patch
deleted file mode 100644
index 33c331778219..000000000000
--- a/media-sound/picard/files/picard-2.0.3-crashfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 24722cc47cc9e968eb05becf6056517b23e81e34 Mon Sep 17 00:00:00 2001
-From: Sambhav Kothari <sambhavs.email@gmail.com>
-Date: Sun, 12 Aug 2018 18:06:58 +0100
-Subject: [PATCH] PICARD-1310: Fix crash on clearing the log, due to wrong var.
- name
-
----
- picard/log.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/picard/log.py b/picard/log.py
-index 5974a8a8c..a388af554 100644
---- a/picard/log.py
-+++ b/picard/log.py
-@@ -90,7 +90,7 @@ def contents(self, prev=-1):
-         return contents
- 
-     def clear(self):
--        with self.log_queue_lock:
-+        with self._queue_lock:
-             self._log_queue.clear()
- 
- 
diff --git a/media-sound/picard/files/picard-2.0.3-iteration-error.patch b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
deleted file mode 100644
index 36e0b8092c54..000000000000
--- a/media-sound/picard/files/picard-2.0.3-iteration-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c5f8237bba87dcf113e41cd53a723ce1dad2c3dd Mon Sep 17 00:00:00 2001
-From: Laurent Monin <github@norz.org>
-Date: Mon, 20 Aug 2018 14:08:11 +0200
-Subject: [PATCH] PICARD-1318: Fix dictionary changed size during iteration
- error
-
-It happens when looking up a track with script $set(newartists, %artists%)
----
- picard/metadata.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/picard/metadata.py b/picard/metadata.py
-index 8e2aa5266..4f9269b0c 100644
---- a/picard/metadata.py
-+++ b/picard/metadata.py
-@@ -333,7 +333,7 @@ def rawitems(self):
-     def apply_func(self, func):
-         for key, values in self.rawitems():
-             if key not in PRESERVED_TAGS:
--                self[key] = [func(value) for value in values]
-+                super().__setitem__(key, [func(value) for value in values])
- 
-     def strip_whitespace(self):
-         """Strip leading/trailing whitespace.
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
deleted file mode 100644
index c81de29bc6b7..000000000000
--- a/media-sound/picard/picard-2.0.3.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=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="A cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-iteration-error.patch"
-)
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 10489e991864..a747a37a71b7 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -3,5 +3,5 @@ DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
-EBUILD quodlibet-4.1.0.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
+EBUILD quodlibet-4.1.0.ebuild 1556 BLAKE2B 10f9328beea91a03bfd464c86816b56937e7a1aff12b1179e07c044586d91a4a0583c0f3ba5f7133d93213bfaa284aba4776dd5826a8e9ed1809f6b659d73c3f SHA512 b2f33bd35016f011674db3f6e7f101140644dc6b8a64df1866867bc84c0bea833d53750255d3cb6f27970e490bca8aed5df7feec75ae0b5e3d892c6f2cd51222
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.1.0.ebuild b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
index a6d06fe5a038..3ba60258fb4b 100644
--- a/media-sound/quodlibet/quodlibet-4.1.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.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
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://quodlibet.readthedocs.org"
+HOMEPAGE="https://quodlibet.readthedocs.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -54,16 +54,12 @@ src_install() {
 	dodoc NEWS README
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	xdg-utils_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	xdg-utils_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 925446f59db8..c075832b88b1 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb 105145290 BLAKE2B 1ffb55ac3684d021b181e27d1183c5f0c1bd22ad8e6decbd64b0172a7925e824b6f74d40edbb1ae4401bf954860f47d9d1ffad6d879e85e02406869709d817cd SHA512 8ecff0657849058863deb8fce9304d4c9aa5a511f8043a0ba52d138a29979d3217da7568ab2058271f3e448206406fc0e1651ba7d438f677b1a2036ecb5937e2
+DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.96.ebuild 3430 BLAKE2B 2078bd77d0f4e59f7a09181cab4fac996c34fbfd47fa0194eed1a691951fc425043e4a6a97a4cfb50f4b52cb5e14bf32dbf75fccad31aa166a7ebffd817f50f6 SHA512 2e8d7f6033d2bb79bd9d6bf244f737ac48b268640f6252b3db10f0f152e6cc4e3ea6b85296df1cde00a40e5357627b6825dae0a11364fd935ff8d4ac23729d27
+EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.98.ebuild b/media-sound/spotify/spotify-1.0.98.ebuild
new file mode 100644
index 000000000000..7c8f16fb450a
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.98.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="78.gb45d2a6b-10"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 058a7b6848b7..f3b0886208dd 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,4 +1,5 @@
+AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1771 BLAKE2B 274be96fe2d1072d028245ab133e1f11630d56ee89fa9e4910d708f0ee386f5028a197f0fd88f42c0dc324885a41e49a60a82d16f6750db1faab630b7cc5d13c SHA512 2454cfc8e03f74fce0c752780118b5093bc7f5e160914b26c37814d6bca7b2060d472612f352c4198835270cfb7fa9f486e94a255348110ef9ea57b2bb235be4
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
new file mode 100644
index 000000000000..7ddf116eeccc
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
@@ -0,0 +1,37 @@
+From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 25 Jan 2019 21:13:05 +0100
+Subject: [PATCH] Fix build with <cmake-3.10
+
+---
+ CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b44d2ee43..9422a808e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,14 +2,18 @@ PROJECT( tomahawk )
+ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
+ CMAKE_POLICY(SET CMP0017 NEW)
+ CMAKE_POLICY(SET CMP0022 NEW)
+-CMAKE_POLICY(SET CMP0075 NEW)
++IF(POLICY CMP0075)
++    CMAKE_POLICY(SET CMP0075 NEW)
++ENDIF()
+ 
+ # TODO:
+ # Update to NEW and fix things up
+ CMAKE_POLICY(SET CMP0023 NEW)
+ 
+ # Let AUTOMOC and AUTOUIC process generated files
+-CMAKE_POLICY(SET CMP0071 NEW)
++IF(POLICY CMP0071)
++    CMAKE_POLICY(SET CMP0071 NEW)
++ENDIF()
+ 
+ # TODO:
+ # Disable automatic qtmain linking
+-- 
+2.20.1
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index b9e80fa1ed9e..82c9537fd054 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.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
@@ -53,7 +53,10 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-warning.patch"
+	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index d090c0743ddb..ed7b9e9cc00f 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index a32eddcb0225..34d395fde992 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,4 +1,4 @@
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
-EBUILD dtv-scan-tables-0_p20171003.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c
+EBUILD dtv-scan-tables-0_p20171003.ebuild 738 BLAKE2B da772ab621d86dc075ad742c6e040eacdad6354161da5593f448acfb11e1219521aa0c6405ad75b4264471fedcc304adb5e8f0a63b40f6ea7249102c919e928b SHA512 e64ced2c038d37ad4bafb70ff2af9013e1d4bd99337f735bae1e8ec9a5f9dd72d4a720e8904d311d40d420b991dba2e5f1d1d143c4d3c2520ba510364e624e6b
 EBUILD dtv-scan-tables-9999.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
index c4ec5b113aae..0f58675fb9c2 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.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 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="c1986d5148d8"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index fc0687750210..851079e43ec5 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -13,6 +13,7 @@ DIST kodi-17.3-generated-addons.tar.xz 57548 BLAKE2B 794c20a2e494d02ee21260080ea
 DIST kodi-17.3.tar.gz 58466114 BLAKE2B 5f72f264c139a618802a735f93ecf78ad56bc2b021a8b2e060c32f777fee7ef405544a46cde61951fbfbf886b7f6c93b8b0df53731ec044f23b871f1777cb561 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987
 DIST kodi-17.6-generated-addons.tar.xz 57564 BLAKE2B 9b3000ac23a6aab24b703a2b66016dbf0637ff3d615b89435cba3717acb913a4543bb57aaa9ae59a9493891ba62af06414ef2c0cea3a81e9ec32ea60e209330d SHA512 ee1344e859b2871f9dd3e2f2f75f9c0f9f787ac111a6b9ab8f80af6524a786d51baeb4f247a8c5b35001073be49bf4289d1c63e3114625143f3747aa9b1f4be2
 DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c3a7f4a32e26c802bae9795979554204148e06d1923d8e68ba1f06f9d92bf11416f73cf9431381642ca00639 SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
+DIST kodi-18.0.tar.gz 50987386 BLAKE2B e3f3d975ccbfba68d2bce534bc41b92c59cb2d5591a81e56993dc9a27cf845adf44ea9158600c0564f1dd2b4828bcf8e24a0f93816e5de85394fb7105d97be5d SHA512 d5a91ef10d4e5671a559b48e866ee534cf4d6ec270ed25b5d54ad66cbdaf29bd04acf533d90bd86e80c232be5f3d52bd8d1b697d60100371cff9329e514b9d92
 DIST kodi-18.0rc2.tar.gz 50969888 BLAKE2B 982d660c6f87706fa5d50c5ece84ea3d27adcd3ad561a77082cb2c1abfdd378b233aeaa8102682f0c89bb6f3c28481fa03b6070d4e9c3ba9b37b66096211071e SHA512 2f5bba021221cdc45242abc90a993dd033c2d7839f1031159869ac7a777a0675324ec2858868ff5060b16a8d5f367a6135a20ac570a099e907032678c91eac0c
 DIST kodi-18.0rc3.tar.gz 50978485 BLAKE2B 791053553f475dbcacc2bc7c3a1e420849de3f48d3eb3d788f958b2b2c3fb47454cfd909f36cefee37050923c39173690b5d48d517a042254d796aeafb39fcb8 SHA512 622e3fff01e8d856bb524339796410d3fc3226539ae91c69a367464e8f5aeb28ca3ffd605dc4a4f9944e4cc59a1949d7da6fec70175d978a44f3b5bbb59190c3
 DIST kodi-18.0rc4.tar.gz 50985659 BLAKE2B 5b2475d98e084e007aebf0a5e142d03ddd08b11c9067ddf0c978892ce15a4b8f22009156bfe4e26df1ebab55bf724182c4573207440e1e9f50dd5f6b739f8a3e SHA512 cec2af70e6babed79ed649846342cbcfe979ad90a4ef4dde250e114477991c48dcfffac56a6234dc16913c9896a9a31337ebbb19488f0abf68e6c1f410d12607
@@ -29,6 +30,7 @@ EBUILD kodi-17.6-r7.ebuild 8768 BLAKE2B aed28022afb2c90e9826d5d633eac7435d646657
 EBUILD kodi-17.6-r8.ebuild 8772 BLAKE2B d41f9854da871e126a08525963b5a293f64cc17c8b405af884240f83c81d17de501da9980c97ed7ab56e930cf731f4cdaab4b4cae837f3cef3925640aa786651 SHA512 0e52b44fb4fe197357309414a01bf5408c053e3116c6325624a65eb923a48b6f4b51cec27de8d4537b37acaa9a3327ea50935ca904a6cbdbcea3887bcc4b8741
 EBUILD kodi-17.6-r9.ebuild 8989 BLAKE2B 5e94d368233d04132dc112615da4d28bafc8aba10f9219cbb77e060ba35ad79a0fb9be2286744e73ff12e02a3aae7a10ff1d82f18330bbcdcc1e91782b751c16 SHA512 940f9ce9e9a67cbc236de34ef1ffab2d04a5730eaa883e5ca2fcef88416311a39e3aa9f3f2ef2af5be0b11b7a956aa8df5bdc1b145ff371d911e75a0fbdb868f
 EBUILD kodi-17.6.ebuild 8670 BLAKE2B e8ea1e0dc347c5e891ccad4b05ea5f21c19284e0d5c4b8dc01041e9f582b513e5d6d469e34890b497fc2fa57e1ee5a295209727894c3126a4341dd6095da4cff SHA512 c17607cfc393474ba61bddb29ff9eafeabc1dde7ef4ecead7cca1044695f03c64a5c18a9fc4da0b19fb854e20de49f05290add100f5e4258349fe2809283b44a
+EBUILD kodi-18.0.ebuild 9398 BLAKE2B de021d468f8cd086e3b36b35a4cc7d13759fd520562408c64a2f241ef179221b470ed23ce49d666fd3e608fb673143e636cbe94b401b4f9a6893e11ffa19fa11 SHA512 63888cfe324ea00be70d901ca734704da4b6996f0838695510040ffbce1c2109b5a48c05cf3a5efd971c7ff3ca02aed9b9d006dd175eb48b9248e169ad7abff8
 EBUILD kodi-18.0_rc2.ebuild 9366 BLAKE2B d11bbfae54b8b67923d6574255bdb67efcd2caa2c54617e5fea31b71fbb7fed17e102868e024323a17415c9906de9bdc373fb8a267d9153d31ebf8f034a85e99 SHA512 7db29341f1eb28928c6ce004dc5e7745ae77e8d072ea1caecb209f73a557d2d89b1a6633cd22a9da8f850123665e2fd289bead4f28b541a5596360f16210786d
 EBUILD kodi-18.0_rc3.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 EBUILD kodi-18.0_rc4.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
diff --git a/media-tv/kodi/kodi-18.0.ebuild b/media-tv/kodi/kodi-18.0.ebuild
new file mode 100644
index 000000000000..b840a567c2ec
--- /dev/null
+++ b/media-tv/kodi/kodi-18.0.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.3"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="RC5"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	dev-libs/libfmt
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 3bdecd881262..ee84f3f64e8a 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -5,5 +5,5 @@ AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a
 DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 BLAKE2B d67eb79f89243e73528ce1e79935031f9afb7270c4c22a8670f3c48b75d7ddbe0efe1188b77851b875f78a35419186b7015b82e335063751eecd1f9eacc72947 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
 EBUILD linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild 2032 BLAKE2B 2c48c887e58d67763ab08ffa86261a111ad8f0152d34e78a2b130a85769334a1b7bbb77087489718dc82d4741c2599855c949048af6a4b4da3154b6609775c54 SHA512 9e65d54aa3cc1443a524f79d35b77037618255d47b25c97d9a8d7c807b35299d44e85d041be4b3f0f76a293195d3be0b6846762f85e5dda3e6e774d95f2047d1
-EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2158 BLAKE2B d094053dcc5acd95d02c505ea438c6cac3dd9c7a2f09ca329f2bed3fb4ac18bfbf049ab9938517c9413f7d9535fa98bcedcbc0ec9144f5796bc3cf53d04a78cb SHA512 9561df626b139039b857236953135aa777c584fb35015ea5861dd0f5648b9e3d86dbbdbb28da671bf71b206089a063182883490134895640eb105027ba3d4857
+EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2154 BLAKE2B 52914cf9201640a8c98725166aba0e9ede94ea9dfb3d2e0977119b891a5407f4cc27957375d335e2c796f6d74c15a5c394d67f76aaf7bc0884ac588103e4c202 SHA512 f20f8c7b1935b38c1eb51075e0108c0b6e893a452ad62b067c0132776781ca31084cd2f4fc40222b9d9649bf1c2fee123c6a1c3ef9787d35c901fb77d9660c72
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
index 340a1a946070..92d4daaf8157 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.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.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 IUSE="alevt usb"
 
 RDEPEND="
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 21701bc7c128..c0e8996a5513 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -7,7 +7,5 @@ AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d9367338471
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-29.1-r1.tar.gz 105657217 BLAKE2B 9d42464b0c75c2d3a359b528e3f7917cfb281f48451167afc6517caa9702da44fce2d48566fd902ec08af35117232113b4d499e2c9a3cf2ad2634d91cf532ca7 SHA512 0eadc37661d9fa93a63c0f425cd43d43533889b0afcea1478b2645e083ba6c96eebf2eec088db1ed6f0a0727c03b7c90c0c18b83c194d630dda3bac45bca5d87
-DIST mythtv-29.1.tar.gz 105656634 BLAKE2B 8b9dfc6b1e1178bfd1b35e8d499afe570edeb1f07cefa64fc91c2ed74f8155f5ca00cee49a024848f715c0bb782fc22f3c4d04fd8eac8562d108e105d3a41421 SHA512 c80d84c40c019d093d44487fb4cd07d9ce3174781ff8f24a4709fd10294cb8f6186b3e480dad3a09f7a496835fa0cffcc9eca114f807794b693ffcd57acd4e39
 EBUILD mythtv-29.1-r1.ebuild 10295 BLAKE2B 41264e442df41fc6099269218fbf9d920a00a3eaa6a1d584c26936f0f80f2495755fa59519c73d908ba713ca2908b419fa140272f865047bb699f8996a4677ef SHA512 6c0cfbff21c3b8e879150031d04c5bf61c6703058463bd74de398bf914fe0dbeb2c76109bf86f397a4195255e06439140a92be459acddbcc688523f798d5f9a3
-EBUILD mythtv-29.1.ebuild 10160 BLAKE2B 2513a85606e1d54fc34393fa284fa036dd262da0b99883c7fc7eace9417d8f7c55518d94b2654c291d511167b40d2f878ace7968aa9d82b5d896037bfca46bb8 SHA512 cd453ed8c541690f8ef0770cb108d944b96517a7b1ba8473b16cb0c90c8a8014b3b34b914f92895fb4e63cbbb0fd8516d3c39cba16021531398177ecd16f488f
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/mythtv-29.1.ebuild b/media-tv/mythtv/mythtv-29.1.ebuild
deleted file mode 100644
index ac2b67ef92b0..000000000000
--- a/media-tv/mythtv/mythtv-29.1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
-BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
-MY_P=${P%_p*}
-MY_PV=${PV%_p*}
-
-inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd vcs-snapshot
-
-MYTHTV_BRANCH="fixes/29"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="https://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0/${PV}"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
-	ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora \
-	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluray? ( xml )
-	theora? ( vorbis )
-"
-
-COMMON="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtopengl:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	media-libs/freetype:2
-	media-libs/taglib
-	>=media-sound/lame-3.93.1
-	sys-libs/zlib
-	virtual/mysql
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXv
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-misc/wmctrl
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=
-		sys-fs/udisks:2
-	)
-	cec? ( dev-libs/libcec )
-	dvb? (
-		virtual/linuxtv-dvb-headers
-	)
-	dvd? (
-		dev-libs/libcdio:=
-		sys-fs/udisks:2
-	)
-	egl? ( media-libs/mesa[egl] )
-	fftw? ( sci-libs/fftw:3.0= )
-	hls? (
-		<media-libs/libvpx-1.7.0:=
-		>=media-libs/x264-0.0.20111220:=
-	)
-	ieee1394? (
-		>=media-libs/libiec61883-1.0.0
-		>=sys-libs/libavc1394-0.5.3
-		>=sys-libs/libraw1394-1.2.0
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	libass? ( >=media-libs/libass-0.9.11:= )
-	lirc? ( app-misc/lirc )
-	perl? (
-		>=dev-perl/libwww-perl-5
-		dev-perl/DBD-mysql
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		dev-perl/LWP-Protocol-https
-		dev-perl/Net-UPnP
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/lxml
-		dev-python/mysql-python
-		dev-python/urlgrabber
-		dev-python/future
-		dev-python/requests-cache
-	)
-	systemd? ( sys-apps/systemd:= )
-	theora? ( media-libs/libtheora media-libs/libogg )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
-	xml? ( >=dev-libs/libxml2-2.6.0 )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-	zeroconf? (
-		dev-libs/openssl:0=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-RDEPEND="${COMMON}
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	x11-apps/xinit
-	autostart? (
-		net-dialup/mingetty
-		x11-apps/xset
-		x11-wm/evilwm
-	)
-	dvd? ( media-libs/libdvdcss )
-	xmltv? ( >=media-tv/xmltv-0.5.43 )
-"
-DEPEND="${COMMON}
-	dev-lang/yasm
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${PF}/mythtv"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To have this machine operate as recording host for MythTV,
-mythbackend must be running. Run the following:
-rc-update add mythbackend default
-
-Your recordings folder must be owned 'mythtv'. e.g.
-chown -R mythtv /var/lib/mythtv
-
-Want mythfrontend to start automatically?
-Set USE=autostart. Details can be found at:
-https://dev.gentoo.org/~cardoe/mythtv/autostart.html
-
-Note that the systemd unit now restarts by default and logs
-to journald via the console at the notice verbosity.
-"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	default
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile
-
-	# Fix up the version info since we are using the fixes/${PV} branch
-	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
-	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
-	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
-
-	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-}
-
-src_configure() {
-	local myconf=
-
-	# Setup paths
-	myconf="${myconf} --prefix=${EPREFIX}/usr"
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
-	# Audio
-	myconf="${myconf} $(use_enable alsa audio-alsa)"
-	myconf="${myconf} $(use_enable jack audio-jack)"
-	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
-	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable ieee1394 firewire)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable xvid libxvid)"
-	myconf="${myconf} --dvb-path=/usr/include"
-	myconf="${myconf} --enable-xrandr"
-	myconf="${myconf} --enable-xv"
-	myconf="${myconf} --enable-x11"
-	myconf="${myconf} --enable-nonfree"
-	use cec || myconf="${myconf} --disable-libcec"
-	use zeroconf || myconf="${myconf} --disable-libdns-sd"
-	myconf="${myconf} $(use_enable theora libtheora)"
-	myconf="${myconf} $(use_enable vorbis libvorbis)"
-
-	if use hls; then
-		myconf="${myconf} --enable-libx264"
-		myconf="${myconf} --enable-libvpx"
-	fi
-
-	myconf="${myconf} $(use_enable libass)"
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --without-bindings=python"
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --without-bindings=perl"
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	use python && myconf="${myconf} --python=${EPYTHON}"
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
-	fi
-
-	# Video
-	myconf="${myconf} $(use_enable vdpau)"
-	myconf="${myconf} $(use_enable vaapi)"
-	myconf="${myconf} $(use_enable crystalhd)"
-
-	# Input
-	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
-	# Clean up DSO load times and other compiler bits
-	myconf="${myconf} --enable-symbol-visibility"
-	myconf="${myconf} --enable-pic"
-
-	# CPU settings
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host"
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
-		myconf="${myconf} --cross-prefix=${CHOST}-"
-	fi
-
-	# Build boosters
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	myconf="${myconf} $(use_enable systemd systemd_notify)"
-	myconf="${myconf} $(use_enable systemd systemd_journal)"
-	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
-
-	chmod +x ./external/FFmpeg/version.sh
-
-	einfo "Running ./configure ${myconf}"
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--qmake=$(qt5_get_bindir)/qmake \
-		${myconf} || die "configure died"
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	dodoc AUTHORS UPGRADING README
-	readme.gentoo_create_doc
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
-	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${ED}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${ED}"/var/log/mythtv
-	dodir /var/log/mythtv/old
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	# Ensure we don't install scripts needing the perl bindings (bug #516968)
-	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
-	# Ensure we don't install scripts needing the python bindings (bug #516968)
-	use python || find contrib/ -name '*.py' -exec rm -f {} \;
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	if use wrapper; then
-		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
-		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-	fi
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}"
-		fi
-	done
-
-	# Ensure that Python scripts are executed by Python 2
-	python_fix_shebang "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}"
-	done
-
-	# Remove empty dir
-	rmdir "${ED}"/var/log/mythtv/old
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_info() {
-	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
-		"${EROOT}"/usr/bin/mythfrontend --version
-	fi
-}
-
-pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 2a7ca121a190..5ae9c4e70495 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -1,3 +1,5 @@
 DIST w_scan-20141122.tar.bz2 239277 BLAKE2B eb3afd5977d39ff7c8b4b0c5d85fd57b74cae47f330dd1769a33d3caec2688cd40f8d08c179867042a401db61dfc32494fe2eaed04c790bdb32424cc65ffa3b5 SHA512 64d8d92dd84a5c3cfae4531fbba683602e70597f83ec28c314ccce8810fed70685f03d3e4861d586c52764573e17e0b15881bbdb2f6c60db9d3686d554f1ee6d
+DIST w_scan-20170107.tar.bz2 245517 BLAKE2B 049d555f47935118be26f0bb8a8fc6baa43c273692ff6bc4c95ae912f00f1bda0e5834919c018539b1f891e436ec6556b29ad8c68d69de4a93911e5c7fb265b6 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
 EBUILD w_scan-20141122.ebuild 677 BLAKE2B 934e0f5e2affa3e77029c1c7b4fe0969e246ddbcde745f78103f2f0fd9c3334fc6a7cbf0be4ce81e03c06d98881be60602ab3cf3f6616ae585ab3b823a1e76d0 SHA512 85f5c1fd201ddee888461a6faf9439fffdd571018ee65bd00612d4f42e5a045e68112c29d9db9bf4f89cced66ed36c0f102b43eb199b910ab59a8073ff3fca7e
+EBUILD w_scan-20170107.ebuild 617 BLAKE2B 35ae1922d32bf2e6321184f1a213867de95e24cf46f38da10d57dc79b9f932def79be6563609b2da533fc0ca88345e127226c43535b7545ead41e439128ce853 SHA512 c2c626e00d57d2d2932c3034e63d67604bdf102255645d5136ad34ef5a4f9cba6ba3f726d6f6f04d3f7edbcdaa203534bab6d8039112e9d4df3590736d10d3f2
 MISC metadata.xml 220 BLAKE2B 88c59522303fd4b369825402563ba83d2c844948fb7bcaadd3bfd7b336253975b4e60e7c4fdd2c4b9f7f07912bbf6ac6ecc6d4f62bb67391851252aed4869822 SHA512 2939a4c533ffc96ee1ac98cf1d6e8c7a11814ad7db85a5abedeea86424f37385ced1339080dfd71aa5447acbc0b78244b41dbdc0f794b23104ae56a1502d34bb
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
new file mode 100644
index 000000000000..0b7e605bf66c
--- /dev/null
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels"
+HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html"
+SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc doc/README.file_formats doc/README_VLC_DVB
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/rotor.conf
+	fi
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4f49f8b5b451..5a5a3778592e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
index 66e7db440090..816cee2d2cb1 100644
--- a/media-video/dcpomatic/Manifest
+++ b/media-video/dcpomatic/Manifest
@@ -1,15 +1,8 @@
-AUX dcpomatic-2.10.2-imagemagick-7.patch 501 BLAKE2B 5a9ed8540f66d3e79cc61bd992f75de4f3dd767c05f3723619c801b0c1f27c1bce48e9c6c6e3c768c153e0bbe46aebe313f24f037d5f1cdd282ce06805a6d403 SHA512 77631bd3123f917a9227a56877492dd9b789aed3de428d3a37df927a43f8a9abd55c4151c36a761e17ab2214ddb9ca949b7f833e57fb488279a0ef0b5789a5a2
 AUX dcpomatic-2.10.2-respect-cxxflags.patch 485 BLAKE2B cc638635801f8a27c6c7e5589d18d4befca9d72d2deff405b3115f850fdf0c02a1f3e348cdc9dbb52f7d588c267857e30544442b2d4b49b5a779886cce881505 SHA512 2766294bb2168af647086e1a905f1114fd41e8be84f1577ef3ca3e3e831def8347e1d7ec22c0e432c5e3697e76f63d55480b72422921f6a4d39d205061274625
 AUX dcpomatic-2.8.0-desktop.patch 1081 BLAKE2B 71e55abdccc9f6b071c1cd01c4dad8275e22fb8d1eb9b660a17d15eb6f68baf6cd5032f190795789efe4176ba6164b1419683ddeb507b41afd345c5c39a30589 SHA512 f7fcd1e038dda2b056a03462d601180e6105a89dee0ff6c143958678622a14fb307e375a6a645c12acbe8041a106234af3dc462bbcbdd74a35ce44159ba0b651
 AUX dcpomatic-2.8.0-no-ldconfig.patch 241 BLAKE2B b6f2c202efbac7f746b9be8b31896fd4766e338557b92b90b1b197e31f5712498aed322fd5c79d3f9e57f12faeb634a5139db74d281a0f90beed1bd8eb3b220c SHA512 6fac6ec3cacbf40a1f86bd9a5d58a847a1b7bac63acd52a10c1c0cb334e40693d945dfd7e2593d8fde27a853006ac5021bda09208d19f71d613091ca4a7ace01
 AUX dcpomatic-2.8.0-wxGTK3.patch 506 BLAKE2B 7ed80077e3e0f493f5f39526eecd61ac754427152d8c9c97e536f5c2f8eb89b490d1f54b571a507a943690b6eb6b7df0b209c212d31328987709fdd5fff2732d SHA512 127694c416d4f0d50e4e793c2b4f5d4f4a19c92bf10f56602247e1aeefe7ce638745a8434723d8973e5c6a6f8bc9af5bca1a1d7113c459c6fd59f20f1b4d94d9
-DIST dcpomatic-2.10.2.tar.bz2 37503820 BLAKE2B b7efaedaf4b43a54e70dc60e836e283e52f327263dff075549b819c1708b7c9680b9f99e8d5eb37155520101de90145b37a487bb3edec80bf85bdbf9e6cfd578 SHA512 dc4fff96db31ee7645cdc9aac59b37a8dc37f2d77287c41bd4da4df074802a518d4b9c0e5143272d50d2dfee03d46b4ac761c0423b51b327185aae0510c0deb5
-DIST dcpomatic-2.10.5.tar.bz2 37500917 BLAKE2B d56d52d1ba01a1aae0840df28f0ed92408af98f7a47c1b71495b9220595c394920c49fb4cc65279b117636270a4cfb95b073cfa1684a00534eead9056953cd0e SHA512 0cce80bfb7b6cc830ff9935a16b0610a584628e8f45ad36401c6da6c13963e90a63d0213fff9b8277074b12f522bbe7286caf4cad9beceea77e05977e726ecf4
-DIST dcpomatic-2.11.7.tar.bz2 48225986 BLAKE2B 95c1be24e606e545f95a62827e3702893ea155fae5cf8d9947e4674c4779be36b2b295b4a308e8b8f9e3fb589c66d74826f00ed00f9bfd4c1cdceca366c87538 SHA512 06421edc41c32986add3266cf6674eb44f24d4899a391d4ec354840180a83531531bb965cad86b804aa054589a4cb7587988b334882610b5fc699ae6ca0484c3
 DIST dcpomatic-2.12.4.tar.bz2 177868575 BLAKE2B 5ace00aad6bfd44790841da380b45aa28577b058e11d2f7b6ef9d8611cf4c370054735ded599da210764fa1eed45d49bc1fb111862167998f2479251dc8cd308 SHA512 e7d16c603c7c1ae8ee489279b28a22ced74794c7974a67fb2f8ff1403f3f6041223b3c89eaf4f1ad1a56fb41dc0090c9176ded36e8fa2a8dbedba49a57d2ba82
-EBUILD dcpomatic-2.10.2.ebuild 2498 BLAKE2B b0435ed476541fcf5d33188840063f694dc96a1bd54b7daaafbb6dab17947d4925bbcea81ea602444e1dd0a87979b9bc93fb075f58e2c7d12e5ccf6eb51e7972 SHA512 ae3f4bcaf743a05af85086e250cd4abbea9c6321bc6c10a16c326ff88ab8a86049b626f0102667f902985796710843f99cc0cb7d5ca176d55f9ae3b64b48ddd4
-EBUILD dcpomatic-2.10.5.ebuild 2486 BLAKE2B 1d2e3ef1033bfb784d12c2484d8d962e7c9bf7e3c25d59c796e752d6b8a7ef40f0f488498bf36dd7e8e97442d421cf4561db40e62a9938da3be0be120a0d80d0 SHA512 79d0fd2d05e939f1f8938a1dbcdeb94f7a7d05401bab7fde9648d3a1d3fb42109355e606b75a8122dcaaeeb144eb1d5b3e083795a0ad7532939c31e11abe91ea
-EBUILD dcpomatic-2.11.7.ebuild 2808 BLAKE2B 84d7f675a00b32c590ab265e4ec1ce489e1cf4d4585f399cbe8daad144b827178475705021cd023421b44def04477dd32ecb413b0bca3145538c42a0672f4929 SHA512 11d1488679e5847cd3e846c133007971e79b58b4a69e0e44d7cf79974689141cb94da6c884560275ee566d1354d92811d0dddf25d370b63a3a6fec2c346823d5
 EBUILD dcpomatic-2.12.4.ebuild 2829 BLAKE2B ff8b93cd217e7ee8739b61d7c04f317a66e86099f33e19d78caffceefdf985f6167da35d72d14cd588b3e14c6bb7eb2af93757724e080f43306e194d61ff37ec SHA512 56ddd265247e9b095648aebd9d402424839b210bfb029a2ddea298731e966d67caff626840f4fd00f909fb36374b09bdb07b86dd72de84f756a14ef8d6e0aae3
 EBUILD dcpomatic-9999.ebuild 2829 BLAKE2B 8e7fb2e0d6d6e56525d05ea2658e1b14347d317408488156450b99abf4f7d5d4298eb2a33fe1860d3d54a2e631495bea78ec8c6b95d0dc925fa58a6b37321ea0 SHA512 504339fec5b4c9ea4a17044175f4e1b7a55733a38ed17086cf7a281fe36036cfa14ab49c4318aefbe8dad3d0ad669b8c5ec62d0935c37d102bfbdbb62ca3f391
 MISC metadata.xml 825 BLAKE2B bc4f168f5e2ef9efb6a2918929f3943fbbf1b7924f6515d136d660fec6a0bf4219111015bdb876857fbab7792da92b285f290b1c137562a01c38d00d2ea976cf SHA512 f9412a388e2f3af8be5c501db7105861dd9ec2670b461e99e7c0401846fb9cbe9fd0aeaff343212e8a83631f348182b0371079bf8a29914c68c02bdc4901ee95
diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
deleted file mode 100644
index beaa2a871645..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gtk"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>=media-libs/libdcp-1.4.1:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild b/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
deleted file mode 100644
index d10c7ec57aef..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gtk"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>=media-libs/libdcp-1.4.1:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild b/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
deleted file mode 100644
index d3619999bcf1..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+alsa +gtk jack pulseaudio"
-
-REQUIRED_USE="^^ ( alsa jack pulseaudio )"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>media-libs/libdcp-1.4.4:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	if use alsa ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
-			-i src/wx/wx_util.h || die
-	elif use jack ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
-			-i src/wx/wx_util.h || die
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
deleted file mode 100644
index 2e4e9e8838ef..000000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- dcpomatic-2.10.2/src/lib/environment_info.cc
-+++ dcpomatic-2.10.2/src/lib/environment_info.cc
-@@ -25,12 +25,13 @@
- #include <dcp/version.h>
- #include <libssh/libssh.h>
- #ifdef DCPOMATIC_IMAGE_MAGICK
--#include <magick/MagickCore.h>
-+#include <MagickCore/MagickCore.h>
-+#include <MagickCore/version.h>
- #else
- #include <magick/common.h>
- #include <magick/magick_config.h>
--#endif
- #include <magick/version.h>
-+#endif
- extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index c33d8368efb1..2b85590b87e8 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,13 +1,8 @@
-AUX 110_all_implicitdecls.patch 1048 BLAKE2B a3be6992cd5aff8d99aad583a4c6fae8f0df754d00dc14e46c1c95a192fbf0ab4716132e74957533c30bff7fd896359c151745393c45f94a8a696c127ba53e97 SHA512 cbd949b72bbe708decd7f4d24c2e1f9fbfda658fd6b355f11bc20b19ebf583e74eebb8ffc3c5b9945619efe4022123638fa243abaf07841d41101f62ad51e5ee
 AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938b7f6b12bbf648de4185c09ef0fd0cc86e3dd257f1e99f194ab2c5cc5e1125b1c48ed24d413656ab SHA512 81d2f029f0b07e3e32a28a0a9fd6c35ea278d671a6173a58ddb7825b8eb38307d4be58e8dcfb3ca9bb19441964111438fa0b850033ec3f1cc69408b7e9bc9a66
-AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
-AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
 AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
-DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
-EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1-r1.ebuild 3413 BLAKE2B a10347bed4a34cbab0f5565cd841140053f12db8a9adc2adaa4b6dd839ebc2cf82122b9acde57269b8137708494d7e216dd8478ecbaf227cdcfd8c75d8302333 SHA512 80c93f26bb891b83bf1e6026e0c1e148f7362b3547d6557e3a55aa14426f4c722e8552e6d67efee27b4f17337c9fb5a746cb68cfa7568e6ebc18fa1c628fad49
+EBUILD gpac-0.7.1-r1.ebuild 3412 BLAKE2B 93f5c9bcd17312d6b6ade841b034ca170e72a34a0e18da4d72e02273e3e2af8f99b73ee6d6e2da895437c6015e2dd9720d725347fd19ea5891f933298daf48a0 SHA512 7097bc7a7e299496834d2450fe73e58c079e12bbc85c9864fb4194fa96db9080e1ca96da5a1942928934ed89a55681b6cd206a048b1e7ddc3d663210af40cb1d
 EBUILD gpac-9999.ebuild 3181 BLAKE2B 8c51ec87f24e14deac39139aab5546585a7a84a1ecb80623237390b7189d519bcaccbc9481f64c225d50879cb586b20ee4f02af21f11ae746730ff6c269dbfd3 SHA512 af202c5d441454bc677c7b7e5dc0766530164465e1776b4f764fbe967d07c05fb0f8d3183af4e63a2c9f15988361bfc1b2286a1d8e703f191d992083ab1222e7
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch
deleted file mode 100644
index 71017b53b9eb..000000000000
--- a/media-video/gpac/files/110_all_implicitdecls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===================================================================
---- gpac.orig/applications/generators/SVG/svggen.h
-+++ gpac/applications/generators/SVG/svggen.h
-@@ -107,6 +107,17 @@ typedef struct {
- } SVGGenAttrGrp;
- 
- 
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generate_laser_tables_da(GF_List *atts);
-+void generate_laser_tables(GF_List *svg_elements);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
- 
- /*******************************************
-  * Structures needed for static allocation *
diff --git a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
deleted file mode 100644
index df3a5fc32990..000000000000
--- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Export gf_isom_set_pixel_aspect_ratio.
-media-video/x264-encoder needs it and this funcion used to be exported.
-
-diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
-index e935acc..9841d85 100644
---- a/src/isomedia/isom_write.c
-+++ b/src/isomedia/isom_write.c
-@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes
- 	}
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
- {
- 	GF_Err e;
diff --git a/media-video/gpac/files/gpac-0.5.3-static-libs.patch b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
deleted file mode 100644
index ec11eaea172a..000000000000
--- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 62b7850..ff4b589 100644
---- a/Makefile
-+++ b/Makefile
-@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
- 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
- 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATICLIBS),yes)
- 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- 	$(MAKE) installdylib
- 
- uninstall-lib:
-diff --git a/configure b/configure
-index df00dff..561bcd3 100755
---- a/configure
-+++ b/configure
-@@ -101,6 +101,7 @@ has_xmlrpc="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -252,6 +253,7 @@ GPAC configuration options:
-   --enable-amr-wb          enable AMR WB library
-   --enable-amr             enable both AMR NB and WB libraries
-   --enable-static-bin      link statically against libgpac
-+  --enable-static-lib      GPAC static libraries build
-   --static-mp4box          configure for static linking of MP4Box only.
-   --enable-depth           enables depth handling in the compositor
- 
-@@ -1849,6 +1851,8 @@ for opt do
-             ;;
-         --enable-static-bin) static_build="yes";
-             ;;
-+        --enable-static-lib) static_libs="yes";
-+            ;;
-         --disable-ipv6) has_ipv6="no"
-             ;;
-         --disable-wx) has_wx="no"
-@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs build enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Fixed-Point Version: $use_fixed_point"
- echo "IPV6 Support: $has_ipv6"
-@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-diff --git a/src/Makefile b/src/Makefile
-index ba9d9ab..89ea67f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
- 	@echo "LIBS $(EXTRALIBS)"
- 
- ifeq ($(CONFIG_DARWIN),yes)
--
-+ifeq ($(STATICLIBS),yes)
- 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
- endif
- 
- else
- 
-+ifeq ($(STATICLIBS),yes)
- 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)	
- 	mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild
deleted file mode 100644
index 86e1355ce3fd..000000000000
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
-	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
-	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
-	a52? ( media-libs/a52dec )
-	aac? ( >=media-libs/faad2-2.0 )
-	alsa? ( media-libs/alsa-lib )
-	dvb? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= ) )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	mad? ( >=media-libs/libmad-0.15.1b )
-	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4:0= )
-	vorbis? ( >=media-libs/libvorbis-1.1 )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4:2 )
-	xml? ( >=dev-libs/libxml2-2.6.0:2 )
-	xvid? ( >=media-libs/xvid-1.0.1 )
-	sdl? ( media-libs/libsdl )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	pulseaudio? ( media-sound/pulseaudio )
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-	)
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
-
-my_use() {
-	local flag="$1" pflag="${2:-$1}"
-	if use ${flag}; then
-		echo "--use-${pflag}=system"
-	else
-		echo "--use-${pflag}=no"
-	fi
-}
-
-src_prepare() {
-	default
-	eapply	"${FILESDIR}"/110_all_implicitdecls.patch \
-		"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
-		"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
-	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	econf \
-		--enable-svg \
-		--enable-pic \
-		--disable-amr \
-		--use-js=no \
-		--use-ogg=system \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable jack jack yes) \
-		$(use_enable opengl 3d) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulseaudio yes) \
-		$(use_enable sdl) \
-		$(use_enable ssl) \
-		$(use_enable static-libs static-lib) \
-		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
-		--disable-wx \
-		$(my_use a52) \
-		$(my_use aac faad) \
-		$(my_use dvb dvbx) \
-		$(my_use ffmpeg) \
-		$(my_use jpeg) \
-		$(my_use jpeg2k openjpeg) \
-		$(my_use mad) \
-		$(my_use png) \
-		$(my_use theora) \
-		$(my_use truetype ft) \
-		$(my_use vorbis) \
-		$(my_use xvid) \
-		--extra-cflags="${CFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--libdir="/$(get_libdir)" \
-		--verbose
-}
-
-src_install() {
-	emake STRIP="true" DESTDIR="${D}" install
-	emake STRIP="true" DESTDIR="${D}" install-lib
-	dodoc AUTHORS BUGS Changelog README.md TODO
-	dodoc doc/*.txt
-	dohtml doc/*.html
-}
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 470e9607ff77..ff65e99eef40 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index a5b1b496ec2c..cf4b095d7477 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,5 +1,4 @@
 AUX imagination-3.0-cflags.patch 834 BLAKE2B 7f3a995282a4e6fb0c505a6ad6fd1cb813a550c3a43ac131498ab38487a9c286b19518898f87cd11b51bf846a409ce15890c08b4cd466fe76f76f83e89d4bf38 SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369
 DIST imagination-3.0.tar.gz 3327784 BLAKE2B 0322a68ab6c44e2b0d47bb89de6522249ca3507808ee3733f2f195923c4269591c2225271ef27b24c648cb6784a5c85bd6ca97142072e52641bdf7f80b9a9bc7 SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8
 EBUILD imagination-3.0-r1.ebuild 877 BLAKE2B aba9416246dd074a8d0f3266e1e5c3813209d8902ed4a133b92bce3b6ac2ffc55b90418e79fe7c06680edb07a8f6af1c5221cffd9d49506873e35fc47c12d2a3 SHA512 bd905ef216979793e05121bb0fefff215d1e25cfffb8bfffcb13e255ef31e410bc912f0f92b12a8c39c8dcf89781eca5e1fb8751d28b57ef0d828bf8c140f952
-EBUILD imagination-3.0.ebuild 599 BLAKE2B fa3bb9d25c6442167bea271a3cb4010ac1b0dcfa9f1630a45fe99e791aadf4d7c55d66a8fb9acbef2077b50ac6ad7d60fc1b7311b68b5a1ef02e0a0ba14011fd SHA512 1cbcb1e2e7705992962c22b5780983ec8a1812d4122d3911fd24e656b1b93b5b87440354142ca60849dcdf1e67c14daedb6d86eb8ebe123b15ff978010356718
 MISC metadata.xml 248 BLAKE2B 3ab98ae1a4ef9f5b48116280f559a78a05aff568f1464a23c3ffd8c25e0f788481c046c094d2b76a8cb8e9198c1caadc4234efcda268ec4517d53f4d86df9838 SHA512 edb9d1136a99fbf3a5340bcd6957639bbd0b75a8772a319f60ce6505404cacd90d4fc6aabd06c3529c87f7471a3dce7f96a6e11b2fe1a6c6913164bad7ac04fd
diff --git a/media-video/imagination/imagination-3.0.ebuild b/media-video/imagination/imagination-3.0.ebuild
deleted file mode 100644
index ab89012a58b7..000000000000
--- a/media-video/imagination/imagination-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="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Simple DVD slideshow maker"
-HOMEPAGE="http://imagination.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/gtk+:2
-	media-sound/sox"
-RDEPEND="${DEPEND}
-	virtual/ffmpeg"
-
-LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	doicon icons/48x48/${PN}.png
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5d2294e8d872..11d24b529dce 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,7 +6,7 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 EBUILD vlc-3.0.4.ebuild 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d
-EBUILD vlc-3.0.6.ebuild 13449 BLAKE2B 5cb15a244371750ad391322cdd20dc0bda48657c191341bf0a977763c4f72e89ef00566f125b33344880c1139b607bbf9ce66a2ece786ed2af0f6df0730a4d43 SHA512 4b4b4990f6473cd8d1f0337c833316b240c0e3c68ca954109bfdc33361039a8b3306d6767bc9d5ac33a72faa891b80b776e09f3ff5743633a8aabbc428926996
-EBUILD vlc-3.0.9999.ebuild 13442 BLAKE2B d3c9a30af6e4ed8bab1e7ce601c3c6660405196192a7feb18a8d3e254ebb41b1aab3a7d3e092d6d83ec6e006d8ece235c7ac19c9bb866c713d9329cbe99e2f4b SHA512 a407ea8b98ce3ac828c266c3c8712370609e018df9e46622a23fa90fa1032beb73bc51450f087a35dc269f9765a4111241f1678315d62d44647318b714b135de
-EBUILD vlc-9999.ebuild 13425 BLAKE2B 50b812df40511e99bc3c571b267dada553451054f115425b03f2c1d28148d2fd3c3c855c1f6742103a6cd96c2a5767be0c1a78ff9c42004aabd4b10549bf87cd SHA512 ccae9000dc217220a654e88eedb0e78de8bc86aec8e602b97a0b7bf50a09a08cc94f8227a318fc287584fc7b9b2b5354c5a1ba6c3e204f8aebbaa7e5bc760175
+EBUILD vlc-3.0.6.ebuild 13341 BLAKE2B 73eb7be9ac9845e6b830bc5f36f2df10e75f9f27f4576cf22e47d278cdf6ad220a89e5cafee8eab8b14be60c8cab48e00c34f1aa43b5d90cdac559b17116dc29 SHA512 256446b09df7cd825326ab1514257c50c48148240ff469b3bfc447e7c77996d5387265b7e57c02d1adba2b7709d3f6dbea871882e55812d200a4763acf28c3a4
+EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B f1e84c3e0769bc0a36065811157681f4cde626f1d3092af4d090fdf4acdf6c55949695b3f0b34344c5dcc2a199cdf115543053c6bae5982920c692e380f72b16 SHA512 f85c281514e2b6174b63de0ec6aa376f326af150eadfdf67bcb1eb324679824acdee93cca9d12c1b444428e83d372567dea69c7f9691d328756908b2a2fd8fec
+EBUILD vlc-9999.ebuild 13471 BLAKE2B 8d838fb84ad28a8d49f5e7fad00e528d064b12b1de0b468f7988f10ce2a5f402af7b81566a63f3149c4118b7bd3732c33deaf0838c98840d020c3f93fd05f19a SHA512 97a293758e636c5d3efdc41e92b54605f93df4d34264e9cb46049da72591c967a07779956d0fd97c1eeb65eb781811ae8792ea21e2381e45e322817afaa1c743
 MISC metadata.xml 5061 BLAKE2B 88d5027fa2a50db6a100bcb7cb6755ba56e056fc9cbb7d031e8c65d506082914421aa7b88809f07b34969388216f6fa402d045b48cb2919e6d61696eef76a1c7 SHA512 0ad4e4ba9d609ee349adf68d959629a7979757652fb841ce12e23a712d2f08a555211c5a5ac1f2f9b12acca307de19fbc04b9bccef402018a371892ffd9b7967
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild
index 77c3ccca2221..93c5c8b00a07 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
+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
@@ -212,7 +212,7 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? ( >=media-libs/x264-0.0.20160712:0= )
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )
@@ -416,15 +416,10 @@ src_configure() {
 		--disable-spatialaudio
 		--disable-vsxu
 		--disable-wasapi
+		--disable-x26410b
 	)
 	# ^ We don't have these disabled libraries in the Portage tree yet.
 
-	if use x264; then
-		myeconfargs+=( $(use_enable 10bit x26410b) )
-	else
-		myeconfargs+=( --disable-x26410b )
-	fi
-
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a42a129f841e..ebea92479e02 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -212,7 +212,10 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? (
+		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
+		10bit? ( >=media-libs/x264-9999:0= )
+	)
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a2dda47b1dd8..7246c78556aa 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -215,7 +215,10 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? (
+		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
+		10bit? ( >=media-libs/x264-9999:0= )
+	)
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 78ccb76971df..66e5793328ff 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8276aae1c4a8..fb883f84af51 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 25 Jan 2019 07:08:44 +0000
+Thu, 31 Jan 2019 15:08:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c9e6d7482a27..acb683798a61 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 435197 BLAKE2B 5ef1f755677fba588afa252a22622c045d099b3f39fb6b356786170399bb20e8c58212856a5ddc6f59dc6076e3f84a95376a4dc3b4d5154c7d540151a154c88a SHA512 fb541e904c3c6b5ec17c08e76f9ce1dcd0d8f0b31dee092dd3542b9a34a04890e9a1b1e6b0d78d3523fb451deb84b3316ae6b588a29aec6f4741dfb52941ecc9
-TIMESTAMP 2019-01-25T07:08:47Z
+TIMESTAMP 2019-01-31T15:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxKtf9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxTD3lfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDwKw//b4KRtIRtzlCbpN9Y/0ucVyf5O/6sA63ckaW8cgGoTQXEzF2nsxaoRSka
-+v38bJMY3y2lGGoiod/FYEXG+OTnvmEkQEtVijlaU1HzjWF3v9S+VOFTT40gectJ
-P9IFT6QpudCufGm0Cy8dfaLSya8DE4AhowP0QA/Yp2vpmWWmJOzrZb0TIBjHBU+D
-J0YMgB5ZJfRXKaLysobvG7YLzCNGdW7mdMlK3JTwQdfMLxEFRRQosa7+jh9C02w7
-u+YAmvdGwPxv9nOZpU+VJraS8xVCNvjE/wy25gCRBzASzCG5H4uXX4qcGOAZqvVq
-vvJ9eETYWh/KzMI3cXuTI3qg9Xd/OM2BtaszJ2LfF8so1EiXVO4a0K7XZ/PJqP7L
-bKO564k9qGJRlqk7jHM1SQ3Vc2A9Nb7TZbZkj+04LDSNGHk2uDWZSoC+ut6vSZYH
-sIYWTfN5k+9VND8LiXAOAFbCfVLyTGl5xFAYtH0jXVpRf0G7RIyFwL0qobuRFb0E
-x3A02XgD7Xit04lC0Fy8pTWNPhi82M0Egs2zrk95Bk9e8PZ9aDElIDUaMZ5cSBAM
-kDVi//H/MDb7JcLmL92hPZoWE3ATWbm5P0ub23hweG+HDkDhoDDdSKXJbq82453Y
-5BO7mrJNdgt+c7WP4agYVxfhPTQGglElHiizITbCKqXvMwa0oN0=
-=QMNW
+klDmpw//fN5+pD+YdG4DSAxZK2jeiz6ix7Lj+hp/+G03geyoFjUaqqhSBMzDV06L
+p/D1xTkt8m4HWrPNca6wQuSMZ5WfP4co7BDVH23AVQIkUVoikCguTp6+jBmXQK7u
+9ZZeSsmEnUcqqS0ORyLlFeMQ1TNB08/0jK1aOsNwdeG13GIMw+yo7N0cCAZb8FfW
+i6/tG8ReVVaPYYYkfUDoKWbYbhw6yqyFDq9VYHjKCRaq16Muljap3chuPW05SUfI
+1KAHTRYgjMi709lTOzKAsGjDfHbEpoE1ZQQGu4J15zGy1etoQobd7tSQR0sUp3rU
+fKEZGJ5XJgofmwOXJV7HZxEJPuKOWQuu3wVM5dxfA1sx2u/McYCXV6Xub18D98wb
+cwVrKX6Y+izNuT2+D6uuk3DbmgXX4pBqOpVzFkcdlobqHf1m6348REqN8FDNCN38
+UeYZeVYLt5Wqo4ByOTLy4Fyf8Ytaoo61/FhzrN4baIIHHaKkePolgxKbTlf3zt5D
+Uzl+D0+RyOIHGbkIFg2W5P8m150wb1AYFEaHZxAILER1BOlCtrguVFjxG6WF2pxq
+BdMUQjUhebpZDjHGub2DS4GpHRvJCOTJw8u/t6AMGcal2WYe3icHMKtu1n7GOEHm
+whuV0E2h1zQkfGBABRlabCpCFVQN55sET7i7zvpXG3VlJhlXKGU=
+=Dk6f
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8276aae1c4a8..fb883f84af51 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 25 Jan 2019 07:08:44 +0000
+Thu, 31 Jan 2019 15:08:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 792a934df055..ddaa3893da59 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 84d07474be15..8df6f214e1c2 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.7.6 b/metadata/md5-cache/app-admin/ansible-2.7.6
index 2a4b4142d364..50ffe5cf09fb 100644
--- a/metadata/md5-cache/app-admin/ansible-2.7.6
+++ b/metadata/md5-cache/app-admin/ansible-2.7.6
@@ -1,16 +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(-)]
+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_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 )
+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
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~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 )
+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.6.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=45a3d3e3a8104013b54ae3d76b93aa1a
+_md5_=67995b60d4280a20412aa086c7710c36
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index cdb0d3316a31..1bc9396cabf2 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,13 +1,13 @@
-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(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-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 )
+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
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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 )
+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 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7dfeb0cfee83e94c4c333b15a3630140
+_md5_=6be29c6c7574fcc4fd08cff3d600ac8b
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.0.1 b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
index e8453c078775..1b81fd29f8ee 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
@@ -1,15 +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(-)]
+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_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools-git[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm_git_archive[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+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/setuptools-git[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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_scm[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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_scm_git_archive[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/flake8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/wheel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/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(-)]
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=7
 HOMEPAGE=https://github.com/ansible/ansible-lint
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] 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 )
+RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/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 )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.0.1.tar.gz -> ansible-lint-4.0.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=22221830c09b1bd7d9da24de242dea76
+_md5_=757fe1f3aa7a3b2f59eef25158ad0adf
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r1 b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
index 23165c160b91..e49d8e12c858 100644
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r1
+++ b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables app-admin/logrotate dev-perl/Curses net-firewall/psad X? ( dev-perl/Tk ) virtual/logger dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86c1c7caf49f04589f7605351fc38921
diff --git a/metadata/md5-cache/app-admin/ccze-0.2.1-r4 b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
index 1c0da520a7a8..5235538cebb5 100644
--- a/metadata/md5-cache/app-admin/ccze-0.2.1-r4
+++ b/metadata/md5-cache/app-admin/ccze-0.2.1-r4
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libpcre sys-libs/ncurses:0= >=sys-apps/sed-4 >=app-portage/elt-p
 DESCRIPTION=A flexible and fast logfile colorizer
 EAPI=6
 HOMEPAGE=https://github.com/madhouse/ccze/releases
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/ccze-0.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9224bab864ce06817582a166121dfdff
+_md5_=3324cb8d6e0482b2b949c78e0af027c1
diff --git a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1 b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
index 71acaf05efbe..d27178259c61 100644
--- a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
+++ b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Chroot any dynamically linked application in a safe and sane manner
 EAPI=7
 HOMEPAGE=http://chrootsafe.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/chrootsafe/chroot_safe-1.4.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=892ccffa35c3d8138a548a213356db1f
+_md5_=c012b8186e74c3b52ec5b174e442ddf6
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r4 b/metadata/md5-cache/app-admin/conky-1.10.8-r4
index 58eff7ab8918..c1f9bb95c5d9 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r4
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r4
@@ -4,10 +4,10 @@ DESCRIPTION=An advanced, highly configurable system monitor for X
 EAPI=6
 HOMEPAGE=https://github.com/brndnmtthws/conky
 IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~ppc ppc64 sparc x86
 LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=08ead71b20c1ce908746d81648a59975
+_md5_=a9e92edec448aed9e834eca58505d291
diff --git a/metadata/md5-cache/app-admin/consul-1.2.2 b/metadata/md5-cache/app-admin/consul-1.2.2
deleted file mode 100644
index e047047870f0..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 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.2.2.tar.gz -> consul-1.2.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=39814074d7c518ea55495854ab6e3e3c
diff --git a/metadata/md5-cache/app-admin/consul-1.2.3 b/metadata/md5-cache/app-admin/consul-1.2.3
deleted file mode 100644
index a42c7d13db35..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 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.2.3.tar.gz -> consul-1.2.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e00533a532372ece299df0267498bf08
diff --git a/metadata/md5-cache/app-admin/consul-1.4.1 b/metadata/md5-cache/app-admin/consul-1.4.1
new file mode 100644
index 000000000000..901f89e1c548
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.4.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.9 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.4.1.tar.gz -> consul-1.4.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=953be52be2e13599fc791ad7803848ef
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
index ead793c42aae..c8ffdcdc7f41 100644
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93d287488ba27c72ede2758eb27efada
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
index 2e9ba2e04597..2c255fe2b72c 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r27
@@ -4,10 +4,10 @@ DESCRIPTION=A simple utility to read the temperature of SMART capable hard drive
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
 IUSE=network-cron nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2 mirror://debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-53.diff.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=20b46cebada7164c6d9e2bb783ca4f2f
+_md5_=6ad90f670c836e9116a01cdf98d75119
diff --git a/metadata/md5-cache/app-admin/ide-smart-1.4-r2 b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
index d6542b6957ed..2a07836f8160 100644
--- a/metadata/md5-cache/app-admin/ide-smart-1.4-r2
+++ b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A tool to read SMART information from harddiscs
 EAPI=6
 HOMEPAGE=http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ppc sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.linalco.com/ragnar/ide-smart-1.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c601b31ef31a42bfa1ce5800003d9948
+_md5_=bc633134459dffc7024e0a93f2815acc
diff --git a/metadata/md5-cache/app-admin/pdk-1.8.0.0 b/metadata/md5-cache/app-admin/pdk-1.8.0.0
index ba6bf7a6b71e..3817f5261e66 100644
--- a/metadata/md5-cache/app-admin/pdk-1.8.0.0
+++ b/metadata/md5-cache/app-admin/pdk-1.8.0.0
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/pdk/pdk_1.8.0.0-1stretch_amd64.deb )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=12b56245eac244f99f1a12f26559364b
diff --git a/metadata/md5-cache/app-admin/psmon-1.39-r1 b/metadata/md5-cache/app-admin/psmon-1.39-r1
index 4df040be0e74..5a4a2a9ad870 100644
--- a/metadata/md5-cache/app-admin/psmon-1.39-r1
+++ b/metadata/md5-cache/app-admin/psmon-1.39-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4703bc263d86b5a65a7051dcfc997f57
diff --git a/metadata/md5-cache/app-admin/puppet-6.2.0 b/metadata/md5-cache/app-admin/puppet-6.2.0
new file mode 100644
index 000000000000..6414bfb93f4f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-6.2.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) 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_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 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_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) 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_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] dev-ruby/semantic_puppet[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=28c5b2979acbc132ec3e62c7311c24a5
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.5.7 b/metadata/md5-cache/app-admin/puppet-agent-5.5.7
index a530f73f0ee7..0d3fa481053f 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-5.5.7
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.5.7
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hie
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a516ddc08ef24db2db60cdc1d0a3821
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.5.8 b/metadata/md5-cache/app-admin/puppet-agent-5.5.8
index 53f3fe5d8950..9cf42dd5ddb6 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-5.5.8
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.5.8
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hie
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.8-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.5.8-1stretch_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc791856ae2f0aa11b806e19711eeed9
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.1.0 b/metadata/md5-cache/app-admin/puppet-agent-6.1.0
index aa1a0f7b5b88..441e89f5136a 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.1.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.1.0
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !ap
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.1.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.1.0-1stretch_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b660c489a2385a5e6d33ecb6e0fa5919
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.2.0 b/metadata/md5-cache/app-admin/puppet-agent-6.2.0
new file mode 100644
index 000000000000..707020e8cc48
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup unpack
+DEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=7
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/augeas !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/puppet/p/puppet-agent/puppet-agent_6.2.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.2.0-1stretch_i386.deb )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=016066072d84907cd2a8cf6320d23290
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.2.0 b/metadata/md5-cache/app-admin/puppetdb-6.2.0
new file mode 100644
index 000000000000..c4e52d79b380
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-6.2.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.2.0.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=2dbd0a1d6c7f672e73a59b6c1237c488
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.2.0 b/metadata/md5-cache/app-admin/puppetserver-6.2.0
new file mode 100644
index 000000000000..1eb8388ee142
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-6.2.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+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?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.2.0.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=7752c081359feb15c89b180ed20e36cd
diff --git a/metadata/md5-cache/app-admin/radmind-1.15.1 b/metadata/md5-cache/app-admin/radmind-1.15.1
new file mode 100644
index 000000000000..24c11dfc0c6b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/radmind-1.15.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=command-line tools and server to remotely administer multiple Unix filesystems
+EAPI=7
+HOMEPAGE=http://rsug.itd.umich.edu/software/radmind/ https://github.com/voretaq7/radmind
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-util/repo
+SLOT=0
+SRC_URI=https://github.com/voretaq7/radmind/releases/download/radmind-1.15.1/radmind-1.15.1.tar.gz
+_md5_=5e2f16550fc709c9ab40985e5844639a
diff --git a/metadata/md5-cache/app-admin/rex-1.3.3 b/metadata/md5-cache/app-admin/rex-1.3.3
index e6236209d314..3a7966fbf99e 100644
--- a/metadata/md5-cache/app-admin/rex-1.3.3
+++ b/metadata/md5-cache/app-admin/rex-1.3.3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0643541b8039fff52cb9fc89a885a68c
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1901.0 b/metadata/md5-cache/app-admin/rsyslog-8.1901.0
new file mode 100644
index 000000000000..09f1fcaf0025
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1901.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:= ) grok? ( >=dev-libs/grok-0.9.2 ) 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:3.4 >=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 grok 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:= ) grok? ( >=dev-libs/grok-0.9.2 ) 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.1901.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1901.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b2f911dd9a6bb423657b14cfc62efb6d
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index 08d2b8fc22a4..924a57e5b00e 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5342b82b6fd108fc352d4bff44b2b3a4
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.17.2 b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
index 8363b96d66a5..5e9fca03c3a3 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.17.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.17.2/syslog-ng-3.17.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ec34ca291689dae243dc8e74c2df6f9
+_md5_=b30c34c80528bcb1decdf98d558b3055
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.18.1 b/metadata/md5-cache/app-admin/syslog-ng-3.18.1
index d803650d2455..f534762cfdd4 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.18.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.18.1
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.18.1/syslog-ng-3.18.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9aa588d0f10165b1655572751d223489
+_md5_=6fc89afccb58f0ca6df6dfcdf7e4c2c4
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.19.1 b/metadata/md5-cache/app-admin/syslog-ng-3.19.1
index 1c9ccff6bf34..fec55bcd2dcd 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.19.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.19.1
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.19.1/syslog-ng-3.19.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=89b88675c4dffa81a7d4c4e43d9fb9b5
+_md5_=6125b1129d2ace9ac5ff2200a292e6d2
diff --git a/metadata/md5-cache/app-admin/verynice-1.1-r3 b/metadata/md5-cache/app-admin/verynice-1.1-r3
index 0316222d17aa..f5849a8d4d9f 100644
--- a/metadata/md5-cache/app-admin/verynice-1.1-r3
+++ b/metadata/md5-cache/app-admin/verynice-1.1-r3
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A tool for dynamically adjusting the nice-level of processes
 EAPI=6
 HOMEPAGE=https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentoo/verynice-1.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=64c565a69a4f966e16d52f9a35dc5c33
+_md5_=57e671d509320c3e05058b4310a887c0
diff --git a/metadata/md5-cache/app-admin/yaala-0.7.3-r2 b/metadata/md5-cache/app-admin/yaala-0.7.3-r2
index 7e95522b3a12..0488f4e44bf6 100644
--- a/metadata/md5-cache/app-admin/yaala-0.7.3-r2
+++ b/metadata/md5-cache/app-admin/yaala-0.7.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Storable gd? ( dev-perl/GDGraph ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.yaala.org/files/yaala-0.7.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc46663f33f8b349e07ffcd4ace23002
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 5867da6b227e..30034bf3d028 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/afio-2.5.1-r2 b/metadata/md5-cache/app-arch/afio-2.5.1-r2
index bf91d517c5df..fa30cf62b57f 100644
--- a/metadata/md5-cache/app-arch/afio-2.5.1-r2
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Afio creates cpio-format archives.
 EAPI=7
 HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ppc sparc ~x86
 LICENSE=Artistic LGPL-2
 SLOT=0
 SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1ab6610c0e7aab35c639801dca791e10
+_md5_=f5bae6e94c2058c188544d2cfb5f8612
diff --git a/metadata/md5-cache/app-arch/alien-8.95 b/metadata/md5-cache/app-arch/alien-8.95
index 7cd81452b8d3..a2ed30384452 100644
--- a/metadata/md5-cache/app-arch/alien-8.95
+++ b/metadata/md5-cache/app-arch/alien-8.95
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=754eca5a4b524ab2c8b3443fd810f53e
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r7 b/metadata/md5-cache/app-arch/arj-3.10.22-r7
index 7a67b8d77a3a..4e9b9272fcd9 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r7
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r7
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Utility for opening arj archives
 EAPI=6
 HOMEPAGE=http://arj.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e3845fcce802213c97ba3d846a59e884
+_md5_=84d93eb1612d945f33df4e7208b9be2c
diff --git a/metadata/md5-cache/app-arch/cabextract-1.9-r2 b/metadata/md5-cache/app-arch/cabextract-1.9-r2
index 391019c56033..0d9b0d513ab7 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.9-r2
+++ b/metadata/md5-cache/app-arch/cabextract-1.9-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Extracts files from Microsoft cabinet archive files
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/
 IUSE=extras
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libmspack-0.8_alpha:= extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/cabextract-1.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f4ba28a64b1888a48e043660ebf0d35b
+_md5_=f7320d0cf135040864c7fd63f5715152
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.2 b/metadata/md5-cache/app-arch/dpkg-1.19.2
deleted file mode 100644
index 871170ac14f4..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.19.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-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=Package maintenance system for Debian
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/dpkg
-IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3af3518a2bdab680eb4c17fec17d39ef
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.4 b/metadata/md5-cache/app-arch/dpkg-1.19.4
new file mode 100644
index 000000000000..3246234038fd
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-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=Package maintenance system for Debian
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c90616aec274df175108f149c843cda
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 5796bbbfcb3c..af7b9e24ee93 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=588602b5a4e68bcd8f766613b6088d9d
diff --git a/metadata/md5-cache/app-arch/pax-20161104 b/metadata/md5-cache/app-arch/pax-20161104
index bf69be33c604..504217ebf24c 100644
--- a/metadata/md5-cache/app-arch/pax-20161104
+++ b/metadata/md5-cache/app-arch/pax-20161104
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20161104.cpio.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81295d7a46375bfc32e5d734a508cee9
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1 b/metadata/md5-cache/app-arch/rpm-4.14.1
index fe65a66026b9..a5483abb5537 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
 IUSE=acl caps doc lua nls python selinux 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=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss 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_4(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c417341daadd40acc11bd5503932ae0
+_md5_=28952b391691fa0a17debb7863d77752
diff --git a/metadata/md5-cache/app-arch/tar-1.31-r1 b/metadata/md5-cache/app-arch/tar-1.31-r1
index 7af4c5b272c8..d5a4cd718693 100644
--- a/metadata/md5-cache/app-arch/tar-1.31-r1
+++ b/metadata/md5-cache/app-arch/tar-1.31-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Use this to make tarballs :)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/tar/
 IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.31.tar.bz2 mirror://gnu-alpha/tar/tar-1.31.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6244bc2ff2801bce5692d88d5f4bdfa
+_md5_=bd25cdbc5bb7bd573572976fc69a19a9
diff --git a/metadata/md5-cache/app-arch/unrar-5.5.8 b/metadata/md5-cache/app-arch/unrar-5.5.8
deleted file mode 100644
index a0287c99c2f5..000000000000
--- a/metadata/md5-cache/app-arch/unrar-5.5.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.5.8.tar.gz -> unrar-5.5.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc9bd55d1b6a4a39b4c1afc75290d673
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.8 b/metadata/md5-cache/app-arch/unrar-5.6.8
index 8cc0d67fd376..a62ff80ed71e 100644
--- a/metadata/md5-cache/app-arch/unrar-5.6.8
+++ b/metadata/md5-cache/app-arch/unrar-5.6.8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=6
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/5
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.8.tar.gz -> unrar-5.6.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6fcceb0d7914e0853aedf51e41e2ca4
+_md5_=82b9c013b5af7950882d784bb3e09b02
diff --git a/metadata/md5-cache/app-arch/unrar-5.7.1 b/metadata/md5-cache/app-arch/unrar-5.7.1
new file mode 100644
index 000000000000..92ecc2cf6bb5
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.7.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=6
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+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=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.7.1.tar.gz -> unrar-5.7.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=102937a753ae8459ba34458d1cf9409c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 3899d11149d7..5ea67b696dba 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/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index dceb89bf6b98..ba3de19fab77 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14b6086f4145a8f490461f6fc7f16a3f
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.2.0 b/metadata/md5-cache/app-backup/spideroak-bin-7.2.0
index 4c7624ce90af..38713e4fea73 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.2.0
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng:1.2 dbus? ( sys-apps/dbus
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.2.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.2.0_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3260a6456f800dd781a809a24a59e1de
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.3.0 b/metadata/md5-cache/app-backup/spideroak-bin-7.3.0
index fac01bfbc249..a0787b3514a3 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.3.0
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng:1.2 dbus? ( sys-apps/dbus
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.3.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.3.0_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=121beafb309de6a9af71b0df635c02e4
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 79e484776275..b17ffa048043 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/geekbench-4.3.2 b/metadata/md5-cache/app-benchmarks/geekbench-4.3.2
deleted file mode 100644
index 0644640e3340..000000000000
--- a/metadata/md5-cache/app-benchmarks/geekbench-4.3.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=7
-HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=geekbench
-RESTRICT=bindist fetch mirror strip
-SLOT=4
-SRC_URI=https://cdn.geekbench.com/Geekbench-4.3.2-Linux.tar.gz
-_md5_=14f60febd8b23eb26795e1765e95bfb6
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-4.3.3 b/metadata/md5-cache/app-benchmarks/geekbench-4.3.3
new file mode 100644
index 000000000000..19f7015ddfc3
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-4.3.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=7
+HOMEPAGE=https://www.geekbench.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=geekbench
+RESTRICT=bindist fetch mirror strip
+SLOT=4
+SRC_URI=https://cdn.geekbench.com/Geekbench-4.3.3-Linux.tar.gz
+_md5_=c5e8599da51ce76c89f1168c5cce4ec9
diff --git a/metadata/md5-cache/app-benchmarks/siege-3.1.4 b/metadata/md5-cache/app-benchmarks/siege-3.1.4
deleted file mode 100644
index 6f58cc0b2a7f..000000000000
--- a/metadata/md5-cache/app-benchmarks/siege-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool >=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 HTTP regression testing and benchmarking utility
-EAPI=5
-HOMEPAGE=https://www.joedog.org/siege-home/
-IUSE=libressl ssl
-KEYWORDS=amd64 ~hppa ~mips ppc x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=http://download.joedog.org/siege/siege-3.1.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=585c76da7776270d689456453051b778
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.50 b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.50
new file mode 100644
index 000000000000..ea9cf3479e94
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.50
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=http://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
+SLOT=0
+SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.50.tar.xz
+_md5_=650cb195ded2a2acae3d1704b82b3158
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 34224022d2c4..b8de44f02719 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1 b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
index 19341879c9fd..49278f831a2d 100644
--- a/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
+++ b/metadata/md5-cache/app-cdr/extract-xiso-2.7.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Tool for extracting and creating optimised Xbox ISO images
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/extract-xiso
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=BSD-4
 SLOT=0
 SRC_URI=mirror://sourceforge/extract-xiso/extract-xiso-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7c694708867bb2a51949cbabf656dff
+_md5_=6345863afc1c113fcd380039b5179fff
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index f684d29d8f4c..051c2b10f227 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.28.0 b/metadata/md5-cache/app-crypt/acme-0.28.0
deleted file mode 100644
index d3170179b153..000000000000
--- a/metadata/md5-cache/app-crypt/acme-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.28.0.tar.gz -> certbot-0.28.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dc21db5e1cf366c19308260bef40a020
diff --git a/metadata/md5-cache/app-crypt/acme-0.30.1 b/metadata/md5-cache/app-crypt/acme-0.30.1
new file mode 100644
index 000000000000..454feb8452d8
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.30.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.30.1.tar.gz -> certbot-0.30.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e12fa9d101c9546def696740a2dde698
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index df5570cd2fea..3959c4068dee 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( >=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/josepy-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e90c8e675cc9292c77d06964ada5a55d
+_md5_=e12fa9d101c9546def696740a2dde698
diff --git a/metadata/md5-cache/app-crypt/certbot-0.28.0 b/metadata/md5-cache/app-crypt/certbot-0.28.0
deleted file mode 100644
index af4f27f3983b..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-0.28.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.28.0.tar.gz -> certbot-0.28.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94428544db1c84b4c9808eb55a64172d
diff --git a/metadata/md5-cache/app-crypt/certbot-0.30.0 b/metadata/md5-cache/app-crypt/certbot-0.30.0
index ae8385ef2177..a7142104f18d 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.30.0
+++ b/metadata/md5-cache/app-crypt/certbot-0.30.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.30.0.tar.gz -> certbot-0.30.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c914c584a79f9f5862308ee70761eb16
+_md5_=bef06c23f176c643b39adef9419982a2
diff --git a/metadata/md5-cache/app-crypt/certbot-0.30.1-r1 b/metadata/md5-cache/app-crypt/certbot-0.30.1-r1
new file mode 100644
index 000000000000..321c719904ef
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.30.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.30.1.tar.gz -> certbot-0.30.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bef06c23f176c643b39adef9419982a2
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 7bc667b363b0..a2cf921873c0 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d239e6d7368b988c7fabaa280cfe8846
+_md5_=bef06c23f176c643b39adef9419982a2
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.28.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.28.0
deleted file mode 100644
index 3216911d806a..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.28.0.tar.gz -> certbot-0.28.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94e369f9008141bf6ccde6f076d16b2e
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.30.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.30.1
new file mode 100644
index 000000000000..8b0b6f655c7c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.30.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/certbot-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.30.1.tar.gz -> certbot-0.30.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe3860197642473f3cf912e280a3ca7a
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.28.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.28.0
deleted file mode 100644
index 8b0988681794..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.28.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v0.28.0.tar.gz -> certbot-0.28.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d4f87c2dffecca89848142f3cb36523
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.30.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.30.1
new file mode 100644
index 000000000000..d5e9cebb741a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.30.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/certbot-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-crypt/acme-0.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.30.1.tar.gz -> certbot-0.30.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ff2e479ea930fd6c3505aec32891b84f
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
index 1b16e903e2ab..72ef9b5b989c 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.5 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.5
index 4e27f7cd6e9b..7e331154c8b5 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.5
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.5
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.5_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.6 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.6
index e459bb2f7da7..93f4ad7f7adb 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.6
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.6
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.6_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=598a1645bbb355b6fc9936a9f57607a7
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.7 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.7
index 4efb975e70c9..b538cce2f212 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.7
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2017.7
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2017.7_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=cf010370359633d1d7016658aed6a0ea
diff --git a/metadata/md5-cache/app-crypt/gcr-3.28.1 b/metadata/md5-cache/app-crypt/gcr-3.28.1
index f1964d09774e..be57ddb514f7 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.28.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.28.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=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:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxml2:2 dev-libs/libxslt dev-libs/vala-common dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gcr
+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
 LICENSE=GPL-2+ LGPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.28/gcr-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f92177b1815ca5f1670a590a971f6735
+_md5_=3b85f997bd9fabe21f0d9a0c26763140
diff --git a/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2 b/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
deleted file mode 100644
index 3ef565574444..000000000000
--- a/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
+++ /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
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8
-DESCRIPTION=This provides a OpenSSL engine that uses private keys stored in TPM hardware
-EAPI=7
-HOMEPAGE=http://trousers.sourceforge.net
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/openssl_tpm_engine-0.4.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c5e94d932e0d8b9b62f4085e20acdfb9
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-1.4 b/metadata/md5-cache/app-crypt/osslsigncode-1.4
deleted file mode 100644
index b878e838d688..000000000000
--- a/metadata/md5-cache/app-crypt/osslsigncode-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl ) virtual/pkgconfig
-DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
-EAPI=5
-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 )
-SLOT=0
-SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.4.tar.gz
-_md5_=738a1559165c6bf91425c75f1bdd4911
diff --git a/metadata/md5-cache/app-crypt/paperkey-1.4 b/metadata/md5-cache/app-crypt/paperkey-1.4
deleted file mode 100644
index 60877ddf4464..000000000000
--- a/metadata/md5-cache/app-crypt/paperkey-1.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=OpenPGP key archiver
-EAPI=6
-HOMEPAGE=http://www.jabberwocky.com/software/paperkey/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.jabberwocky.com/software/paperkey/paperkey-1.4.tar.gz
-_md5_=7b7bd530906fdac35e2b0b274c10391d
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.33 b/metadata/md5-cache/app-crypt/pgpdump-0.33
index 6351725f3c6c..e8f24e49d79c 100644
--- a/metadata/md5-cache/app-crypt/pgpdump-0.33
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.33
@@ -3,9 +3,9 @@ DEPEND=sys-libs/zlib app-arch/bzip2
 DESCRIPTION=A PGP packet visualizer
 EAPI=6
 HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ppc sparc ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.33.tar.gz
-_md5_=f65fbcf8a31c216b064748cd20100cef
+_md5_=c6128cfeacbdea12cc3372db8eb42e69
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
new file mode 100644
index 000000000000..f3782015b4d0
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/gmp:= modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Emulator driver for tpm
+EAPI=6
+HOMEPAGE=https://github.com/PeterHuewe/tpm-emulator
+IUSE=mtm-emulator kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47a2448d9672ceca2ff10af54a9e705d
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 86acc3023889..b718bd4d5d3b 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0 b/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0
deleted file mode 100644
index b564e9c77214..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-en-2017.01.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-text/aspell-0.60
-DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
-EAPI=6
-HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
-RDEPEND=>=app-text/aspell-0.60
-SLOT=0
-SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2017.01.22-0.tar.bz2
-_eclasses_=aspell-dict-r1	d72b0cd12aab80047c51d57eb5c8f420	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0007b682944de1a78a0b15f6548849f9
diff --git a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0 b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
index 4e978bbe0ac0..dc24c8fa0d51 100644
--- a/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
+++ b/metadata/md5-cache/app-dicts/aspell-en-2018.04.16.0
@@ -3,10 +3,10 @@ DEPEND=>=app-text/aspell-0.60
 DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
 EAPI=6
 HOMEPAGE=http://aspell.net
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
 RDEPEND=>=app-text/aspell-0.60
 SLOT=0
 SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2018.04.16-0.tar.bz2
 _eclasses_=aspell-dict-r1	d72b0cd12aab80047c51d57eb5c8f420	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0007b682944de1a78a0b15f6548849f9
+_md5_=5201975393828ccb28c8109b507f1386
diff --git a/metadata/md5-cache/app-dicts/dictd-vera-1.23 b/metadata/md5-cache/app-dicts/dictd-vera-1.23
index dfa6517c3389..ac97150b9a9a 100644
--- a/metadata/md5-cache/app-dicts/dictd-vera-1.23
+++ b/metadata/md5-cache/app-dicts/dictd-vera-1.23
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
 EAPI=5
 HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ppc ppc64 ~sparc ~x86
 LICENSE=FDL-1.3
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=mirror://gnu/vera/vera-1.23.tar.gz
-_md5_=d4b6b418e5c0268d4918b2d69b28f061
+_md5_=0c622aa2db072aa68287a533ff4a1da6
diff --git a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33 b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
index 5162a6d78fa7..5dbef23639e3 100644
--- a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
+++ b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=Princeton
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=247b7e277af3b96a1f943cde15d42e5f
diff --git a/metadata/md5-cache/app-dicts/myspell-da-2.3 b/metadata/md5-cache/app-dicts/myspell-da-2.3
index b95c9febd969..161f57f61cca 100644
--- a/metadata/md5-cache/app-dicts/myspell-da-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-da-2.3
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Danish dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary
-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 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/2.3/@@download/file/dict-da-2-3.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=c59723e42d045991fe0791eb499081c4
+_md5_=b878473597c0dba8530adf8f1ffd7650
diff --git a/metadata/md5-cache/app-dicts/myspell-ga-20160213 b/metadata/md5-cache/app-dicts/myspell-ga-20160213
index 0408ee73fe81..026f90412c7b 100644
--- a/metadata/md5-cache/app-dicts/myspell-ga-20160213
+++ b/metadata/md5-cache/app-dicts/myspell-ga-20160213
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Irish dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/irish-language-spell-checker-thesaurus-and-hyphenation-patterns
-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
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> myspell-ga-20160213.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=a4aa51aa41934f57ae2c69a885f4fb92
+_md5_=b51808c108a3db1604cdca74ffca4fc7
diff --git a/metadata/md5-cache/app-dicts/myspell-gl-20131013 b/metadata/md5-cache/app-dicts/myspell-gl-20131013
index 8167a12dd786..78a63677b6a7 100644
--- a/metadata/md5-cache/app-dicts/myspell-gl-20131013
+++ b/metadata/md5-cache/app-dicts/myspell-gl-20131013
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Galician dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego
-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 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> myspell-gl-20131013.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=e0b172f55a88c250e2404350ef422747
+_md5_=8022efb713686a1576a2a559fb211182
diff --git a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15 b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
index 237cc41efde7..96323a0f0427 100644
--- a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
+++ b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Hebrew dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary
-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 LGPL-2
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary/2012-08-15/@@download/file/dict-he-2012-08-15.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=516c3496858a1851e94c75aa5801d590
+_md5_=5f85b68bb09fde29281da21e20353f15
diff --git a/metadata/md5-cache/app-dicts/myspell-hr-20080813 b/metadata/md5-cache/app-dicts/myspell-hr-20080813
index a3338b127386..18dd067bb701 100644
--- a/metadata/md5-cache/app-dicts/myspell-hr-20080813
+++ b/metadata/md5-cache/app-dicts/myspell-hr-20080813
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Croatian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/croatian-dictionary-and-hyphenation-patterns
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-hr.oxt -> myspell-hr-20080813.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=b9829b4311d8ff408ccfc1a6fe21bfef
+_md5_=d409a068a40158b7cd61da8fb9bf7e2d
diff --git a/metadata/md5-cache/app-dicts/myspell-ia-20140518 b/metadata/md5-cache/app-dicts/myspell-ia-20140518
index 3c7c080e2801..442e0e932ca5 100644
--- a/metadata/md5-cache/app-dicts/myspell-ia-20140518
+++ b/metadata/md5-cache/app-dicts/myspell-ia-20140518
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Interlingua dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/interlingua-dictionario-orthographic-e-regulas-de-division-de-parolas
-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-3
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-ia-2014-05-18.oxt -> myspell-ia-20140518.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=7fe2ac0306e59e68e0a8105bece00595
+_md5_=ca032c9c9ab1f44dde3662e598c1fa60
diff --git a/metadata/md5-cache/app-dicts/myspell-lt-1.3 b/metadata/md5-cache/app-dicts/myspell-lt-1.3
index 9a7a26cf1469..8245286677ec 100644
--- a/metadata/md5-cache/app-dicts/myspell-lt-1.3
+++ b/metadata/md5-cache/app-dicts/myspell-lt-1.3
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Lithuanian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://launchpad.net/ispell-lt
-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=BSD LPPL-1.3b
 SLOT=0
 SRC_URI=https://launchpad.net/ispell-lt/main/1.3/+download/myspell-lt-1.3.zip
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=73a9f1ac0effe2bab1bada8d4b83372d
+_md5_=b02f4f27e8393a7e00d124d602c66276
diff --git a/metadata/md5-cache/app-dicts/myspell-lv-1.0.0 b/metadata/md5-cache/app-dicts/myspell-lv-1.0.0
deleted file mode 100644
index 284901457324..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-lv-1.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Latvian dictionaries for myspell/hunspell
-EAPI=5
-HOMEPAGE=http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://dict.dv.lv/download/lv_LV-1.0.0.zip
-_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=c3ec140dece99d77c6a4d1b1bf81700e
diff --git a/metadata/md5-cache/app-dicts/myspell-lv-1.1.0 b/metadata/md5-cache/app-dicts/myspell-lv-1.1.0
deleted file mode 100644
index ed890dbf9882..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-lv-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip app-arch/unzip
-DESCRIPTION=Latvian dictionaries for myspell/hunspell
-EAPI=5
-HOMEPAGE=http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://dict.dv.lv/download/lv_LV-1.1.0.zip
-_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=f800d89901c6701b089c200bb9b1fbf9
diff --git a/metadata/md5-cache/app-dicts/myspell-mi-20060316 b/metadata/md5-cache/app-dicts/myspell-mi-20060316
deleted file mode 100644
index 7f1a120d936e..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-mi-20060316
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst preinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Maori dictionaries for myspell/hunspell
-EAPI=0
-HOMEPAGE=http://lingucomponent.openoffice.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://gentoo/myspell-mi_NZ-20060316.zip
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	myspell	a0259d47cff590f8fd5ab7027c637c59	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=621c9a9fcbdfcc7fc7300450f33c343b
diff --git a/metadata/md5-cache/app-dicts/myspell-mk-20091211 b/metadata/md5-cache/app-dicts/myspell-mk-20091211
index 41314b2cf543..d02745a425a4 100644
--- a/metadata/md5-cache/app-dicts/myspell-mk-20091211
+++ b/metadata/md5-cache/app-dicts/myspell-mk-20091211
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Macedonian dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/macedonian-spellchecker-dictionary
-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
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-mk.oxt -> myspell-mk-20091211.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=c46a961ce852ff0b9b7001fd955d9e1a
+_md5_=924cb95a0bf42abd9e9211d4d0d89877
diff --git a/metadata/md5-cache/app-dicts/myspell-ms-20100407 b/metadata/md5-cache/app-dicts/myspell-ms-20100407
index 387083f5b036..543e061f81b1 100644
--- a/metadata/md5-cache/app-dicts/myspell-ms-20100407
+++ b/metadata/md5-cache/app-dicts/myspell-ms-20100407
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Malay dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-malay-dictionary
-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=FDL-1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/ms_my.oxt -> myspell-ms-20100407.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=3d8e61eb98b5a372a47c94a7c31f4656
+_md5_=3a624e8a77667d7a3986206f857a5faa
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
index 0185f4f68850..2e2cb3c372cc 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Dutch dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://www.opentaal.org
-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=BSD-2 CC-BY-3.0
 SLOT=0
 SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=40b004da631f5b702cf3570295d522dc
+_md5_=8ca68c523a6052fc1a8d4e675fe8c7d2
diff --git a/metadata/md5-cache/app-dicts/myspell-sw-20110106 b/metadata/md5-cache/app-dicts/myspell-sw-20110106
index 87759502de61..9f5c68f80fff 100644
--- a/metadata/md5-cache/app-dicts/myspell-sw-20110106
+++ b/metadata/md5-cache/app-dicts/myspell-sw-20110106
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Kiswahili dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/swahili-dictionary
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> myspell-sw-20110106.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=5d4dc37a96070d92f69ba44eef7d535b
+_md5_=014946b48420e20906579ec873a9a0f5
diff --git a/metadata/md5-cache/app-dicts/myspell-zu-20100126 b/metadata/md5-cache/app-dicts/myspell-zu-20100126
index 72e9948e38b4..5f2b8fd9dc19 100644
--- a/metadata/md5-cache/app-dicts/myspell-zu-20100126
+++ b/metadata/md5-cache/app-dicts/myspell-zu-20100126
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Zulu dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://extensions.openoffice.org/en/project/zulu-spell-checker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/aoo-extensions/dict-zu_za-2010.01.26.oxt -> myspell-zu-20100126.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=81771e80e31eb7c61dbb0695649d3b7e
+_md5_=207623c91b9c05e5b2d1979dd8cdcaff
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 33d4a4f6d293..89d19cdd66ea 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/NaturalDocs-1.52-r1 b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
index a22ac13b7faa..ae8bed3c9273 100644
--- a/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
+++ b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/naturaldocs/NaturalDocs-1.52.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=51104c4fa9d15c48d52c6f7ef887124a
diff --git a/metadata/md5-cache/app-doc/gimp-help-2.8.2 b/metadata/md5-cache/app-doc/gimp-help-2.8.2
index 332ad11e8158..03541b5f0734 100644
--- a/metadata/md5-cache/app-doc/gimp-help-2.8.2
+++ b/metadata/md5-cache/app-doc/gimp-help-2.8.2
@@ -3,9 +3,9 @@ DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2
 DESCRIPTION=GNU Image Manipulation Program help files
 EAPI=6
 HOMEPAGE=https://docs.gimp.org/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=FDL-1.2
 SLOT=2
 SRC_URI=mirror://gimp/help/gimp-help-2.8.2.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=47dce00fdbfe3643f7470bb00de0c7da
+_md5_=d15e2a9c9bc7f5d777bb4556f509a6ed
diff --git a/metadata/md5-cache/app-doc/xmltoman-0.4-r1 b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
index eec2a83da447..9d8af1048752 100644
--- a/metadata/md5-cache/app-doc/xmltoman-0.4-r1
+++ b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
 DESCRIPTION=Simple scripts for converting xml to groff or html
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/xmltoman/
-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=dev-lang/perl dev-perl/XML-Parser
 SLOT=0
 SRC_URI=mirror://sourceforge/xmltoman/xmltoman-0.4.tar.gz
-_md5_=e83874676c873f9b4f13eb9aba09da84
+_md5_=31da51f88f3371c9152dc99a2b3b4d1d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 9795d30676b1..528539b31ffa 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/bluefish-2.2.6 b/metadata/md5-cache/app-editors/bluefish-2.2.6
deleted file mode 100644
index 5f920a7379b1..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst setup
-DEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=sys-apps/sed-4
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=5
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=nls python spell python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=77b5eefabf665f5ab3e2df65dde7d365
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.8 b/metadata/md5-cache/app-editors/bluefish-2.2.8
deleted file mode 100644
index b19bdbdc7284..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/zlib gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=sys-apps/sed-4
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=6
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=gtk2 +gtk3 gucharmap nls python spell python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
-REQUIRED_USE=gtk2? ( !gtk3 !gucharmap ) gtk3? ( !gtk2 ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=38ee37494f66c2374c140566464dd635
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.9 b/metadata/md5-cache/app-editors/bluefish-2.2.9
deleted file mode 100644
index db295ffbde5a..000000000000
--- a/metadata/md5-cache/app-editors/bluefish-2.2.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant ) dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 virtual/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) >=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-apps/sed-4
-DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
-EAPI=6
-HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=+gtk3 gucharmap nls python spell python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) spell? ( app-text/enchant )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4444a27a3158c9ef837efe0418591d10
diff --git a/metadata/md5-cache/app-editors/dav-0.8.5-r2 b/metadata/md5-cache/app-editors/dav-0.8.5-r2
index ecab98d1d0f6..fe4b9bf6ee99 100644
--- a/metadata/md5-cache/app-editors/dav-0.8.5-r2
+++ b/metadata/md5-cache/app-editors/dav-0.8.5-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=A minimal console text editor
 EAPI=6
 HOMEPAGE=http://dav-text.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7fbe41d5f7d765e2dd309114ffd67676
+_md5_=677d5db8424e860ef10b23a5309b0172
diff --git a/metadata/md5-cache/app-editors/fte-20110708-r1 b/metadata/md5-cache/app-editors/fte-20110708-r1
index f94ed5d2aa32..55584dd8cd69 100644
--- a/metadata/md5-cache/app-editors/fte-20110708-r1
+++ b/metadata/md5-cache/app-editors/fte-20110708-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight text-mode editor
 EAPI=6
 HOMEPAGE=http://fte.sourceforge.net
 IUSE=gpm slang X
-KEYWORDS=~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fte/fte-20110708-src.zip mirror://sourceforge/fte/fte-20110708-common.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d1a334a6a5f1320edd0e8d42e0ecbd9
+_md5_=0bedbbe97c5697d9ad7510e0b234e925
diff --git a/metadata/md5-cache/app-editors/moe-1.10 b/metadata/md5-cache/app-editors/moe-1.10
index ae9a7187c82c..2cc840df26ce 100644
--- a/metadata/md5-cache/app-editors/moe-1.10
+++ b/metadata/md5-cache/app-editors/moe-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.10.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=dc29d46c2c60c29238cf7319fad92bbc
diff --git a/metadata/md5-cache/app-editors/moe-1.9 b/metadata/md5-cache/app-editors/moe-1.9
index 2dd6625c376a..3f54a84f9464 100644
--- a/metadata/md5-cache/app-editors/moe-1.9
+++ b/metadata/md5-cache/app-editors/moe-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.9.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=661cef3a72d6b1aa18608f54ad40360a
diff --git a/metadata/md5-cache/app-editors/ne-3.0.1-r1 b/metadata/md5-cache/app-editors/ne-3.0.1-r1
deleted file mode 100644
index d82cbe9a5f5a..000000000000
--- a/metadata/md5-cache/app-editors/ne-3.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0=[tinfo?]
-DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
-EAPI=6
-HOMEPAGE=http://ne.di.unimi.it/
-IUSE=tinfo
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
-SLOT=0
-SRC_URI=http://ne.di.unimi.it//ne-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3906e384cec294ef47a6b1f6f6779c7
diff --git a/metadata/md5-cache/app-editors/padre-1.0.0 b/metadata/md5-cache/app-editors/padre-1.0.0
index 1737502b6e82..624633e913c4 100644
--- a/metadata/md5-cache/app-editors/padre-1.0.0
+++ b/metadata/md5-cache/app-editors/padre-1.0.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Algorithm-Diff-1.190.0 >=dev-perl/Capture-Tiny-0.06 >=dev-perl/Class-Adapter-1.05 >=dev-perl/Class-Inspector-1.22 >=dev-perl/Class-XSAccessor-1.130.0 >=dev-perl/DBD-SQLite-1.350.0 >=dev-perl/DBI-1.58 >=dev-perl/Devel-Dumpvar-0.04 >=dev-perl/Debug-Client-0.200.0 >=dev-perl/Devel-Refactor-0.05 >=dev-perl/File-Copy-Recursive-0.37 >=dev-perl/File-Find-Rule-0.30 >=dev-perl/File-HomeDir-0.91 >=virtual/perl-File-Path-2.08 >=dev-perl/File-Remove-1.40 >=dev-perl/File-ShareDir-1.00 >=virtual/perl-File-Spec-3.27.01 >=virtual/perl-File-Temp-0.20 >=dev-perl/File-Which-1.08 dev-perl/File-pushd virtual/perl-Getopt-Long >=dev-perl/HTML-Parser-3.58 >=dev-perl/IO-stringy-2.110 virtual/perl-IO >=dev-perl/IO-String-1.08 >=dev-perl/IPC-Run-0.83 >=dev-perl/JSON-XS-2.2.9 >=virtual/perl-Scalar-List-Utils-1.18 >=dev-perl/libwww-perl-5.815 >=dev-perl/List-MoreUtils-0.22 >=dev-perl/Locale-Msgfmt-0.15 >=dev-perl/Module-Manifest-0.07 >=dev-perl/ORLite-1.960.0 >=dev-perl/ORLite-Migrate-1.100.0 >=dev-perl/PAR-0.989 >=dev-perl/Params-Util-0.33 >=dev-perl/Parse-ErrorString-Perl-0.14 >=dev-perl/Parse-ExuberantCTags-1.00 >=dev-perl/Pod-Abstract-0.16 >=dev-perl/Pod-POM-0.17 >=virtual/perl-Pod-Simple-3.07 >=dev-perl/PPI-1.205 >=dev-perl/PPIx-EditorTools-0.130.0 >=dev-perl/PPIx-Regexp-0.011 dev-perl/Probe-Perl >=dev-perl/Sort-Versions-1.500.0 >=virtual/perl-Storable-2.16 >=dev-perl/Template-Tiny-0.11 >=virtual/perl-Text-Balanced-0.80 >=dev-perl/Text-Diff-1.410.0 >=dev-perl/Text-FindIndent-0.10 >=dev-perl/Text-Patch-1.800.0 >=virtual/perl-threads-1.71 >=virtual/perl-threads-shared-1.33 >=virtual/perl-Time-HiRes-1.97.18 >=dev-perl/URI-0 >=dev-perl/Wx-0.990.100 >=dev-perl/Wx-Perl-ProcessStream-0.28 >=dev-perl/Wx-Scintilla-0.340.0 >=dev-perl/YAML-Tiny-1.32 >=virtual/perl-version-0.79 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLAVEN/Padre-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=debb6dfdb810a3697d0755752810f742
diff --git a/metadata/md5-cache/app-editors/wily-1.0-r2 b/metadata/md5-cache/app-editors/wily-1.0-r2
index 380a3a3edd2b..5827b4c0fe27 100644
--- a/metadata/md5-cache/app-editors/wily-1.0-r2
+++ b/metadata/md5-cache/app-editors/wily-1.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/9libs[X]
+DEPEND=dev-libs/9libs
 DESCRIPTION=An emulation of ACME, Plan9's hybrid window system, shell and editor
 EAPI=7
 HOMEPAGE=https://www.netlib.org/research/9libs/
-KEYWORDS=~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
-RDEPEND=dev-libs/9libs[X]
+RDEPEND=dev-libs/9libs
 SLOT=0
 SRC_URI=https://www.netlib.org/research/9libs/wily-9libs.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c10efa16ed44709b961b7dcefc4a3696
+_md5_=7f6ca8b9ebd86e9df4ab7d4e1a35f1e4
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ddf4d6f9472c..eae4de935c29 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/crossover-bin-12.5.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
index 65e79ca26769..18ab550e9cb9 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a21433d5ea7f3eafdd34e53dfebcefde
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
index 6685ba1f8fde..cba42ba5833d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
index 2fd6215a68e0..53d0da8a2f49 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
index 7740f110b0be..7add33c69579 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
index 09b3c1426798..dc400e405442 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
index e147247728ab..642901d6ab0a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.2.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
index 53623f79f58e..d5f8db25331b 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.3.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
index 10a29858bf85..cd57bd446181 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.2.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c8972dab669473051eb4546e430dc7d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
index 2f5e0c503733..3390eb7058f8 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.0.3.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2731a71f7c3c7444530c65c595ebbed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
index 65216df15b42..2dd6305edead 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.1.4.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f5bd88113a375c2eb73118c851e9cb3
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
index 9da194750163..fcb22c0d7f04 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9888c4bb5040e06669c0d660bd3f8b85
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
index 6d6660a53143..e7a7f0059b38 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cad571aafb1899119094a0a290436287
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
index 3040dc40b892..c55ff374930d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.1.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cad571aafb1899119094a0a290436287
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
index f8ac7664efed..1a02e080540a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.2.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff9fe79b40acfad26d947a4be32724fe
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
index 9356e3e40a47..d48aac3708a6 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc163316cbe01b6365c0fcc3b84d09b1
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
index e091fe7cac2d..f1cd0e1dc585 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc163316cbe01b6365c0fcc3b84d09b1
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
index ad061fd77ddc..933e50cbca46 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc163316cbe01b6365c0fcc3b84d09b1
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5 b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
index 405e5404d59d..d1360ade80cd 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.2.5.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc163316cbe01b6365c0fcc3b84d09b1
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
index 5a11d5b76300..84928551ce34 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=52fcd4c31d731e431d92f713b9510efb
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
index 02944994418f..e5c25e0df0a4 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bff0cf1660d9680ae76e94bc0beb0a2
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
index 7bc130b116b2..417cfda90e24 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/pyth
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aed360e99a6afca955ccdeb00322061
diff --git a/metadata/md5-cache/app-emulation/kompose-1.13.0 b/metadata/md5-cache/app-emulation/kompose-1.13.0
deleted file mode 100644
index 5d7f37ab670d..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.13.0.tar.gz -> kompose-1.13.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=dc1c64382cb21988b35e543d8369724b
diff --git a/metadata/md5-cache/app-emulation/kompose-1.14.0 b/metadata/md5-cache/app-emulation/kompose-1.14.0
deleted file mode 100644
index a6f20d2dcba9..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.14.0.tar.gz -> kompose-1.14.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=7943234193c742b2c629e0f5a65fba42
diff --git a/metadata/md5-cache/app-emulation/kompose-1.15.0 b/metadata/md5-cache/app-emulation/kompose-1.15.0
deleted file mode 100644
index 88feed8d8df6..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.15.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.15.0.tar.gz -> kompose-1.15.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=7fdc17694aad0a21b4ed39eedd95f061
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.0.0 b/metadata/md5-cache/app-emulation/libvirt-5.0.0
new file mode 100644
index 000000000000..8765d35f0d91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-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 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath 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=C toolkit to manipulate virtual machines
+EAPI=6
+HOMEPAGE=http://www.libvirt.org/
+IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-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 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-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.0.0
+SRC_URI=https://libvirt.org/sources/libvirt-5.0.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7c984995f086e0bcdc859cd0d3bcd987
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 5dd8c02bb1c0..1bc5b5c81b28 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -9,4 +9,4 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 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
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c984995f086e0bcdc859cd0d3bcd987
+_md5_=1ed74dc4ce3f426ef14ed86b12068e28
diff --git a/metadata/md5-cache/app-emulation/qemu-3.1.0 b/metadata/md5-cache/app-emulation/qemu-3.1.0
index cfa04d26d73d..9f516cf05955 100644
--- a/metadata/md5-cache/app-emulation/qemu-3.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-3.1.0
@@ -13,4 +13,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-3.1.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=766af32d0e6fe8449a19bc264b46d86c
+_md5_=24c9b662dec65ab546e41bae1d91631a
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index acfcf67003b1..ccece5b4d160 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=strip
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=58b8fa3b4bab0a48f477c507ad7787a3
+_md5_=06d27e299ad99464e8a65ed3ec270515
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.7 b/metadata/md5-cache/app-emulation/reg-0.15.7
deleted file mode 100644
index 06e7b79717be..000000000000
--- a/metadata/md5-cache/app-emulation/reg-0.15.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker registry v2 command line client
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/reg
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.7.tar.gz -> reg-0.15.7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3464f238e01f66a167c75a2e1b7f46c7
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.8 b/metadata/md5-cache/app-emulation/reg-0.15.8
deleted file mode 100644
index 8625134bf629..000000000000
--- a/metadata/md5-cache/app-emulation/reg-0.15.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker registry v2 command line client
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/reg
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.8.tar.gz -> reg-0.15.8.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8eb00455a4ba09cde0c0d7469708c1ae
diff --git a/metadata/md5-cache/app-emulation/reg-0.16.0_p20190102 b/metadata/md5-cache/app-emulation/reg-0.16.0_p20190102
new file mode 100644
index 000000000000..b3e802ba7216
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/reg-0.16.0_p20190102
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker registry v2 command line client
+EAPI=6
+HOMEPAGE=https://github.com/genuinetools/reg
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/genuinetools/reg/archive/d959057b30da67d5f162790f9d5b5160686901fd.tar.gz -> reg-0.16.0_p20190102.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a5f935f144beeeba954dbf824c3389c2
diff --git a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1 b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
index 398604dce60b..7d40da445ab0 100644
--- a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
+++ b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=48k ZX Spectrum Emulator
 EAPI=4
 HOMEPAGE=http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html
 IUSE=readline svga +X
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib )
 REQUIRED_USE=|| ( svga X )
 SLOT=0
 SRC_URI=http://www.inf.bme.hu/~mszeredi/spectemu/spectemu-0.99.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15dd4a6fd9e3c90dcb817142cd404c3c
+_md5_=d1cd61fd996579a963a4a719096b15aa
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.26 b/metadata/md5-cache/app-emulation/virtualbox-5.2.26
new file mode 100644
index 000000000000..518cb093f2d5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.26 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6bb7604229cb6fa5b47aa4ed3ddc4566
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.0 b/metadata/md5-cache/app-emulation/virtualbox-6.0.0
deleted file mode 100644
index 28cc5e7716e0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.0 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.0 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7d36f1501245b1d788828735c7d455ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.4 b/metadata/md5-cache/app-emulation/virtualbox-6.0.4
new file mode 100644
index 000000000000..832ffaf44664
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=30c46e9e0160bffe320d5063e1f46e66
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.26 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.26
new file mode 100644
index 000000000000..f885f253d646
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.26/VBoxGuestAdditions_5.2.26.iso
+_md5_=e697797f7cd34a655b887c25856ae439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.0 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.0
deleted file mode 100644
index 2ea36b93f98b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.0/VBoxGuestAdditions_6.0.0.iso
-_md5_=4accbce58b6445b6f648f0b9f2294536
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.4 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.4
new file mode 100644
index 000000000000..723f902340d3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.4/VBoxGuestAdditions_6.0.4.iso
+_md5_=7fb05fb584defd089dcca5df3be13f9e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460
index 08262f473ef1..eb65c649e2ae 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22-126460-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22-126460-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.22/Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.22/VirtualBoxSDK-5.2.22-126460.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48e8256401ec409fe646f18dd5762b4b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
index 3694a2247cc9..77af070fb6bd 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24-128163-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24-128163-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.24/Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBoxSDK-5.2.24-128163.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79dadbe62585534b0491b914139f88d1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414
new file mode 100644
index 000000000000..7d13864b5ecb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.26 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26-128414-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26-128414-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.26/Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBoxSDK-5.2.26-128414.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79dadbe62585534b0491b914139f88d1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566
deleted file mode 100644
index d30dfb81adc9..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-6.0.0 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0-127566-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.0/Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.0/VirtualBoxSDK-6.0.0-127566.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=93f20017b835627aca32358227cf90fb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
index 0df07c988ca1..a9bd0c81f404 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.2/VirtualBox-6.0.2-128162-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.2/Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.2/VirtualBoxSDK-6.0.2-128162.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=93f20017b835627aca32358227cf90fb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.4.128413 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.4.128413
new file mode 100644
index 000000000000..fd0352f34067
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.4.128413
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-6.0.4 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4-128413-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.4/Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.4/VirtualBoxSDK-6.0.4-128413.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=93f20017b835627aca32358227cf90fb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.26.128414 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.26.128414
new file mode 100644
index 000000000000..004569480a30
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.26.128414
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.2.26
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.26/Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=751667edca637916b127d6edf32f380f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.0.127566 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.0.127566
deleted file mode 100644
index f3535d4dd617..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.0.127566
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-6.0.0
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.0/Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a4d9b3445cf4000f43348011562596d1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.4.128413 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.4.128413
new file mode 100644
index 000000000000..1fec055e027f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.4.128413
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-6.0.4
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.4/Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5d58e9732f1ac2629bd2814f42da839b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.26 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.26
new file mode 100644
index 000000000000..434edd0f4376
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.26
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a770a42ad258811deee46a5355322f61
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.0 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.0
deleted file mode 100644
index c4ab44d3d1d8..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=X kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c7e482c8de5e6c33499b419543efe220
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.4 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.4
new file mode 100644
index 000000000000..28b5b77b3337
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bded1543cb19b925f9742155c42a61ec
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.26 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.26
new file mode 100644
index 000000000000..655ae4926857
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.26.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c210b247d11681c3ac34a330572aa81d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.0 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.0
deleted file mode 100644
index 57f5c5455f3f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=7
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.0.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5dd7e018ff82c51153266155c84fbe81
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.4 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.4
new file mode 100644
index 000000000000..1a9ab7b5b9ab
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.0.4.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6daaa9b032c655fed3eae07cbb451483
diff --git a/metadata/md5-cache/app-emulation/wine-any-4.0 b/metadata/md5-cache/app-emulation/wine-any-4.0
index b01531fd131b..99363df9e25e 100644
--- a/metadata/md5-cache/app-emulation/wine-any-4.0
+++ b/metadata/md5-cache/app-emulation/wine-any-4.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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.0
 SRC_URI=https://dl.winehq.org/wine/source/4.0/wine-4.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.0.tar.gz -> wine-staging-4.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-4.0.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=833cb8404d9ac53ecc7855e5712fc452
+_md5_=ab338163a753d3e17f622004b91aecb6
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index 8e07be23c871..632e1afa2cfb 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b8f98a9b04cbc0c129191d88756ac7c9
+_md5_=d18d560e12876b0865fc557fa66934bb
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-4.0 b/metadata/md5-cache/app-emulation/wine-d3d9-4.0
index 8beb3361b91c..fbf5a1878155 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-4.0
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-4.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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.0
 SRC_URI=https://dl.winehq.org/wine/source/4.0/wine-4.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-4.0.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8f8e7ec9e2236a8585e5a28fa05afd43
+_md5_=b4ffb7a52b15e7fbf2c8e6bf3c214e8c
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index 55ffa8b5e833..5b7468af2cd8 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b5b38fa47fe27807c680f7b675712b85
+_md5_=41fae9bc9648a514eff10e220a7a0f18
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.7.5 b/metadata/md5-cache/app-emulation/wine-mono-4.7.5
new file mode 100644
index 000000000000..a099cf8ef467
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-mono-4.7.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=!!app-emulation/wine:0
+DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
+SLOT=4.7.5
+SRC_URI=https://dl.winehq.org/wine/wine-mono/4.7.5/wine-mono-4.7.5.msi
+_md5_=d7e7b8c2ae553ead844619e357359a3b
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.0 b/metadata/md5-cache/app-emulation/wine-staging-4.0
index 7f07de6de823..cb33b2a44e5a 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-4.0
+++ b/metadata/md5-cache/app-emulation/wine-staging-4.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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.0
 SRC_URI=https://dl.winehq.org/wine/source/4.0/wine-4.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.0.tar.gz -> wine-staging-4.0.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f6e1a889ff8a398b8bc61a350b70475
+_md5_=82e15d789b67359da769c3b376769cef
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 0facf9219af8..a2b91b61ff43 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a66ed15367d4e6f1790a15828a048fb0
+_md5_=fa59b504574a60c7c9b0fe87d190729b
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.0 b/metadata/md5-cache/app-emulation/wine-vanilla-4.0
index cfd7edd6dd96..1925d95f10ab 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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.0
 SRC_URI=https://dl.winehq.org/wine/source/4.0/wine-4.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=907a7b1563261488da985a9cd71a8fa2
+_md5_=6ab331cd1f557a0f92ac7c098fdcbc31
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 870cd0e9dd12..6a0ccd3c88b9 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.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 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) 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=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3e7ca56f241e272fc58c76d1c66474ec
+_md5_=50bc4859c4ab7590c12bcdeb5379f072
diff --git a/metadata/md5-cache/app-emulation/winetricks-20181203 b/metadata/md5-cache/app-emulation/winetricks-20181203
new file mode 100644
index 000000000000..6c9d7fbfcf65
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/winetricks-20181203
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst test unpack
+DEPEND=test? ( dev-python/bashate dev-util/checkbashisms dev-util/shellcheck ) >=sys-apps/sed-4
+DESCRIPTION=Easy way to install DLLs needed to work around problems in Wine
+EAPI=6
+HOMEPAGE=https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks
+IUSE=gtk kde rar test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+SLOT=0
+SRC_URI=https://github.com/Winetricks/winetricks/archive/20181203.tar.gz -> winetricks-20181203.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	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6335b3d699a1c6cbdda93f4e90ca75fd
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index e4fd81f734b0..44c9d9fb37d5 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-postgresql-2.4 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
index 15b87860d4f6..ae21114e3b4c 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.4.tbz2
-_md5_=db290dffdd2ae791e48258890c16adbb
+_md5_=5ebf6d3aabcd61c14b4587fffc37c528
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index e14c0ba882da..b807c1d7a772 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.51 b/metadata/md5-cache/app-forensics/chkrootkit-0.51
deleted file mode 100644
index ab2b497ba857..000000000000
--- a/metadata/md5-cache/app-forensics/chkrootkit-0.51
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Tool to locally check for signs of a rootkit
-EAPI=6
-HOMEPAGE=http://www.chkrootkit.org/
-IUSE=+cron
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD-2
-RDEPEND=cron? ( virtual/cron )
-SLOT=0
-SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.51.tar.gz -> chkrootkit-0.51.tar https://dev.gentoo.org/~polynomial-c/chkrootkit-0.51-gentoo.diff.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9399b2ba724fb5281abd868d8674317
diff --git a/metadata/md5-cache/app-forensics/openscap-1.2.13 b/metadata/md5-cache/app-forensics/openscap-1.2.13
deleted file mode 100644
index 56f05fd70575..000000000000
--- a/metadata/md5-cache/app-forensics/openscap-1.2.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep )
-DESCRIPTION=Framework which enables integration with Security Content Automation Protocol
-EAPI=5
-HOMEPAGE=http://www.open-scap.org/
-IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenSCAP/openscap/releases/download/1.2.13/openscap-1.2.13.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09f30008cce5cc3bd8459e7f35814d54
diff --git a/metadata/md5-cache/app-forensics/openscap-1.2.5 b/metadata/md5-cache/app-forensics/openscap-1.2.5
deleted file mode 100644
index 43b66f7d8ff6..000000000000
--- a/metadata/md5-cache/app-forensics/openscap-1.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) test? ( app-arch/unzip dev-perl/XML-XPath net-misc/ipcalc sys-apps/grep )
-DESCRIPTION=Framework which enables integration with Security Content Automation Protocol
-EAPI=5
-HOMEPAGE=http://www.open-scap.org/
-IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/o/p/openscap/openscap-1.2.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49d8ef7ab1046c669c2418046db2797e
diff --git a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.4 b/metadata/md5-cache/app-forensics/ovaldi-5.10.1.4
deleted file mode 100644
index 9d0cd8dbda74..000000000000
--- a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) sys-apps/sed
-DESCRIPTION=Free implementation of OVAL
-EAPI=5
-HOMEPAGE=http://oval.mitre.org/language/interpreter.html
-IUSE=acl ldap selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://sourceforge/ovaldi/ovaldi-5.10.1.4-src.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4053666047ffadfc188964cd01e7974
diff --git a/metadata/md5-cache/app-forensics/yasat-526 b/metadata/md5-cache/app-forensics/yasat-526
deleted file mode 100644
index 4c56bae5bb39..000000000000
--- a/metadata/md5-cache/app-forensics/yasat-526
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Security and system auditing tool
-EAPI=5
-HOMEPAGE=http://yasat.sourceforge.net
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=mirror://sourceforge/yasat/yasat-526.tar.gz
-_md5_=9e3bca77622cc71b6d6cbcb81f975f7d
diff --git a/metadata/md5-cache/app-forensics/yasat-700 b/metadata/md5-cache/app-forensics/yasat-700
deleted file mode 100644
index 9e0ecd65a984..000000000000
--- a/metadata/md5-cache/app-forensics/yasat-700
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Security and system auditing tool
-EAPI=5
-HOMEPAGE=http://yasat.sourceforge.net
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=mirror://sourceforge/yasat/yasat-700.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=483b512d5efad9c2baab79f515c6fa5e
diff --git a/metadata/md5-cache/app-forensics/yasat-755 b/metadata/md5-cache/app-forensics/yasat-755
deleted file mode 100644
index bad3783067d7..000000000000
--- a/metadata/md5-cache/app-forensics/yasat-755
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Security and system auditing tool
-EAPI=5
-HOMEPAGE=http://yasat.sourceforge.net
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=mirror://sourceforge/yasat/yasat-755.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b75290b8546c2209707aea6908fcb8e3
diff --git a/metadata/md5-cache/app-forensics/yasat-839 b/metadata/md5-cache/app-forensics/yasat-839
deleted file mode 100644
index 65ae09e3e3e5..000000000000
--- a/metadata/md5-cache/app-forensics/yasat-839
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Security and system auditing tool
-EAPI=5
-HOMEPAGE=http://yasat.sourceforge.net
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=mirror://sourceforge/yasat/yasat-839.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b75290b8546c2209707aea6908fcb8e3
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index f0684c0827e6..1c60d8c87900 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/cstools-3.42 b/metadata/md5-cache/app-i18n/cstools-3.42
index 43055ee5a419..0c843eb2d8d7 100644
--- a/metadata/md5-cache/app-i18n/cstools-3.42
+++ b/metadata/md5-cache/app-i18n/cstools-3.42
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/MIME-tools dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://www.adelton.com/perl/Cstools/Cstools-3.42.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21872550f3204c7aeb709f22a4917233
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.19 b/metadata/md5-cache/app-i18n/ibus-1.5.19
index 82b3e913d4ac..f0a877c2264d 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.19
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data ) >=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-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] ) dev-util/glib-utils dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data ) >=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-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=6
 HOMEPAGE=https://github.com/ibus/ibus/wiki
@@ -11,4 +11,4 @@ REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python
 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	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9d5ffb37d7af43bab6042e24ac8d00a3
+_md5_=aa969ec908ef79d1ab222915ae9e4cea
diff --git a/metadata/md5-cache/app-i18n/man-pages-fr-3.70 b/metadata/md5-cache/app-i18n/man-pages-fr-3.70
index 0e1e2ce2192b..c5e22a12153b 100644
--- a/metadata/md5-cache/app-i18n/man-pages-fr-3.70
+++ b/metadata/md5-cache/app-i18n/man-pages-fr-3.70
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A somewhat comprehensive collection of french Linux man pages
 EAPI=6
 HOMEPAGE=https://traduc.org/perkamon
-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 FDL-1.1 FDL-1.2 GPL-2 GPL-2+
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4119/man-pages-fr-3.70-1.tar.xz
-_md5_=d1568ecfa0bf68b65eb7459c85b31297
+_md5_=8042f42aa919340a8ac0933dbae7aeb6
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-4.00 b/metadata/md5-cache/app-i18n/man-pages-it-4.00
index 1fec8c47cdc8..5f7bc9b36d52 100644
--- a/metadata/md5-cache/app-i18n/man-pages-it-4.00
+++ b/metadata/md5-cache/app-i18n/man-pages-it-4.00
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
 EAPI=5
 HOMEPAGE=http://it.tldp.org/man/
-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=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-4.00.tar.xz
-_md5_=4feea08f9ad69ea3e3064849b2be7ce5
+_md5_=cf4979df6c5b5fb07c3c7944c6c52c5e
diff --git a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2 b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
index 342c89a70240..1f32952874c0 100644
--- a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
+++ b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
 EAPI=6
 HOMEPAGE=https://github.com/man-pages-zh/manpages-zh
-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=FDL-1.2
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://github.com/man-pages-zh/manpages-zh/archive/v1.6.3.2.tar.gz -> man-pages-zh_CN-1.6.3.2.tar.gz
-_md5_=29cf44298bd28c2a3361751f8c379d04
+_md5_=1b6ae22f07849b2466b2dfa3afa36e28
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.10 b/metadata/md5-cache/app-i18n/transifex-client-0.10
deleted file mode 100644
index 1c21fccd4a55..000000000000
--- a/metadata/md5-cache/app-i18n/transifex-client-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_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 command line interface for Transifex
-EAPI=5
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/transifex/transifex-client/archive/0.10.tar.gz -> transifex-client-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b720f5f364dd6ee5a6af760a0f3c844e
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.2 b/metadata/md5-cache/app-i18n/transifex-client-0.12.2
deleted file mode 100644
index e55a0a509f5c..000000000000
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A command line interface for Transifex
-EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.2.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24f9995512dccd732924d9fa0b5d4477
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index fe2fa19e5756..6c47d2ca6a50 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/collectd-5.8.1 b/metadata/md5-cache/app-metrics/collectd-5.8.1
index abbaee0c91c0..8ef04ea5a05c 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.8.1
+++ b/metadata/md5-cache/app-metrics/collectd-5.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Collects system statistics and provides mechanisms to store the valu
 EAPI=6
 HOMEPAGE=https://collectd.org/
 IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm x86
+KEYWORDS=alpha amd64 arm x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
 RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/libmysqlclient:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org/files/collectd-5.8.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=77d296c5adc3939a10e978b7debe395e
+_md5_=90714aa9118e43775aa5e876ea20186b
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.7.0 b/metadata/md5-cache/app-metrics/prometheus-2.7.0
new file mode 100644
index 000000000000..aef7a6956c21
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.9
+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.7.0.tar.gz -> prometheus-2.7.0.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a23b3e3df4a881baaa6fbf0c201ec96c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 83a448f1ee94..0d8747a100aa 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/beancounter-0.8.10-r1 b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
index 8c9218ac39bf..d70c1b3ce993 100644
--- a/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
+++ b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/beancounter/beancounter_0.8.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93e01a44c03ac03769c4e3acd30f8eb0
diff --git a/metadata/md5-cache/app-misc/cdctl-0.16 b/metadata/md5-cache/app-misc/cdctl-0.16
index 44d329f452f2..cbacf591b3fc 100644
--- a/metadata/md5-cache/app-misc/cdctl-0.16
+++ b/metadata/md5-cache/app-misc/cdctl-0.16
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Utility to control your cd/dvd drive
 EAPI=5
 HOMEPAGE=http://cdctl.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=free-noncomm
 SLOT=0
 SRC_URI=mirror://sourceforge/cdctl/cdctl-0.16.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12ee92e16bf944442e3947f992ffb3bc
+_md5_=1dfad3413d00377cef9ca30805e724c9
diff --git a/metadata/md5-cache/app-misc/conmux-0.15.1-r3 b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
index 6b05ab38154f..04ecd855ce30 100644
--- a/metadata/md5-cache/app-misc/conmux-0.15.1-r3
+++ b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/IO-Multiplex dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/conmux-0.15.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8280378113f25868b549af4eec4dc06a
diff --git a/metadata/md5-cache/app-misc/fhem-5.8 b/metadata/md5-cache/app-misc/fhem-5.8
deleted file mode 100644
index 2f2db3cb7892..000000000000
--- a/metadata/md5-cache/app-misc/fhem-5.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=media-gfx/pngcrush
-DESCRIPTION=A GPL'd perl server for house automation
-EAPI=6
-HOMEPAGE=https://www.fhem.de/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-perl/Crypt-CBC dev-perl/Device-SerialPort dev-perl/Digest-CRC dev-perl/JSON
-SLOT=0
-SRC_URI=https://www.fhem.de/fhem-5.8.tar.gz
-_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=64917f4f8d3f6b460d27ba25fdb1f617
diff --git a/metadata/md5-cache/app-misc/flirc-3.11.6 b/metadata/md5-cache/app-misc/flirc-3.11.6
index 057d2f688ca6..652ea867865d 100644
--- a/metadata/md5-cache/app-misc/flirc-3.11.6
+++ b/metadata/md5-cache/app-misc/flirc-3.11.6
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://packagecloud.io/Flirc/repo/packages/ubuntu/artful/flirc_3.11.6_amd64.deb/download.deb -> flirc-3.11.6_amd64.deb ) arm? ( https://packagecloud.io/Flirc/repo/packages/debian/stretch/flirc_3.11.6_armhf.deb/download.deb -> flirc-3.11.6_armhf.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=bfaf6c6aca5976790a5c289f9acb7656
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
index 2b520f808709..0bdb55b016f0 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 per
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d525e5f7e352abed194a778c8749e38
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
index 4d79f96d5885..970284588841 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r21
@@ -9,5 +9,5 @@ RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-1.2 perl
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c704f6638b909432d5f6e7e39b369675
diff --git a/metadata/md5-cache/app-misc/g15daemon-9999 b/metadata/md5-cache/app-misc/g15daemon-9999
index bb7440f4e0ea..4e6a702c4472 100644
--- a/metadata/md5-cache/app-misc/g15daemon-9999
+++ b/metadata/md5-cache/app-misc/g15daemon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) 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? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f86fcc3e254caa6926c0ed7729ed022c
diff --git a/metadata/md5-cache/app-misc/jail-2.0-r4 b/metadata/md5-cache/app-misc/jail-2.0-r4
index cde48a1100de..84d612cc7fd3 100644
--- a/metadata/md5-cache/app-misc/jail-2.0-r4
+++ b/metadata/md5-cache/app-misc/jail-2.0-r4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Builds a chroot and configures all the required files, directories and libraries
 EAPI=7
 HOMEPAGE=https://github.com/spiculator/jail
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-util/strace
 SLOT=0
 SRC_URI=https://github.com/spiculator/jail/archive/v2.0.tar.gz -> jail-2.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=18caa0d92fe06f733f8ca5c2430f6b48
+_md5_=1c46f8578543ebeffca888a9904c054f
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0
new file mode 100644
index 000000000000..fe919701fe0b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khard-0.13.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ruamel-yaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/vobject-0.9.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Console CardDAV client
+EAPI=7
+HOMEPAGE=https://github.com/scheibler/khard
+IUSE=test zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=dev-python/atomicwrites[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ruamel-yaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/vobject-0.9.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7b0f616a9738de4c844598c27e8e4051
diff --git a/metadata/md5-cache/app-misc/mkcert-1.0.1 b/metadata/md5-cache/app-misc/mkcert-1.0.1
deleted file mode 100644
index cf4601cf92fa..000000000000
--- a/metadata/md5-cache/app-misc/mkcert-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A zero-config tool to make locally trusted development certificates
-EAPI=6
-HOMEPAGE=https://github.com/FiloSottile/mkcert
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/FiloSottile/mkcert/archive/v1.0.1.tar.gz -> mkcert-1.0.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=42b0d5d182d8da81e06fb7b8e821a4c2
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r1 b/metadata/md5-cache/app-misc/note-1.3.3-r1
index 5cb6498477df..1f90acd205c7 100644
--- a/metadata/md5-cache/app-misc/note-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/note-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/note-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5c176a29e116c418090423f9e0ae9fa
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.6 b/metadata/md5-cache/app-misc/openastro-data-1.6
deleted file mode 100644
index f8f9485b491d..000000000000
--- a/metadata/md5-cache/app-misc/openastro-data-1.6
+++ /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=OpenAstro data files, ephemeris, famous people database, geo database
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.6.orig.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1eb1d7549b8bd3e7664361d367c7e4bc
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.7 b/metadata/md5-cache/app-misc/openastro-data-1.7
deleted file mode 100644
index 9c0f0d2c595a..000000000000
--- a/metadata/md5-cache/app-misc/openastro-data-1.7
+++ /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=OpenAstro data files, ephemeris, famous people database, geo database
-EAPI=6
-HOMEPAGE=http://openastro.org
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/openastro.org-data/openastro.org-data_1.7.orig.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=67b6ffeef836bfddcdd5c3e88f3a2364
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.3 b/metadata/md5-cache/app-misc/pax-utils-1.2.3
index e2c1a85341a0..3f4725ac5b51 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.3
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( dev-python/pyelftools ) seccomp? ( sys-libs/libseccomp )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9e75fff8e55217dbefb7874eedd12720
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3 b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
index 328f4b2ea3f4..39d51a51e2f8 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b22018f130fa8a69c2b69f8dc1d7e62
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.4 b/metadata/md5-cache/app-misc/pax-utils-1.2.4
index cf37e4e500f1..5fd8df791c78 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.4
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.4.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.4.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=d967f734b743bc7d76748edcc271c182
diff --git a/metadata/md5-cache/app-misc/pfm-2.12.3 b/metadata/md5-cache/app-misc/pfm-2.12.3
index 82ca8359b233..0c96166dc184 100644
--- a/metadata/md5-cache/app-misc/pfm-2.12.3
+++ b/metadata/md5-cache/app-misc/pfm-2.12.3
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build(-)]
 DESCRIPTION=A terminal-based file manager written in Perl
 EAPI=5
 HOMEPAGE=http://p-f-m.sourceforge.net/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 s390 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8 >=dev-perl/File-Stat-Bits-1.10.0 >=dev-perl/HTML-Parser-3.59 >=dev-perl/libwww-perl-5.827 >=dev-perl/Term-ReadLine-Gnu-1.09 >=dev-perl/Term-Screen-1.30.0 >=dev-perl/Term-ScreenColor-1.130.0 sys-libs/ncurses sys-libs/readline >=virtual/perl-File-Temp-0.22 >=virtual/perl-Module-Load-0.16 dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/p-f-m/pfm-2.12.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3787b577d2db9956fbc42705fcc28419
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f51feda7b5015e456a0e6d62367e13d2
diff --git a/metadata/md5-cache/app-misc/physlock-0.5 b/metadata/md5-cache/app-misc/physlock-0.5
deleted file mode 100644
index 143bf1afdd5a..000000000000
--- a/metadata/md5-cache/app-misc/physlock-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=lightweight Linux console locking tool
-EAPI=5
-HOMEPAGE=https://github.com/muennich/physlock
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v0.5.tar.gz -> physlock-0.5.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d351768df469753b5a54431c56b5c1ba
diff --git a/metadata/md5-cache/app-misc/pip-1.2-r2 b/metadata/md5-cache/app-misc/pip-1.2-r2
index 1847f13a4006..505342d8cee2 100644
--- a/metadata/md5-cache/app-misc/pip-1.2-r2
+++ b/metadata/md5-cache/app-misc/pip-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://membled.com/work/apps/pip/pip-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b486b89a9a8b7761d179fed6af838eb2
diff --git a/metadata/md5-cache/app-misc/prog-express-3.7.8-r1 b/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
index 28c1a32bf2cb..172e43871057 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
+++ b/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=1119ecbcc86f9062850492023099e55c
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.10-r1 b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
index a4950eff3955..a14af0e550a2 100644
--- a/metadata/md5-cache/app-misc/smtm-1.6.10-r1
+++ b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b712cd565f594542b15252943bfc602a
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.16.12.29 b/metadata/md5-cache/app-misc/trash-cli-0.16.12.29
deleted file mode 100644
index 9fd47f3599c8..000000000000
--- a/metadata/md5-cache/app-misc/trash-cli-0.16.12.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-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=Python scripts to manipulate trash cans via the command line
-EAPI=5
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-IUSE=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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/tarball/0.16.12.29 -> trash-cli-0.16.12.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=80f5c55bffcc8b936e5d1a411582f200
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14
deleted file mode 100644
index 05e71a50e7a5..000000000000
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-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=Python scripts to manipulate trash cans via the command line
-EAPI=6
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-IUSE=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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/archive/0.17.1.14.tar.gz -> trash-cli-0.17.1.14.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43d590eb9a1f3355dc04819ff62ee392
diff --git a/metadata/md5-cache/app-misc/vzstats-0.3.2 b/metadata/md5-cache/app-misc/vzstats-0.3.2
deleted file mode 100644
index 9980d0d706dd..000000000000
--- a/metadata/md5-cache/app-misc/vzstats-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-DESCRIPTION=OpenVZ stats collection daemon
-EAPI=5
-HOMEPAGE=http://stats.openvz.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzstats/0.3.2/src/vzstats-0.3.2.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b5fc00b15782061c2d5b07e5233f9488
diff --git a/metadata/md5-cache/app-misc/vzstats-0.4 b/metadata/md5-cache/app-misc/vzstats-0.4
deleted file mode 100644
index 828bb5eeb411..000000000000
--- a/metadata/md5-cache/app-misc/vzstats-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-DESCRIPTION=OpenVZ stats collection daemon
-EAPI=5
-HOMEPAGE=http://stats.openvz.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/cron sys-process/cronbase net-misc/curl[ssl] app-portage/gentoolkit sys-cluster/vzctl
-SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzstats/0.4/src/vzstats-0.4.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b5fc00b15782061c2d5b07e5233f9488
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 29074adebb72..bd277f4b7525 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.43 b/metadata/md5-cache/app-mobilephone/wammu-0.43
deleted file mode 100644
index 5aeb8e301265..000000000000
--- a/metadata/md5-cache/app-mobilephone/wammu-0.43
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_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=Front-end for gammu to access mobile phones easily
-EAPI=6
-HOMEPAGE=http://www.wammu.eu/
-IUSE=bluetooth gnome python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_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://dl.cihar.com/wammu/v0/wammu-0.43.tar.xz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29d2e5a448d5a24fc02c4482fff6f1d0
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index ea3f673917e8..2597a0a16722 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/QtBitcoinTrader-1.10.01 b/metadata/md5-cache/app-office/QtBitcoinTrader-1.10.01
deleted file mode 100644
index e6f52636e633..000000000000
--- a/metadata/md5-cache/app-office/QtBitcoinTrader-1.10.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5
-DESCRIPTION=Mt.Gox and BTC-e Bitcoin Trading Client
-EAPI=5
-HOMEPAGE=https://github.com/JulyIGHOR/QtBitcoinTrader
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5
-SLOT=0
-SRC_URI=https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v1.10.01.tar.gz -> QtBitcoinTrader-1.10.01.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=abdd74d914afa31677016c4b03a73acb
diff --git a/metadata/md5-cache/app-office/QtBitcoinTrader-9999 b/metadata/md5-cache/app-office/QtBitcoinTrader-9999
deleted file mode 100644
index ff13c7322983..000000000000
--- a/metadata/md5-cache/app-office/QtBitcoinTrader-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Mt.Gox and BTC-e Bitcoin Trading Client
-EAPI=5
-HOMEPAGE=https://github.com/JulyIGHOR/QtBitcoinTrader
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5
-SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abdd74d914afa31677016c4b03a73acb
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.3 b/metadata/md5-cache/app-office/kmymoney-5.0.3
new file mode 100644
index 000000000000..192f8d805cd0
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.52.0:5 ) addressbook? ( >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.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.52.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.52.0:5 >=dev-qt/qtwebkit-5.9.1: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_4(-),-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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Personal finance manager based on KDE Frameworks
+EAPI=6
+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
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.52.0:5 ) addressbook? ( >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.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.52.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.52.0:5 >=dev-qt/qtwebkit-5.9.1: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_4(-),-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_4(-),-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.52.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.3/src/kmymoney-5.0.3.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=adf8ccb9ffc9264f32ad5ea98517273b
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.5.1 b/metadata/md5-cache/app-office/libreoffice-6.1.5.1
deleted file mode 100644
index c15bdd4a2a5d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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.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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool =dev-util/mdds-1.3*:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=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-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.1*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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.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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/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_4 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_4? ( python_targets_python3_4 ) 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 ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.1.5.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.1.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.5//libreoffice-6.1.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.5//libreoffice-help-6.1.5.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.5.1/src/libreoffice-6.1.5.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.5.1/src/libreoffice-help-6.1.5.1.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	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3fc86bf9f3bd0758a64f0a5785e71bdc
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.5.2 b/metadata/md5-cache/app-office/libreoffice-6.1.5.2
new file mode 100644
index 000000000000..9c9b0f78640d
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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.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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool =dev-util/mdds-1.3*:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=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-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.1*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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.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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/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_4 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_4? ( python_targets_python3_4 ) 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 ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.1.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.5//libreoffice-6.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.5//libreoffice-help-6.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.5.2/src/libreoffice-6.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.5.2/src/libreoffice-help-6.1.5.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	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e07ec03ec798716abf9cd74c798a194a
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.0.3 b/metadata/md5-cache/app-office/libreoffice-6.2.0.3
index 7ec6fc3f4f7a..d12509e5157f 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.0.3
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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/mysql-connector-c 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 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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) 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/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=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-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 ) 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/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=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-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde +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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 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_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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/mysql-connector-c 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 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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) 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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 ) 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_4 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_4? ( python_targets_python3_4 ) 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-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.0.3.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-6.2.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-help-6.2.0.3.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.3/src/libreoffice-6.2.0.3.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.3/src/libreoffice-help-6.2.0.3.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 )
+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.0.3-patchset-02.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.0.3.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-6.2.0.3.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-help-6.2.0.3.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.3/src/libreoffice-6.2.0.3.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.3/src/libreoffice-help-6.2.0.3.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	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a33b37826f0645b97a72b6eb20ddbfb6
+_md5_=9d2bf441b7d7dc1449a2bbb55decef76
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.9999 b/metadata/md5-cache/app-office/libreoffice-6.2.9999
index d6a317d290f1..cdc130f88d79 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.9999
@@ -9,6 +9,6 @@ PDEPEND=!app-office/libreoffice-l10n
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 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 accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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 ) 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_4 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_4? ( python_targets_python3_4 ) 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 ) 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 )
+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.0.3-patchset-02.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	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef813143023d6cfecc3e5ed03bf8f079
+_md5_=6d17aed3fb148880b73a2af056b8b867
diff --git a/metadata/md5-cache/app-office/moneydance-2017.10 b/metadata/md5-cache/app-office/moneydance-2017.10
new file mode 100644
index 000000000000..c7f2ac9f264d
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneydance-2017.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A cross-platform personal finance application
+EAPI=6
+HOMEPAGE=https://moneydance.com/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=amd64? ( https://infinitekind.com/stabledl/2017/Moneydance_linux_amd64.tar.gz -> moneydance-2017.10-amd64.tar.gz ) x86? ( https://infinitekind.com/stabledl/2017/Moneydance_linux_x86.tar.gz -> moneydance-2017.10-x86.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63b2514c41fe51bedb535efbd7fcf369
diff --git a/metadata/md5-cache/app-office/moneydance-2017.8 b/metadata/md5-cache/app-office/moneydance-2017.8
deleted file mode 100644
index bede9d8a7fe0..000000000000
--- a/metadata/md5-cache/app-office/moneydance-2017.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A cross-platform personal finance application
-EAPI=6
-HOMEPAGE=https://moneydance.com/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=amd64? ( https://infinitekind.com/stabledl/current/Moneydance_linux_amd64.tar.gz -> moneydance-2017.8-amd64.tar.gz ) x86? ( https://infinitekind.com/stabledl/current/Moneydance_linux_x86.tar.gz -> moneydance-2017.8-x86.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0c66598cd3a06aa3514b084ebfbb467e
diff --git a/metadata/md5-cache/app-office/moneydance-2019.0 b/metadata/md5-cache/app-office/moneydance-2019.0
new file mode 100644
index 000000000000..0be1ce3bb225
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneydance-2019.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
+DEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 >=dev-java/oracle-jdk-bin-11.0 ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A cross-platform personal finance application
+EAPI=6
+HOMEPAGE=https://moneydance.com/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD CPAL-1.0 CPL-1.0 CSL-2.0 LGPL-2 MIT TIK
+RDEPEND=|| ( >=dev-java/openjdk-bin-11.0 >=dev-java/openjdk-11.0 >=dev-java/oracle-jdk-bin-11.0 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=https://infinitekind.com/stabledl/2019/Moneydance_linux_amd64.tar.gz -> moneydance-2019.0-amd64.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9473431d110f771a8675e97b2cbc9435
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.6 b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
new file mode 100644
index 000000000000..fe3fbb2b7d5d
--- /dev/null
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 dev-lang/python:2.7 >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama sys-apps/findutils >=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Apache OpenOffice productivity suite
+EAPI=6
+HOMEPAGE=https://www.openoffice.org/
+IUSE=gnome java l10n_ast l10n_eu l10n_bg l10n_ca l10n_ca-valencia l10n_zh-CN l10n_zh-TW l10n_cs l10n_da l10n_nl l10n_en-GB l10n_fi l10n_fr l10n_gd l10n_gl l10n_de l10n_el l10n_he l10n_hi l10n_hu l10n_it l10n_ja l10n_km l10n_ko l10n_lt l10n_nb l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_sr l10n_sk l10n_sl l10n_es l10n_sv l10n_ta l10n_th l10n_tr l10n_vi
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+PDEPEND=java? ( >=virtual/jre-1.5 )
+RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 dev-lang/python:2.7 >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_vi.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5dc747a0a3245496194fc545d4a08e3c
diff --git a/metadata/md5-cache/app-office/sc-7.16-r2 b/metadata/md5-cache/app-office/sc-7.16-r2
index 244d6a1b7f48..67dddd0d5d36 100644
--- a/metadata/md5-cache/app-office/sc-7.16-r2
+++ b/metadata/md5-cache/app-office/sc-7.16-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Spreadsheet Calculator
 EAPI=6
 HOMEPAGE=http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc ~x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df5a368a334b1c84ba886c0460951826
+_md5_=8fe5cdeb3653c4bb1fca4e01dfca479f
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5_pre20190124 b/metadata/md5-cache/app-office/scribus-1.5.5_pre20190124
index 42210c67def2..9eb54fd26ec2 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.5_pre20190124
+++ b/metadata/md5-cache/app-office/scribus-1.5.5_pre20190124
@@ -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 ~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_4(-),-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_4(-),-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/1ed85778dd55bcbcfad2bbc276fd4c97f43ad965.tar.gz -> scribus-1.5.5_pre20190124.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32aab0b32fc303491ab2efe2501c90c9
+_md5_=d085ab01b32810774bfe3b1820d2ad7f
diff --git a/metadata/md5-cache/app-office/skrooge-2.17.0 b/metadata/md5-cache/app-office/skrooge-2.17.0
index cd53b08f66b1..5a798043e848 100644
--- a/metadata/md5-cache/app-office/skrooge-2.17.0
+++ b/metadata/md5-cache/app-office/skrooge-2.17.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.17.0.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=70771167f1b40a4a026614b3dba06aa0
+_md5_=ec289cbcf9cb5c21e40ef6e93565b344
diff --git a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580 b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
index 635cde2956d9..d16868e7468f 100644
--- a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
+++ b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
@@ -7,5 +7,5 @@ LICENSE=worklog-assistant
 RESTRICT=fetch bindist strip
 SLOT=0
 SRC_URI=https://worklogassistant.com/downloads/worklog-assistant-v2_2.1.3580_amd64.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=ddef9d08d29a671e81a22fd0b6301d14
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index b2d6e054f3fd..1a274d4e038d 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/gnupod-0.99.8-r1 b/metadata/md5-cache/app-pda/gnupod-0.99.8-r1
index 7ae587f2a128..c5c0c16305fb 100644
--- a/metadata/md5-cache/app-pda/gnupod-0.99.8-r1
+++ b/metadata/md5-cache/app-pda/gnupod-0.99.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( virtual/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7c232f61364d84a9e4b555c27ca88d0
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
index b376d3dbf2ed..2082555d8207 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= virtual/libiconv bluetooth? (
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ebacfedb8041f09fcb0c9d3ceeb496c4
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
index 39385127610c..8cdc1036156e 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-6:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python_targets_python2_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:= java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=281139909e9bf542ad34685cca4f05f0
+_md5_=4e88e522bf39a02811fbd57b1d841c19
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 6875204c5c12..be33f875d507 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/g-cpan-0.16.5 b/metadata/md5-cache/app-portage/g-cpan-0.16.5
index ea25409eb70e..d34490d004e5 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.5
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.5
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl >=dev-perl/YAML-0.60 dev-perl/Shell-EnvImporter dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/g-cpan-0.16.5.tar.gz https://dev.gentoo.org/~chainsaw/distfiles/g-cpan-0.16.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d03c0b0242ece298db89121d49a4a0d4
diff --git a/metadata/md5-cache/app-portage/g-cpan-0.16.6 b/metadata/md5-cache/app-portage/g-cpan-0.16.6
index 8abd213753d6..396d9e99f6af 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.6
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.6
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl >=dev-perl/YAML-0.60 >=dev-perl/Shell-EnvImporter-1.70.0-r2 dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/g-cpan-0.16.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cca627dfd0cbc097895684d811b1d329
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.74 b/metadata/md5-cache/app-portage/portage-utils-0.74
index 367c49800c98..66dcacdaa731 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.74
+++ b/metadata/md5-cache/app-portage/portage-utils-0.74
@@ -4,10 +4,10 @@ DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.74.tar.xz https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.74.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=30112f96ce85bd0aa3e7ff7c3c3f53e9
+_md5_=cbff0ed960bd3b0e642d855f34852653
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c445c5b26a95..f82bc2431295 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-4.4_p23-r1 b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
index eb9be24d6e3c..431ae1433acf 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r1
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=6
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a0a03fb7d062eb171988f33031983eb
+_md5_=af9b923f88be4ff746db808c2de539bd
diff --git a/metadata/md5-cache/app-shells/fzy-1.0 b/metadata/md5-cache/app-shells/fzy-1.0
index 880eb5988fa1..c35968d08c99 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0
+++ b/metadata/md5-cache/app-shells/fzy-1.0
@@ -3,9 +3,9 @@ DESCRIPTION=Fuzzy text selector (interactive grep) for console
 EAPI=6
 HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
-KEYWORDS=amd64 ~arm x86
+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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6349fda5982e592f11687577ad41f0c2
+_md5_=956c351c64c85fcc9a0ede0006e7ca0e
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index b822db2077db..03a330653b0e 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -7,4 +7,4 @@ IUSE=test savedconfig
 LICENSE=MIT
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6349fda5982e592f11687577ad41f0c2
+_md5_=956c351c64c85fcc9a0ede0006e7ca0e
diff --git a/metadata/md5-cache/app-shells/loksh-6.4 b/metadata/md5-cache/app-shells/loksh-6.4
index 296fc8c5d63c..0989f057a3d4 100644
--- a/metadata/md5-cache/app-shells/loksh-6.4
+++ b/metadata/md5-cache/app-shells/loksh-6.4
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Linux port of OpenBSD's ksh
 EAPI=7
 HOMEPAGE=https://github.com/dimkr/loksh
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0= !app-shells/ksh
 SLOT=0
 SRC_URI=https://github.com/dimkr/loksh/archive/6.4.tar.gz -> loksh-6.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=00b964763252285004129456bc914704
+_md5_=0051e0f604b7e34f51e11938400887c7
diff --git a/metadata/md5-cache/app-shells/mksh-52 b/metadata/md5-cache/app-shells/mksh-52
deleted file mode 100644
index 0c8dddeb516d..000000000000
--- a/metadata/md5-cache/app-shells/mksh-52
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=static? ( dev-libs/klibc )
-DESCRIPTION=MirBSD KSH Shell
-EAPI=5
-HOMEPAGE=http://mirbsd.de/mksh
-IUSE=static
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R52.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ccac21b3886e6e69013ed5b850522a4
diff --git a/metadata/md5-cache/app-shells/mksh-52c b/metadata/md5-cache/app-shells/mksh-52c
deleted file mode 100644
index 29d484017765..000000000000
--- a/metadata/md5-cache/app-shells/mksh-52c
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test
-DEPEND=static? ( dev-libs/klibc )
-DESCRIPTION=MirBSD KSH Shell
-EAPI=5
-HOMEPAGE=http://mirbsd.de/mksh
-IUSE=static
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R52c.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef0b22205e1a51e5a9437bbf0d1d8c69
diff --git a/metadata/md5-cache/app-shells/zsh-5.7-r1 b/metadata/md5-cache/app-shells/zsh-5.7-r1
new file mode 100644
index 000000000000..37fa178a3d2a
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-5.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/groff >=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
+DESCRIPTION=UNIX Shell similar to the Korn shell
+EAPI=7
+HOMEPAGE=https://www.zsh.org/
+IUSE=caps debug doc examples gdbm maildir pcre static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ZSH gdbm? ( GPL-2 )
+PDEPEND=examples? ( app-doc/zsh-lovers )
+RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
+SLOT=0
+SRC_URI=https://www.zsh.org/pub/zsh-5.7.tar.xz https://www.zsh.org/pub/old/zsh-5.7.tar.xz mirror://sourceforge/zsh/zsh-5.7.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.7-doc.tar.xz mirror://sourceforge/zsh/zsh-5.7-doc.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d2bf05cb1e64b3bde0f422cf38953d17
diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999
index 17d4225f12f0..4c7756dc12e3 100644
--- a/metadata/md5-cache/app-shells/zsh-9999
+++ b/metadata/md5-cache/app-shells/zsh-9999
@@ -10,4 +10,4 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c4c514ac9a97d9173d0b2d0e2c2702ea
+_md5_=54d84097957ff901cbf18d0579890cb6
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index cfd420e2cbb1..cefbc79c7646 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/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index 30b2deaee51a..6fb21234e6d5 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -10,5 +10,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
 RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1be81dbeeef3cb7fb1922c81e09941f7
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r3 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r3
index 08b47a0fbb3e..c17ed97c2691 100644
--- a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r3
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=DSSSL Stylesheets for DocBook
 EAPI=5
 HOMEPAGE=https://github.com/docbook/wiki/wiki
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-text/sgml-common app-text/docbook-sgml-dtd:3.0
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-dsssl-1.79.tar.bz2
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	a1731744d7cca1d14638e0e054ceea6e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30f38121e85acba84d7802514fa50fe8
+_md5_=12c0f0def8e09e34a091700b0b4471d0
diff --git a/metadata/md5-cache/app-text/docbook-sgml-1.0 b/metadata/md5-cache/app-text/docbook-sgml-1.0
deleted file mode 100644
index 2ed13b11c404..000000000000
--- a/metadata/md5-cache/app-text/docbook-sgml-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A helper package for sgml docbook
-EAPI=0
-HOMEPAGE=http://www.docbook.org/sgml/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=app-text/sgml-common app-text/openjade >=app-text/docbook-dsssl-stylesheets-1.64 >=app-text/docbook-sgml-utils-0.6.6 ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1
-SLOT=0
-_md5_=96c61cf16e693d1216f4667501dfdb77
diff --git a/metadata/md5-cache/app-text/docbook-sgml-1.0-r1 b/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
index 473f3b496ad0..0afbbc14af68 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A helper package for sgml docbook
 EAPI=7
 HOMEPAGE=https://www.docbook.org/sgml/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=app-text/sgml-common app-text/openjade >=app-text/docbook-dsssl-stylesheets-1.64 >=app-text/docbook-sgml-utils-0.6.6 ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1
 SLOT=0
-_md5_=47797306e6cef68391a153daece446a9
+_md5_=1202666e0eb2db5d3a2b3e73dd1802fd
diff --git a/metadata/md5-cache/app-text/dvipng-1.15-r1 b/metadata/md5-cache/app-text/dvipng-1.15-r1
index ee43ea431234..26f7df96aa29 100644
--- a/metadata/md5-cache/app-text/dvipng-1.15-r1
+++ b/metadata/md5-cache/app-text/dvipng-1.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Translate DVI files into PNG or GIF graphics
 EAPI=6
 HOMEPAGE=http://dvipng.sourceforge.net/
 IUSE=truetype 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 ~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=LGPL-3+ Texinfo-manual
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56ab9dbca64a355dc3b011b39c374673
+_md5_=9ba66a30851c0c84403fa828dd09d2a6
diff --git a/metadata/md5-cache/app-text/enchant-2.2.3 b/metadata/md5-cache/app-text/enchant-2.2.3
new file mode 100644
index 000000000000..33fe10f105ad
--- /dev/null
+++ b/metadata/md5-cache/app-text/enchant-2.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
+DESCRIPTION=Spellchecker wrapping library
+EAPI=6
+HOMEPAGE=https://abiword.github.io/enchant/
+IUSE=aspell +hunspell static-libs test
+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=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
+REQUIRED_USE=|| ( hunspell aspell )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
+_md5_=855bb81296bf70fa83033b18bdf05dec
diff --git a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1 b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
index 8d9871a84ef0..75c97cb5b68b 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2715d1ffbc4e4ab33841d81923078fdc
diff --git a/metadata/md5-cache/app-text/gspell-1.8.1 b/metadata/md5-cache/app-text/gspell-1.8.1
new file mode 100644
index 000000000000..5b9e54aa73e9
--- /dev/null
+++ b/metadata/md5-cache/app-text/gspell-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/iso-codes >=app-text/enchant-2.1.3 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Spell check library for GTK+ applications
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/gspell
+IUSE=+introspection vala test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=LGPL-2.1+
+RDEPEND=app-text/iso-codes >=app-text/enchant-2.1.3 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/gspell/1.8/gspell-1.8.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5e229c07ea2c37ebbefc81edb70466ba
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.10 b/metadata/md5-cache/app-text/gtkspell-3.0.10
new file mode 100644
index 000000000000..d04899960b24
--- /dev/null
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/enchant-2.0.0 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Spell checking widget for GTK
+EAPI=6
+HOMEPAGE=http://gtkspell.sourceforge.net/
+IUSE=+introspection vala
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-text/enchant-2.0.0 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=3/0
+SRC_URI=mirror://sourceforge/project/gtkspell/3.0.10/gtkspell3-3.0.10.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=19917891c52f01a286a1c30b17edf21e
diff --git a/metadata/md5-cache/app-text/htag-0.0.24-r1 b/metadata/md5-cache/app-text/htag-0.0.24-r1
index 840c53a67aad..ba373e908bff 100644
--- a/metadata/md5-cache/app-text/htag-0.0.24-r1
+++ b/metadata/md5-cache/app-text/htag-0.0.24-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ce376dbdb9966fdafe4638e04ff97e6
diff --git a/metadata/md5-cache/app-text/html2text-1.3.2a-r2 b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
index 4f76a99d5f8d..72895f3df17d 100644
--- a/metadata/md5-cache/app-text/html2text-1.3.2a-r2
+++ b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=HTML to text converter
 EAPI=7
 HOMEPAGE=http://www.mbayer.de/html2text/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha ~amd64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=df012acc099017dd3f9f96b9c46e5347
+_md5_=991755180023f7ea20441848989fdb45
diff --git a/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2 b/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
index 0451824bedb2..3df09e050dae 100644
--- a/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
+++ b/metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=HTML Include System by Ulli Meybohm
 EAPI=5
 HOMEPAGE=http://www.meybohm.de/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://meybohm.de/files/htmlinc.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e3773e6816b556665653f132187c06d
+_md5_=52279f1ec27830eb2d9314e86994e918
diff --git a/metadata/md5-cache/app-text/itex2mml-1.5.5 b/metadata/md5-cache/app-text/itex2mml-1.5.5
deleted file mode 100644
index 37b0c2737a04..000000000000
--- a/metadata/md5-cache/app-text/itex2mml-1.5.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A LaTeX into XHTML/MathML converter
-EAPI=5
-HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-SLOT=0
-SRC_URI=https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.5.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=03146fbbe4f4f112732afd922540bfd4
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.2 b/metadata/md5-cache/app-text/libqxp-0.0.2
index 0f62d37a8d2b..8464f8474d18 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.2
+++ b/metadata/md5-cache/app-text/libqxp-0.0.2
@@ -5,9 +5,9 @@ DESCRIPTION=Library parsing QuarkXpress documents
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 IUSE=debug doc test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.2.tar.xz
-_md5_=80d8686799311278266258355dad260c
+_md5_=627b45f9b112a3c531dca60a5593b764
diff --git a/metadata/md5-cache/app-text/ocrad-0.22 b/metadata/md5-cache/app-text/ocrad-0.22
index c3a462868865..250ff6ee7730 100644
--- a/metadata/md5-cache/app-text/ocrad-0.22
+++ b/metadata/md5-cache/app-text/ocrad-0.22
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.22.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=f65b6472027d674f349f3c8c5bd2e406
diff --git a/metadata/md5-cache/app-text/ocrad-0.23 b/metadata/md5-cache/app-text/ocrad-0.23
index 5c19b298330a..c3a3ff7431f6 100644
--- a/metadata/md5-cache/app-text/ocrad-0.23
+++ b/metadata/md5-cache/app-text/ocrad-0.23
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.23.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=6952713f22ec78099cc00d03f1132cc3
diff --git a/metadata/md5-cache/app-text/ocrad-0.24 b/metadata/md5-cache/app-text/ocrad-0.24
index 156dd07ff42b..db53eed50e9d 100644
--- a/metadata/md5-cache/app-text/ocrad-0.24
+++ b/metadata/md5-cache/app-text/ocrad-0.24
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.24.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=6b54fceaeb62ad15ee8cd63ada988287
diff --git a/metadata/md5-cache/app-text/ocrad-0.25 b/metadata/md5-cache/app-text/ocrad-0.25
index 8c90fcabf8fc..301f3e58a6bd 100644
--- a/metadata/md5-cache/app-text/ocrad-0.25
+++ b/metadata/md5-cache/app-text/ocrad-0.25
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.25.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=a8f600f17f80c984837fe732b0fb0077
diff --git a/metadata/md5-cache/app-text/ocrad-0.26 b/metadata/md5-cache/app-text/ocrad-0.26
index d5cd5c74f45b..ffb4dc56ff3c 100644
--- a/metadata/md5-cache/app-text/ocrad-0.26
+++ b/metadata/md5-cache/app-text/ocrad-0.26
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=fcc9ba8423caaa9bf3dcc4d68d488e8a
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r8 b/metadata/md5-cache/app-text/openjade-1.3.2-r8
index c7518a87ab32..9f90a0b5ff23 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r8
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r8
@@ -5,10 +5,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
 EAPI=7
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	sgml-catalog	a1731744d7cca1d14638e0e054ceea6e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f3b60c394586d8db0147bf688f933272
+_md5_=950328e12a092dff9121a1c901a75eba
diff --git a/metadata/md5-cache/app-text/pdfminer-20131113 b/metadata/md5-cache/app-text/pdfminer-20131113
deleted file mode 100644
index 5dac23728260..000000000000
--- a/metadata/md5-cache/app-text/pdfminer-20131113
+++ /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=Python tool for extracting information from PDF documents
-EAPI=5
-HOMEPAGE=http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/
-IUSE=doc examples 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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20131113.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8be43602fb5611dc7c19d512870f366b
diff --git a/metadata/md5-cache/app-text/po4a-0.47-r1 b/metadata/md5-cache/app-text/po4a-0.47-r1
index aa28b8236fe9..0234588a3a39 100644
--- a/metadata/md5-cache/app-text/po4a-0.47-r1
+++ b/metadata/md5-cache/app-text/po4a-0.47-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N >=dev-perl/Module-Build-0.380.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 test? ( app-text/docbook-sgml-dtd app-text/docbook-sgml-utils virtual/tex-base ) dev-lang/perl:=
+DEPEND=app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/tex-base ) dev-lang/perl:=
 DESCRIPTION=Tools for helping translation of documentation
 EAPI=6
 HOMEPAGE=https://po4a.org/
 IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=
+RDEPEND=app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N sys-devel/gettext dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=a79ff74c5eafdbaff6d9a94defcccf20
+_md5_=c4cec25223795e54dd7a355996518ada
diff --git a/metadata/md5-cache/app-text/po4a-0.55 b/metadata/md5-cache/app-text/po4a-0.55
index 9139f2174b3f..ff51dbefe1a3 100644
--- a/metadata/md5-cache/app-text/po4a-0.55
+++ b/metadata/md5-cache/app-text/po4a-0.55
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/tex-base ) dev-lang/perl:=
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl:=
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=6
 HOMEPAGE=https://po4a.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSp
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.55/po4a-0.55.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=aac287ea417cb786a3ea25fa7cfef8ff
+_md5_=5db47007f5cbe271f01cc152cf3c31e0
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
deleted file mode 100644
index d92eb28ac0e5..000000000000
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/73
-SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3dd7049092d54e4015ad7a98fa2b7734
diff --git a/metadata/md5-cache/app-text/poppler-0.68.0 b/metadata/md5-cache/app-text/poppler-0.68.0
index 4d838fed0ee7..fae457cdbda2 100644
--- a/metadata/md5-cache/app-text/poppler-0.68.0
+++ b/metadata/md5-cache/app-text/poppler-0.68.0
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig 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/79
 SRC_URI=https://poppler.freedesktop.org/poppler-0.68.0.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=538cf3afd792fd2d42d6b370e53c5b0e
+_md5_=269576e037e69661b2cd97113e2ebe8b
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index fb8cae441bcf..18f9a114b6aa 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.26-r1 b/metadata/md5-cache/app-text/xmlto-0.0.26-r1
deleted file mode 100644
index 0ffedc962e6e..000000000000
--- a/metadata/md5-cache/app-text/xmlto-0.0.26-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
-EAPI=5
-HOMEPAGE=https://pagure.io/xmlto
-IUSE=latex text
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.26.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acb86d362b8236d52798b8f10b51f5dc
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 5291f65b79f1..ae21390f4107 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/ferret-1.4 b/metadata/md5-cache/app-vim/ferret-1.4
deleted file mode 100644
index 57338721b967..000000000000
--- a/metadata/md5-cache/app-vim/ferret-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=483a397066170d04ea72e7fbc4a9a0a6
diff --git a/metadata/md5-cache/app-vim/ferret-1.4-r1 b/metadata/md5-cache/app-vim/ferret-1.4-r1
deleted file mode 100644
index 1413fc16c100..000000000000
--- a/metadata/md5-cache/app-vim/ferret-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/metadata/md5-cache/app-vim/ferret-1.5 b/metadata/md5-cache/app-vim/ferret-1.5
deleted file mode 100644
index 210e5c676552..000000000000
--- a/metadata/md5-cache/app-vim/ferret-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.5.zip -> ferret-1.5.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/metadata/md5-cache/app-vim/ferret-2.0 b/metadata/md5-cache/app-vim/ferret-2.0
deleted file mode 100644
index e67aa6f94f05..000000000000
--- a/metadata/md5-cache/app-vim/ferret-2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/2.0.tar.gz -> ferret-2.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8a569e4651e9c7a3ec05d65f8d0b4567
diff --git a/metadata/md5-cache/app-vim/ferret-3.0 b/metadata/md5-cache/app-vim/ferret-3.0
index 393140e7baa9..034ef8469032 100644
--- a/metadata/md5-cache/app-vim/ferret-3.0
+++ b/metadata/md5-cache/app-vim/ferret-3.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced multi-file search
 EAPI=6
 HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/3.0.tar.gz -> ferret-3.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8a569e4651e9c7a3ec05d65f8d0b4567
+_md5_=41e62ff7c9f7b9e49f06744c2cbcf439
diff --git a/metadata/md5-cache/app-vim/ferret-4.0 b/metadata/md5-cache/app-vim/ferret-4.0
new file mode 100644
index 000000000000..bfbbd05f124f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/ferret-4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: enhanced multi-file search
+EAPI=6
+HOMEPAGE=https://github.com/wincent/ferret
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/wincent/ferret/archive/4.0.tar.gz -> ferret-4.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=cfd27bd8df5bfc4950f2cbfbb1643bf9
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20130716 b/metadata/md5-cache/app-vim/gtk-syntax-20130716
index c8fc680bdb1f..da7fda4fe71f 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20130716
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20130716
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more
 EAPI=5
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1000
-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 ~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 ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a846cf852dd91307e9f6138943ea77fc
+_md5_=f814e6d108c15402e3cb0d1054e331eb
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1 b/metadata/md5-cache/app-vim/neocomplcache-7.1
deleted file mode 100644
index cb5bcf064f59..000000000000
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ultimate auto completion system
-EAPI=4
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=cb6789b26882587c7387f36322c3e1bd
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1 b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
index 0e85f0ddf3fa..fc1bdf3ceb2f 100644
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ultimate auto completion system
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c4275374cb10cd5ad826e18cc1f7468f
+_md5_=08e43b17170724c736b18f29697dbf99
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index da8ffdcd2f3d..7845f7e86ff1 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.7 b/metadata/md5-cache/dev-cpp/eigen-3.3.7
index 46dd1991876c..7f97ad9092bf 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=C++ template library for linear algebra
 EAPI=6
 HOMEPAGE=http://eigen.tuxfamily.org/
 IUSE=altivec c++11 cuda debug doc neon openmp test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=!dev-cpp/eigen:0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.7.tar.bz2 -> eigen-3.3.7.tar.bz2
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d0a63d8d64dbca0616bb79c46b76fcba
+_md5_=3d70f313b35b6bcf555b587bc9c88797
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index f5c25dbb3db8..923fee6b0839 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/bucardo-5.4.1 b/metadata/md5-cache/dev-db/bucardo-5.4.1
index d99c7f879984..9d2078ae5136 100644
--- a/metadata/md5-cache/dev-db/bucardo-5.4.1
+++ b/metadata/md5-cache/dev-db/bucardo-5.4.1
@@ -9,5 +9,5 @@ RDEPEND=dev-perl/DBIx-Safe dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bucardo.org/downloads/Bucardo-5.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b73bab92ca8470a8b0dd6fd2aed6a446
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.41 b/metadata/md5-cache/dev-db/freetds-1.00.41
deleted file mode 100644
index fababb2f76e9..000000000000
--- a/metadata/md5-cache/dev-db/freetds-1.00.41
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=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
-DESCRIPTION=Tabular Datastream Library
-EAPI=6
-HOMEPAGE=http://www.freetds.org/
-IUSE=gnutls iconv kerberos libressl mssql iodbc odbc ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=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 ) ) net-dns/bind-tools sys-apps/grep sys-apps/sed virtual/awk
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.41.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9d0321e0dc8584e2470fbbebc3f07043
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.12 b/metadata/md5-cache/dev-db/libiodbc-3.52.12
index 5a930e535ecd..7e6d634b07bd 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.12
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.12
@@ -4,10 +4,10 @@ DESCRIPTION=ODBC Interface for Linux
 EAPI=6
 HOMEPAGE=http://www.iodbc.org/
 IUSE=gtk abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=|| ( LGPL-2 BSD )
 RDEPEND=gtk? ( x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.12.zip -> libiodbc-3.52.12.zip
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=79b9616d197684f2dea52880d6384adb
+_md5_=827e0bdc902fa7cbd51d86aa4161e26c
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.62 b/metadata/md5-cache/dev-db/mariadb-5.5.62
deleted file mode 100644
index f79f1e930e71..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-5.5.62
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst 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 ) 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= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl oqgraph pam +perl profiling selinux +server sphinx static static-libs systemtap tcmalloc test tokudb yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) 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= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
-REQUIRED_USE=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-5.5.62/source/mariadb-5.5.62.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d49c7f565c13ea6cae2c8376fa2fe899
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.63 b/metadata/md5-cache/dev-db/mariadb-5.5.63
new file mode 100644
index 000000000000..cd178fb509e1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.63
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst 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 ) 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= ) !yassl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=https://mariadb.org/
+IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl oqgraph pam +perl profiling selinux +server sphinx static static-libs systemtap tcmalloc test tokudb yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) 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= ) !yassl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
+REQUIRED_USE=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-5.5.63/source/mariadb-5.5.63.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2e0ed599ff06998162f62963f49942e3
diff --git a/metadata/md5-cache/dev-db/mtop-0.6.6-r3 b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
index 7b479b6672f0..c6b7f54662e0 100644
--- a/metadata/md5-cache/dev-db/mtop-0.6.6-r3
+++ b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/mtop/mtop-0.6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=541b72bf1ad1eefceba3ac44369a4c62
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.43 b/metadata/md5-cache/dev-db/mysql-5.6.43
new file mode 100644
index 000000000000..8839d3f731b3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.6.43
@@ -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] ) test? ( dev-perl/JSON ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=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= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.mysql.com/
+IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=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= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.43.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.43.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.43.tar.gz mirror://gentoo/mysql-extras-20190126-1919Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190126-1919Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190126-1919Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190126-1919Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190126-1919Z.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f153e87769766b2e056083c53be157a
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.25 b/metadata/md5-cache/dev-db/mysql-5.7.25
new file mode 100644
index 000000000000..fe07485d0294
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.25
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( dev-perl/JSON ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.mysql.com/
+IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+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-20190126-1919Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190126-1919Z.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a76d8fac29c3626c2f0275920fdf1bf4
diff --git a/metadata/md5-cache/dev-db/mytop-1.6-r4 b/metadata/md5-cache/dev-db/mytop-1.6-r4
index a686524cd4e0..63b4992beecb 100644
--- a/metadata/md5-cache/dev-db/mytop-1.6-r4
+++ b/metadata/md5-cache/dev-db/mytop-1.6-r4
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/DBD-mysql virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://jeremy.zawodny.com/mysql/mytop/mytop-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6a3d476a281de6b062fdbabbc145466
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-2.2.11 b/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
index cb9f56695711..f7677481afab 100644
--- a/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
+++ b/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.percona.com/downloads/percona-toolkit/2.2.11/percona-toolkit-2.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=335a28d1380bfeb07d3d3d2c1ecbb53b
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.8 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.8
deleted file mode 100644
index a609a7005216..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.8
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.8/phpMyAdmin-4.7.8-all-languages.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=570e83a40d9394907860a80111f574d6
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.4 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.4
deleted file mode 100644
index c89d0c1d3245..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=6
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.8.4
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.4/phpMyAdmin-4.8.4-all-languages.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=87835fd12e6f6796080c0e8a2a58c4f1
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.5 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.5
new file mode 100644
index 000000000000..0e2f08262c2d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=6
+HOMEPAGE=https://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+SLOT=4.8.5
+SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.5/phpMyAdmin-4.8.5-all-languages.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=0704da11123e56c37bb72d6c3f10e8a6
diff --git a/metadata/md5-cache/dev-db/postgresql-11.1 b/metadata/md5-cache/dev-db/postgresql-11.1
index 8eb2b6b0eead..511a4d5d660c 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.1
+++ b/metadata/md5-cache/dev-db/postgresql-11.1
@@ -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_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs: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_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=11
 SRC_URI=mirror://postgresql/source/v11.1/postgresql-11.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d82de1bd23a8f0f7504f9878bb926ad2
+_md5_=e638dd4a0a15b3ec6868e49f3d20becf
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1
deleted file mode 100644
index d303dbeeb824..000000000000
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.9.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 dev-libs/qcustomplot[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SQLite Database Browser
-EAPI=6
-HOMEPAGE=http://sqlitebrowser.org
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 MPL-2.0
-RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 dev-libs/qcustomplot[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-SLOT=0
-SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.9.1.tar.gz -> sqlitebrowser-3.9.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=39bc90376145044b227fef2dde4379e5
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index cc5cdd67b33e..6a3c17d53426 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/libftd2xx-0.4.16-r1 b/metadata/md5-cache/dev-embedded/libftd2xx-0.4.16-r1
deleted file mode 100644
index fa5c4bf0408a..000000000000
--- a/metadata/md5-cache/dev-embedded/libftd2xx-0.4.16-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Library that allows a direct access to a USB device
-EAPI=5
-HOMEPAGE=http://www.ftdichip.com/Drivers/D2XX.htm
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=FTDI LGPL-2.1+
-SLOT=0
-SRC_URI=amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx0.4.16_x86_64.tar.gz ) x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx0.4.16.tar.gz )
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ee73e2bf4bf02b08f54457734adc6ab4
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index afcb0ccae5d2..53a649414638 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/quake4-sdk-1.4.2 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
index 3222b846d191..8c25cd13b35c 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
@@ -8,5 +8,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2244062a7c45a840ca63fe930c1b292f
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index 82054312a6f0..a10e3164c1ef 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -7,5 +7,5 @@ LICENSE=QUAKE4
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=f7079bc3d63e41fb824d24bced588b39
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index bf4b452f1198..af671e5f6442 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/delve-0.12.2 b/metadata/md5-cache/dev-go/delve-0.12.2
deleted file mode 100644
index 7242b95ef01c..000000000000
--- a/metadata/md5-cache/dev-go/delve-0.12.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=6
-HOMEPAGE=https://github.com/derekparker/delve
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/derekparker/delve/archive/v0.12.2.tar.gz -> delve-0.12.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=a72766e6eee139e35b4f76adbf332638
diff --git a/metadata/md5-cache/dev-go/delve-1.0.0_rc1 b/metadata/md5-cache/dev-go/delve-1.0.0_rc1
deleted file mode 100644
index 9e3c370c9c32..000000000000
--- a/metadata/md5-cache/dev-go/delve-1.0.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=6
-HOMEPAGE=https://github.com/derekparker/delve
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/derekparker/delve/archive/v1.0.0-rc.1.tar.gz -> delve-1.0.0_rc1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=ec11bd41b00dcace0dbc565af867129a
diff --git a/metadata/md5-cache/dev-go/glide-0.12.3 b/metadata/md5-cache/dev-go/glide-0.12.3
deleted file mode 100644
index 4c75ee598b9f..000000000000
--- a/metadata/md5-cache/dev-go/glide-0.12.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vendor Package Managment for Golang
-EAPI=6
-HOMEPAGE=https://github.com/Masterminds/glide
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/Masterminds/glide/archive/v0.12.3.tar.gz -> glide-0.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=259d0fab59f5bc4ffcb97e9976b1c8c2
diff --git a/metadata/md5-cache/dev-go/glide-0.13.1 b/metadata/md5-cache/dev-go/glide-0.13.1
deleted file mode 100644
index 5ccc1530e147..000000000000
--- a/metadata/md5-cache/dev-go/glide-0.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Vendor Package Managment for Golang
-EAPI=6
-HOMEPAGE=https://github.com/Masterminds/glide
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Masterminds/glide/archive/v0.13.1.tar.gz -> glide-0.13.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=332dcb60187ed7640ab155620a113d82
diff --git a/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822 b/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
deleted file mode 100644
index cc7ed7ed4848..000000000000
--- a/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Serve embedded files from jteeuwen/go-bindata with net/http
-EAPI=5
-HOMEPAGE=https://github.com/elazarl/go-bindata-assetfs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-go/go-bindata
-SLOT=0/0_pre20160822
-SRC_URI=https://github.com/elazarl/go-bindata-assetfs/archive/9a6736ed45b44bf3835afeebb3034b57ed329f3e.tar.gz -> go-bindata-assetfs-0_pre20160822.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=00e416a421efc34792ba337bd841eedf
diff --git a/metadata/md5-cache/dev-go/gox-0_pre20160725 b/metadata/md5-cache/dev-go/gox-0_pre20160725
deleted file mode 100644
index 192772155971..000000000000
--- a/metadata/md5-cache/dev-go/gox-0_pre20160725
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A dead simple, no frills Go cross compile tool
-EAPI=5
-HOMEPAGE=https://github.com/mitchellh/gox
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0/0_pre20160725
-SRC_URI=https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-0_pre20160725.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=def994b0ffa7c138027a82b112075376
diff --git a/metadata/md5-cache/dev-go/twofactor-0_p20170917 b/metadata/md5-cache/dev-go/twofactor-0_p20170917
deleted file mode 100644
index 145a869dc31d..000000000000
--- a/metadata/md5-cache/dev-go/twofactor-0_p20170917
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/qr:= >=dev-lang/go-1.9
-DESCRIPTION=Two-factor authentication library for Go
-EAPI=6
-HOMEPAGE=https://github.com/gokyle/twofactor
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/0_p20170917
-SRC_URI=https://github.com/gokyle/twofactor/archive/eaad1884d40f9cabff98a57a524c17afd00c9fe7.tar.gz -> twofactor-0_p20170917.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=31db51c31f4c13e6867b17d4d452fa0d
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 480a07b946a9..94087e58ff50 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/parser-combinators-0.4.0 b/metadata/md5-cache/dev-haskell/parser-combinators-0.4.0
deleted file mode 100644
index 445a11929ec4..000000000000
--- a/metadata/md5-cache/dev-haskell/parser-combinators-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lightweight package providing commonly useful parser combinators
-EAPI=6
-HOMEPAGE=https://github.com/mrkkrp/parser-combinators
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.4.0
-SRC_URI=mirror://hackage/packages/archive/parser-combinators/0.4.0/parser-combinators-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51d0415227f936bddff45dde89055d6d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index afdb3ee7901f..2e6cf5bc0cb8 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 b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
index a7f0c3233cf8..db3b489ea401 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0
@@ -4,7 +4,7 @@ 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86
+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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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
@@ -13,4 +13,4 @@ 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-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-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-x86.tar.xz ) )
 _eclasses_=java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60f11fe0b2ea849c8071e9d60a5940fa
+_md5_=af54f06fd17ea7378ff4cd27da5a30e2
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index fb30252d45fe..0e3966a370b9 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.2_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.2_p7
new file mode 100644
index 000000000000..17a92e3ab3ad
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.2_p7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=media-libs/freetype:2= sys-libs/zlib systemtap? ( dev-util/systemtap ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) app-arch/zip media-libs/alsa-lib net-print/cups !headless-awt? ( x11-base/xorg-proto ) || ( 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 +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= sys-libs/zlib systemtap? ( dev-util/systemtap ) !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
+SLOT=11
+SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.2+7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4af6a797fadd36590a5e6077f6bb9b74
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.2_p7 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.2_p7
new file mode 100644
index 000000000000..0310e9edc389
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.2_p7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart
+KEYWORDS=~amd64 ~arm64 ~ppc64
+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] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=preserve-libs splitdebug
+SLOT=11
+SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2+7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2+7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2+7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz )
+_eclasses_=java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=49531d74236cbdb4f5593da3725fc031
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11_p28 b/metadata/md5-cache/dev-java/openjdk-bin-11_p28
deleted file mode 100644
index 4012ac238b07..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11_p28
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart
-KEYWORDS=~amd64 ~arm64 ~ppc64
-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] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs
-SLOT=11
-SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11+28/OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz )
-_eclasses_=java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d03c4ced71bcc1e507a09db9e565d96
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192
deleted file mode 100644
index 01e6cdce1246..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.192
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup unpack
-DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jdk-8u192-linux-x64.tar.gz examples? ( jdk-8u192-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u192-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u192-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u192-linux-i586.tar.gz examples? ( jdk-8u192-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u192-macosx-x64.dmg examples? ( jdk-8u192-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u192-solaris-sparcv9.tar.gz examples? ( jdk-8u192-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u192-solaris-x64.tar.gz examples? ( jdk-8u192-solaris-x64-demos.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=af6ee27fa0440909f6e5f84cc7136fcd
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
index c089d475588a..e163112d77ad 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
@@ -4,7 +4,7 @@ DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=6
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=-* ~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 REQUIRED_USE=javafx? ( alsa fontconfig )
@@ -12,4 +12,4 @@ RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u202-linux-x64.tar.gz examples? ( jdk-8u202-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u202-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u202-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u202-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u202-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u202-linux-i586.tar.gz examples? ( jdk-8u202-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u202-macosx-x64.dmg examples? ( jdk-8u202-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u202-solaris-sparcv9.tar.gz examples? ( jdk-8u202-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u202-solaris-x64.tar.gz examples? ( jdk-8u202-solaris-x64-demos.tar.gz ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5153c0a1d2dc3485a077f9e55f58fe48
+_md5_=16c4ae1a64b28c5feea6e42f1d0460bd
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192
deleted file mode 100644
index 737b21a5293a..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.192
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup
-DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=-* amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jre-8u192-linux-x64.tar.gz ) x86? ( jre-8u192-linux-i586.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=64148b9afd028ead608eb9c4623d2038
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
index 2ee1ede6e5d0..bf00492e9c73 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=6
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u202-linux-x64.tar.gz ) x86? ( jre-8u202-linux-i586.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4995dc4ade5690799c84753cd4380f47
+_md5_=c0aaba28a76645ac7cc852f34fb8b94d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4d6e38252fc0..948fa10ff4fb 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/clojure-1.7.0 b/metadata/md5-cache/dev-lang/clojure-1.7.0
deleted file mode 100644
index 59cd6675046a..000000000000
--- a/metadata/md5-cache/dev-lang/clojure-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Clojure is a dynamic programming language that targets the Java Virtual Machine
-EAPI=5
-HOMEPAGE=https://clojure.org/
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=EPL-1.0 Apache-2.0 BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.7
-SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.7.0 -> clojure-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8bd03110af88f0aeb3f26997fc803339
diff --git a/metadata/md5-cache/dev-lang/crystal-0.27.1 b/metadata/md5-cache/dev-lang/crystal-0.27.1
new file mode 100644
index 000000000000..5ffdb0909212
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/crystal-0.27.1
@@ -0,0 +1,13 @@
+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	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5ed2009f3dd7fd3a4d94ab547adb2ea4
diff --git a/metadata/md5-cache/dev-lang/elixir-1.8.1 b/metadata/md5-cache/dev-lang/elixir-1.8.1
new file mode 100644
index 000000000000..d0e05cd42928
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.8.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/erlang-18[ssl]
+DESCRIPTION=Elixir programming language
+EAPI=7
+HOMEPAGE=https://elixir-lang.org
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-18[ssl] !!sci-biology/phylip
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.8.1.tar.gz -> elixir-1.8.1.tar.gz
+_md5_=5bb087bde682e9f14de7da8dcb6a2b5a
diff --git a/metadata/md5-cache/dev-lang/erlang-19.3.6.12 b/metadata/md5-cache/dev-lang/erlang-19.3.6.12
deleted file mode 100644
index 76381878c94e..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-19.3.6.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) dev-lang/perl sctp? ( net-misc/lksctp-tools ) sys-libs/zlib tk? ( dev-lang/tk ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) >=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=dirty-schedulers doc emacs hipe java kpoll libressl odbc smp 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=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dirty-schedulers? ( smp )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-19.3.6.12.tar.gz -> erlang-19.3.6.12.tar.gz http://erlang.org/download/otp_doc_man_19.3.tar.gz -> erlang_doc_man_19.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.3.tar.gz -> erlang_doc_html_19.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=30a5bc8dc566c1ab558dcd13957f9068
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3.8 b/metadata/md5-cache/dev-lang/erlang-20.3.8
deleted file mode 100644
index eb9a18f68402..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-20.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) dev-lang/perl sctp? ( net-misc/lksctp-tools ) sys-libs/zlib tk? ( dev-lang/tk ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) >=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=dirty-schedulers doc emacs hipe java kpoll libressl odbc smp 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=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dirty-schedulers? ( smp )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-20.3.8.tar.gz -> erlang-20.3.8.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz -> erlang_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz -> erlang_doc_html_20.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=29d023ca67586a9f81b7a0ccc2bc3ab4
diff --git a/metadata/md5-cache/dev-lang/erlang-21.1 b/metadata/md5-cache/dev-lang/erlang-21.1
deleted file mode 100644
index 371e355104ba..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-21.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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.1.tar.gz -> erlang-21.1.tar.gz http://erlang.org/download/otp_doc_man_21.1.tar.gz -> erlang_doc_man_21.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.1.tar.gz -> erlang_doc_html_21.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=bc151aefb23e6f0f42ded9b67186d97a
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r100 b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
index 76baa3bc5c61..fd8cb940385a 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r100
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
@@ -11,4 +11,4 @@ RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=be1a2076ac983fe7c13eda9e0a1315d4
+_md5_=f285db47680608788d594b4f9f76ca66
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r101 b/metadata/md5-cache/dev-lang/lua-5.1.5-r101
index cc2a4f582cae..a78a33beb80f 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r101
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r101
@@ -11,4 +11,4 @@ RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=63d0017093d8ed77dc723ce061e1209e
+_md5_=a6043d53878d9b20ad807d7435e8f149
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r102 b/metadata/md5-cache/dev-lang/lua-5.1.5-r102
index 771a53cb7860..dcdf130b4d0a 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r102
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r102
@@ -11,4 +11,4 @@ RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=39fea718fc2a7599da2df0ce580afeef
+_md5_=81046732cec4682161838e82b04e5b48
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r4 b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
index c19c6309ee20..1c5edd110eda 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r4
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
@@ -11,4 +11,4 @@ RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-
 SLOT=0
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=50250209ecbe4fe83e1a0bad9cee504c
+_md5_=9c09db5db053f0bd6f9df623596c197d
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3 b/metadata/md5-cache/dev-lang/lua-5.2.3
index a55aa78f014b..4811cd80d9cc 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=24f46b7c929f10f4bdb799ddad55ce57
+_md5_=d881ee13ec4a9130f82263e93d1e02f3
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r1 b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
index f4e64a2b9a3b..fc1e8366629a 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0c6fef8c729e5c7936c18b5ce3200d03
+_md5_=91e55da04db9fd66bef3caa1185e6c95
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r2 b/metadata/md5-cache/dev-lang/lua-5.2.3-r2
index 2776ec2f84c0..1fa08d156299 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r2
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r2
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7d2ce813c85a81e3b0bf762032d4789a
+_md5_=df2eddf2f242d9a37d58d4c9ed2e3494
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r3 b/metadata/md5-cache/dev-lang/lua-5.2.3-r3
index bb035443797a..0df8593c75f9 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r3
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r3
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=70b4b0c480cf8d51a13fe8e88f15d66b
+_md5_=b895afef0c65b15801f26b775ff9aa74
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.4 b/metadata/md5-cache/dev-lang/lua-5.2.4
new file mode 100644
index 000000000000..6ff563f71a68
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=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 powerful light-weight programming language designed for extending applications
+EAPI=5
+HOMEPAGE=http://www.lua.org/
+IUSE=+deprecated emacs readline static test test-complete abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=emacs? ( app-emacs/lua-mode )
+RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+SLOT=5.2
+SRC_URI=http://www.lua.org/ftp/lua-5.2.4.tar.gz test? ( https://www.lua.org/tests/lua-5.2.2-tests.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9d92f4ff9ae48989ca48705402136ec8
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3 b/metadata/md5-cache/dev-lang/lua-5.3.3
index 0a73b5459259..6683a7cb2a37 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=92eb7c8721dc8c1bb2a61e7c7294ee3f
+_md5_=2e9f72614e11d04dc601ddfe8b2eaea8
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3-r1 b/metadata/md5-cache/dev-lang/lua-5.3.3-r1
index 82332447eed4..4430eada79ff 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3-r1
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f7f59afa1797acd213aa6ecaf0f98de1
+_md5_=6efcec2b1b9f6138b6ed7e725dcefcf6
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3-r2 b/metadata/md5-cache/dev-lang/lua-5.3.3-r2
index 815790b16931..566486a2cd96 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3-r2
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3-r2
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3d45b01053e5045136d6a963acac44c6
+_md5_=3f04819d846e2d82724b818e02cacfae
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.5 b/metadata/md5-cache/dev-lang/lua-5.3.5
new file mode 100644
index 000000000000..668256b10363
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=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 powerful light-weight programming language designed for extending applications
+EAPI=5
+HOMEPAGE=http://www.lua.org/
+IUSE=+deprecated emacs readline static test test-complete abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=emacs? ( app-emacs/lua-mode )
+RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+SLOT=5.3
+SRC_URI=http://www.lua.org/ftp/lua-5.3.5.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=eb6d8a854ce25999db54f68c4d2d5a06
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.12 b/metadata/md5-cache/dev-lang/moarvm-2018.12
new file mode 100644
index 000000000000..8cfd841a6a59
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:= virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=6
+HOMEPAGE=http://moarvm.org
+IUSE=asan clang debug doc +jit static-libs optimize ubsan
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:= virtual/libffi
+RESTRICT=test
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2018.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c0ce72cb061b082c5b12b75d95a86e09
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.5 b/metadata/md5-cache/dev-lang/mujs-1.0.5
index c39510ae57da..9b45aa0bb291 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.5
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=An embeddable Javascript interpreter in C.
 EAPI=7
 HOMEPAGE=http://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
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 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	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5c4e4e45ef03525640ed5b8bf34c4e23
+_md5_=3b7d6b80aca55151c84be2e31bd55418
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.12 b/metadata/md5-cache/dev-lang/nqp-2018.12
new file mode 100644
index 000000000000..a760f031bee0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2018.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=6
+HOMEPAGE=https://rakudo.org
+IUSE=doc clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2018.12 -> nqp-2018.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=a4c7a092c59a7957f0afcd9393edc902
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40 b/metadata/md5-cache/dev-lang/php-5.6.40
index fba4257f478a..36e19a9dfced 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.40
+++ b/metadata/md5-cache/dev-lang/php-5.6.40
@@ -5,11 +5,11 @@ 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
+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://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d54ddaa5c8b44bccfb85aa5eceed40ee
+_md5_=460019c1363561d7d48e9f0162788bce
diff --git a/metadata/md5-cache/dev-lang/php-7.1.26 b/metadata/md5-cache/dev-lang/php-7.1.26
index 355c7e32542c..f387b485a538 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.26
+++ b/metadata/md5-cache/dev-lang/php-7.1.26
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session 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://secure.php.net/distributions/php-7.1.26.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3aed7e8c0d93b371ece177f2e2bbdf11
+_md5_=427e65f00c8e50e2cb8feef0b40ab8f1
diff --git a/metadata/md5-cache/dev-lang/php-7.2.14 b/metadata/md5-cache/dev-lang/php-7.2.14
index 08f442f8e2a6..bb005b378557 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.14
+++ b/metadata/md5-cache/dev-lang/php-7.2.14
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session 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.14.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=08088a7e728a1ecb4fa75b3fb33a94e0
+_md5_=37df3cc6df6ecf1cb5f9c15c8685326f
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.12 b/metadata/md5-cache/dev-lang/rakudo-2018.12
new file mode 100644
index 000000000000..57bb469edf59
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=~dev-lang/nqp-2018.12:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=6
+HOMEPAGE=https://rakudo.org
+IUSE=clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=~dev-lang/nqp-2018.12:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=81e57345f56f7c37b853d3df44622b01
diff --git a/metadata/md5-cache/dev-lang/rust-1.32.0 b/metadata/md5-cache/dev-lang/rust-1.32.0
index 1a648a73d09b..8842164af0f3 100644
--- a/metadata/md5-cache/dev-lang/rust-1.32.0
+++ b/metadata/md5-cache/dev-lang/rust-1.32.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 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	55aaa148741116aa54ad0d80e361818e	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	rust-toolchain	f9b504d977266122e1891048638138c6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d55d4d6a637127701299b73332ca92f9
+_md5_=24f6477f396186c43b46cf4353dcb7f3
diff --git a/metadata/md5-cache/dev-lang/vala-0.32.1 b/metadata/md5-cache/dev-lang/vala-0.32.1
index e67d634ee17d..17ca292e44b7 100644
--- a/metadata/md5-cache/dev-lang/vala-0.32.1
+++ b/metadata/md5-cache/dev-lang/vala-0.32.1
@@ -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.32.1
 SLOT=0.32
 SRC_URI=mirror://gnome/sources/vala/0.32/vala-0.32.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2e3fcc42b11b399a6c40d280481fddf9
+_md5_=3aab5c72d56143df8f2922ae283b4ad4
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.16 b/metadata/md5-cache/dev-lang/vala-0.34.16
index 5428bdb30399..e1b2b75692f0 100644
--- a/metadata/md5-cache/dev-lang/vala-0.34.16
+++ b/metadata/md5-cache/dev-lang/vala-0.34.16
@@ -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.34.16
 SLOT=0.34
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.16.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=745c5a97b630266c5972e473bba3ec34
+_md5_=58bf13db43c07648064d0f30d0fa3368
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.15 b/metadata/md5-cache/dev-lang/vala-0.36.15
index f3e80c602f1c..946ebff2f445 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.15
+++ b/metadata/md5-cache/dev-lang/vala-0.36.15
@@ -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.15
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.15.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9de16524ecad7c28b81c05f14670c0d
+_md5_=41d156f7401a3c1be4ed0fb9d253b786
diff --git a/metadata/md5-cache/dev-libs/9libs-1.0-r4 b/metadata/md5-cache/dev-libs/9libs-1.0-r4
index d04b482912d7..5af93777e60f 100644
--- a/metadata/md5-cache/dev-libs/9libs-1.0-r4
+++ b/metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -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
 DEFINED_PHASES=configure install prepare
-DEPEND=X? ( >=x11-libs/libX11-1.0.0[static-libs?] >=x11-libs/libXt-1.0.0[static-libs?] )
+DEPEND=>=x11-libs/libX11-1.0.0[static-libs?] >=x11-libs/libXt-1.0.0[static-libs?]
 DESCRIPTION=A package of Plan 9 compatibility libraries
 EAPI=7
 HOMEPAGE=https://www.netlib.org/research/9libs/9libs-1.0.README
-IUSE=static-libs X
+IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=PLAN9
-RDEPEND=X? ( >=x11-libs/libX11-1.0.0[static-libs?] >=x11-libs/libXt-1.0.0[static-libs?] )
+RDEPEND=>=x11-libs/libX11-1.0.0[static-libs?] >=x11-libs/libXt-1.0.0[static-libs?]
 SLOT=0
 SRC_URI=https://www.netlib.org/research/9libs/9libs-1.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e065a6ef5381a1937f310b2b97dbb7c8
+_md5_=74e9ae0fa1a0a5c04f3ab711a7c324a4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8a9acd21f335..a9d2c9e62750 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/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index c9f6c0decab9..cd1512a6e86b 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21dd445bed12c33c282be8402a74bc34
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
index e13dcadf92f7..4875a08ff3e7 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.552542
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.552542
@@ -9,5 +9,5 @@ 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	ee2f5086cd7e7b747b061f58db14d89e
+_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
index 9a2744e350a0..de6dede47a42 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.606296
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.606296
@@ -9,5 +9,5 @@ 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	ee2f5086cd7e7b747b061f58db14d89e
+_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 ea2ae0c858e7..c60a7f687504 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=aeb6125ef05bf91eaad738dd40919c19
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r6 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r6
index eca2e0715be2..805102379c1e 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r6
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r6
@@ -4,11 +4,11 @@ DESCRIPTION=General-purpose cryptography library
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/beecrypt/
 IUSE=+threads java cxx python static-libs doc elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-6.1:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9ce9fe1f58f4c15d6c5bd404d28a089c
+_md5_=ae447f739678fd790ade3d5e3af0e8b2
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20131107 b/metadata/md5-cache/dev-libs/cdk-5.0.20131107
deleted file mode 100644
index b34a5199b362..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20131107
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2[unicode?]
-DESCRIPTION=A library of curses widgets
-EAPI=5
-HOMEPAGE=http://dickey.his.com/cdk/cdk.html
-IUSE=examples static-libs unicode
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2[unicode?]
-SLOT=0/5
-SRC_URI=ftp://invisible-island.net/cdk/cdk-5.0-20131107.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6b1ee75b10bc5a3515ba40b113cb6c29
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20141106 b/metadata/md5-cache/dev-libs/cdk-5.0.20141106
deleted file mode 100644
index b72bdfb3af3b..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20141106
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2[unicode?]
-DESCRIPTION=A library of curses widgets
-EAPI=5
-HOMEPAGE=http://dickey.his.com/cdk/cdk.html
-IUSE=examples static-libs unicode
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2[unicode?]
-SLOT=0/6
-SRC_URI=ftp://invisible-island.net/cdk/cdk-5.0-20141106.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f21ce4675f738b9c5a26a855a85aae0b
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20150928 b/metadata/md5-cache/dev-libs/cdk-5.0.20150928
deleted file mode 100644
index 797909e7cd27..000000000000
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20150928
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-DESCRIPTION=A library of curses widgets
-EAPI=6
-HOMEPAGE=http://dickey.his.com/cdk/cdk.html
-IUSE=examples static-libs unicode
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
-SLOT=0/6
-SRC_URI=ftp://invisible-island.net/cdk/cdk-5.0-20150928.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=62912614f0aa730d3279009aef487ff1
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.172 b/metadata/md5-cache/dev-libs/elfutils-0.172
deleted file mode 100644
index 887f54e833a5..000000000000
--- a/metadata/md5-cache/dev-libs/elfutils-0.172
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
-DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
-EAPI=6
-HOMEPAGE=http://elfutils.org/
-IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
-SLOT=0
-SRC_URI=https://sourceware.org/elfutils/ftp/0.172/elfutils-0.172.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2dabb0a5139ac07d956b97ce6d502ee3
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.173-r1 b/metadata/md5-cache/dev-libs/elfutils-0.173-r1
new file mode 100644
index 000000000000..01a85527fe85
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.173-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=6
+HOMEPAGE=http://elfutils.org/
+IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
+SLOT=0
+SRC_URI=https://sourceware.org/elfutils/ftp/0.173/elfutils-0.173.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d8f8d4cb1a269d3933290e5952ef1dbc
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.175 b/metadata/md5-cache/dev-libs/elfutils-0.175
deleted file mode 100644
index 412ade72edcd..000000000000
--- a/metadata/md5-cache/dev-libs/elfutils-0.175
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
-DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
-EAPI=7
-HOMEPAGE=http://elfutils.org/
-IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
-SLOT=0
-SRC_URI=https://sourceware.org/elfutils/ftp/0.175/elfutils-0.175.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=04b4da6704e2fd90ff22d80d20d949d4
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.175-r1 b/metadata/md5-cache/dev-libs/elfutils-0.175-r1
new file mode 100644
index 000000000000..a511720468bb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/elfutils-0.175-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
+EAPI=7
+HOMEPAGE=http://elfutils.org/
+IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
+SLOT=0
+SRC_URI=https://sourceware.org/elfutils/ftp/0.175/elfutils-0.175.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c24df590c773a56012532a4038a4d459
diff --git a/metadata/md5-cache/dev-libs/expat-2.2.6 b/metadata/md5-cache/dev-libs/expat-2.2.6
index 3c493587302c..fd2580fadf28 100644
--- a/metadata/md5-cache/dev-libs/expat-2.2.6
+++ b/metadata/md5-cache/dev-libs/expat-2.2.6
@@ -4,9 +4,9 @@ DESCRIPTION=Stream-oriented XML parser library
 EAPI=6
 HOMEPAGE=https://libexpat.github.io/
 IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81b8e92b50154481957965c08347b38a
+_md5_=34571a84c9dd718c907378edb90c10ec
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.3.0 b/metadata/md5-cache/dev-libs/fstrm-0.3.0
index b164ccba1f92..628e43faf361 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~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_ppc_32(-)?,abi_ppc_64(-)?,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	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d910dbc6fd13d16292f7253e3d79389e
+_md5_=33d4bde30dd0ef802454566b3a307410
diff --git a/metadata/md5-cache/dev-libs/grok-0.9.2 b/metadata/md5-cache/dev-libs/grok-0.9.2
deleted file mode 100644
index e8da2828713b..000000000000
--- a/metadata/md5-cache/dev-libs/grok-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6 <dev-util/gperf-3.1
-DESCRIPTION=DRY and RAD for regular expressions
-EAPI=5
-HOMEPAGE=https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok
-KEYWORDS=amd64 arm hppa x86
-LICENSE=BSD
-RDEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6
-SLOT=0
-SRC_URI=https://github.com/jordansissel/grok/archive/v0.9.2.tar.gz -> grok-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab5467542c407902df5c6e13b81afb3f
diff --git a/metadata/md5-cache/dev-libs/grok-0.9.2-r1 b/metadata/md5-cache/dev-libs/grok-0.9.2-r1
deleted file mode 100644
index b019dc61f38c..000000000000
--- a/metadata/md5-cache/dev-libs/grok-0.9.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6 >=dev-util/gperf-3.1
-DESCRIPTION=DRY and RAD for regular expressions
-EAPI=6
-HOMEPAGE=https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=BSD
-RDEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6
-SLOT=0
-SRC_URI=https://github.com/jordansissel/grok/archive/v0.9.2.tar.gz -> grok-0.9.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e62aeff4cdee09cd87485b168b598ae1
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1 b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
index 7a0d8b3d5430..7a356f0c31a8 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.3.tar.gz -> ivykis-0.42.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1884a05d7b7767cfcd0d234b21109cc1
+_md5_=4a7c3bd91c30dca032b32e026df6494e
diff --git a/metadata/md5-cache/dev-libs/jansson-2.11 b/metadata/md5-cache/dev-libs/jansson-2.11
index 500c96496c8f..2c29a8dbc7b8 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.11
+++ b/metadata/md5-cache/dev-libs/jansson-2.11
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=6
 HOMEPAGE=http://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.11.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=162ab5c00a56a7a6a5d5959605162289
+_md5_=8e79698fc51c38744b2767ce1d0c9c04
diff --git a/metadata/md5-cache/dev-libs/json-c-0.12 b/metadata/md5-cache/dev-libs/json-c-0.12
index 2ea6f7ebf010..c11a80ecb1bb 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.12
+++ b/metadata/md5-cache/dev-libs/json-c-0.12
@@ -4,9 +4,9 @@ DESCRIPTION=A JSON implementation in C
 EAPI=5
 HOMEPAGE=https://github.com/json-c/json-c/wiki
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0/2
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61cda3c33da1e22d1ab91f332dd2fe5d
+_md5_=b10c5b3decf373c84dcb9e449e1150ed
diff --git a/metadata/md5-cache/dev-libs/json-c-0.12.1 b/metadata/md5-cache/dev-libs/json-c-0.12.1
deleted file mode 100644
index 0754944dc335..000000000000
--- a/metadata/md5-cache/dev-libs/json-c-0.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-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=A JSON implementation in C
-EAPI=6
-HOMEPAGE=https://github.com/json-c/json-c/wiki
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-SLOT=0/2
-SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0d18df40e6519b3b819c707d9263a73d
diff --git a/metadata/md5-cache/dev-libs/json-c-0.13 b/metadata/md5-cache/dev-libs/json-c-0.13
deleted file mode 100644
index 9b3d9cf84791..000000000000
--- a/metadata/md5-cache/dev-libs/json-c-0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-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=A JSON implementation in C
-EAPI=6
-HOMEPAGE=https://github.com/json-c/json-c/wiki
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-SLOT=0/3
-SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bb5628d5a715f78784ccb4a47f40326d
diff --git a/metadata/md5-cache/dev-libs/json-c-0.13.1-r1 b/metadata/md5-cache/dev-libs/json-c-0.13.1-r1
index dbf23aa8f3d5..249cbc3831cb 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.13.1-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.13.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A JSON implementation in C
 EAPI=6
 HOMEPAGE=https://github.com/json-c/json-c/wiki
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0/4
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0c270e85f20b057ebff0971fe305f101
+_md5_=4f159fbb7e999dd122255d930363e50c
diff --git a/metadata/md5-cache/dev-libs/klibc-2.0.4-r2 b/metadata/md5-cache/dev-libs/klibc-2.0.4-r2
deleted file mode 100644
index 9c1eebee97d0..000000000000
--- a/metadata/md5-cache/dev-libs/klibc-2.0.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-lang/perl sys-devel/bc
-DESCRIPTION=A minimal libc subset for use with initramfs
-EAPI=6
-HOMEPAGE=https://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/
-IUSE=debug test custom-cflags
-KEYWORDS=~alpha amd64 ~arm ia64 -mips ~ppc ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=dev-lang/perl
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://kernel/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz mirror://debian/pool/main/k/klibc/klibc_2.0.4-9.debian.tar.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://kernel/linux/kernel/v4.x/testing/linux-4.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dae52e3b1d0e641bbea540908333a9a
diff --git a/metadata/md5-cache/dev-libs/libburn-1.5.0 b/metadata/md5-cache/dev-libs/libburn-1.5.0
index 17942bdadfc1..e3430e471456 100644
--- a/metadata/md5-cache/dev-libs/libburn-1.5.0
+++ b/metadata/md5-cache/dev-libs/libburn-1.5.0
@@ -4,8 +4,8 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=debug 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=GPL-2
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libburn-1.5.0.tar.gz
-_md5_=2a0c37ca86f8af5e94506e3b470a9374
+_md5_=6da775a4bff828e027b98ec247781b14
diff --git a/metadata/md5-cache/dev-libs/libcli-1.9.4-r1 b/metadata/md5-cache/dev-libs/libcli-1.9.4-r1
deleted file mode 100644
index 8937a6f77e53..000000000000
--- a/metadata/md5-cache/dev-libs/libcli-1.9.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Cisco-style (telnet) command-line interface library
-EAPI=4
-HOMEPAGE=http://sites.dparrish.com/libcli
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://libcli.googlecode.com/files/libcli-1.9.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b45b01c8d6e00dbb5e0f8c0b2ee76f4a
diff --git a/metadata/md5-cache/dev-libs/libcxml-0.15.1 b/metadata/md5-cache/dev-libs/libcxml-0.15.1
deleted file mode 100644
index 7d571d275126..000000000000
--- a/metadata/md5-cache/dev-libs/libcxml-0.15.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig
-DESCRIPTION=small C++ library which makes it marginally neater to parse XML using libxml++
-EAPI=6
-HOMEPAGE=http://carlh.net/libcxml
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost
-SLOT=0
-SRC_URI=http://carlh.net/downloads/libcxml/libcxml-0.15.1.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=f0d53ccc7d9b495bcfc20eb494003a2b
diff --git a/metadata/md5-cache/dev-libs/libcxml-0.15.4 b/metadata/md5-cache/dev-libs/libcxml-0.15.4
deleted file mode 100644
index 45e2987d9a01..000000000000
--- a/metadata/md5-cache/dev-libs/libcxml-0.15.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig
-DESCRIPTION=small C++ library which makes it marginally neater to parse XML using libxml++
-EAPI=6
-HOMEPAGE=http://carlh.net/libcxml
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream
-SLOT=0
-SRC_URI=http://carlh.net/downloads/libcxml/libcxml-0.15.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=3a6d257d725dfd4ec2460cba15e80b21
diff --git a/metadata/md5-cache/dev-libs/libcxml-9999 b/metadata/md5-cache/dev-libs/libcxml-9999
deleted file mode 100644
index b3bad0e79fd0..000000000000
--- a/metadata/md5-cache/dev-libs/libcxml-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=small C++ library which makes it marginally neater to parse XML using libxml++
-EAPI=6
-HOMEPAGE=http://carlh.net/libcxml
-LICENSE=GPL-2
-RDEPEND=dev-cpp/libxmlpp:2.6 dev-libs/boost dev-libs/locked_sstream
-SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=be99cd1efdad97dc15c007cfd1d7980e
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.6.0 b/metadata/md5-cache/dev-libs/libevdev-1.6.0
index eb66d4d271d8..07bb6ae9065c 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.6.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.6.0.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c4b5026318239bdfa76a7c707c5d200c
+_md5_=1c9cc535da4619134167dd7ffb8a27be
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.27.8 b/metadata/md5-cache/dev-libs/libgit2-0.27.8
new file mode 100644
index 000000000000..bf0e861be6c5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.27.8
@@ -0,0 +1,13 @@
+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:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) 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:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+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
+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/27
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.27.8.tar.gz -> libgit2-0.27.8.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2eb2bd6fb69f64a2758d28a26d92b6b3
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.5.0 b/metadata/md5-cache/dev-libs/libisoburn-1.5.0
index c2f6c35fc8ce..436a96da0308 100644
--- a/metadata/md5-cache/dev-libs/libisoburn-1.5.0
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported
 EAPI=7
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=>=dev-libs/libburn-1.5.0 >=dev-libs/libisofs-1.5.0 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.5.0.tar.gz
-_md5_=566433a8051354209cbf74bb177621fc
+_md5_=88f046078fbd8596b9225bd0a2c49ed1
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.5.0 b/metadata/md5-cache/dev-libs/libisofs-1.5.0
index 10d4a9b39056..a873d215ed7e 100644
--- a/metadata/md5-cache/dev-libs/libisofs-1.5.0
+++ b/metadata/md5-cache/dev-libs/libisofs-1.5.0
@@ -5,9 +5,9 @@ DESCRIPTION=Open-source library for reading, mastering and writing optical discs
 EAPI=7
 HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
 IUSE=acl debug static-libs verbose-debug xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.5.0.tar.gz
-_md5_=51754028b68b2a8f3ba08f628a54cd8d
+_md5_=5d376979b73a809be7b4a9ef82773924
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1 b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
index 44ee4d7a69a5..1190377458ed 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
+++ b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.9.1alpha.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=24feafb364a145b96d99f4e46c9a2b96
+_md5_=2a58e27aea50e2872a18bf9558585f65
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.0 b/metadata/md5-cache/dev-libs/libpipeline-1.4.0
deleted file mode 100644
index 8089d2053bc2..000000000000
--- a/metadata/md5-cache/dev-libs/libpipeline-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815
-DESCRIPTION=a pipeline manipulation library
-EAPI=5
-HOMEPAGE=http://libpipeline.nongnu.org/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22456b496c4c7b58ad93211666a07133
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.1 b/metadata/md5-cache/dev-libs/libpipeline-1.5.1
new file mode 100644
index 000000000000..128a5355d890
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig test? ( dev-libs/check )
+DESCRIPTION=a pipeline manipulation library
+EAPI=6
+HOMEPAGE=http://libpipeline.nongnu.org/
+IUSE=static-libs 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
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.1.tar.gz
+_md5_=789a1edb12547f1086386d02b32dba2b
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1 b/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1
deleted file mode 100644
index de61856ad834..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install 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=A portable fork of NaCl, a higher-level cryptographic library
-EAPI=6
-HOMEPAGE=https://github.com/jedisct1/libsodium
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/18
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e60daed8e0323cd35d558c1e64ec7e8b
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10 b/metadata/md5-cache/dev-libs/libunistring-0.9.10
index 1b37e29138ab..807e62b47b31 100644
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.10
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10
@@ -4,9 +4,9 @@ DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3 GPL-3
 SLOT=0/2
 SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bc6300efd5e298689242d3900c006b6
+_md5_=6946e9ad146a824694fe531d91d8a03d
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2
index d5faccc25f89..5e269df0b271 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e5b009592b25c09fdca69acf90d5d49d
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index dc3c5c95b1e3..b27e8aa0f7b2 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=28b60228468e5169815d1910011c0391
diff --git a/metadata/md5-cache/dev-libs/nss-3.40.1 b/metadata/md5-cache/dev-libs/nss-3.40.1
deleted file mode 100644
index 75d267667319..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.40.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_40_1_RTM/src/nss-3.40.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5e8f78897f044fc87ea42e381642376f
diff --git a/metadata/md5-cache/dev-libs/nss-3.40.1-r1 b/metadata/md5-cache/dev-libs/nss-3.40.1-r1
index 99cdffe8f197..893091e70203 100644
--- a/metadata/md5-cache/dev-libs/nss-3.40.1-r1
+++ b/metadata/md5-cache/dev-libs/nss-3.40.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_40_1_RTM/src/nss-3.40.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9a132c7b5c31d80adc23480076f2f64b
+_md5_=f6309ac79e05725e0406aa10ba3f3e35
diff --git a/metadata/md5-cache/dev-libs/nss-3.41-r1 b/metadata/md5-cache/dev-libs/nss-3.41-r1
deleted file mode 100644
index 54a03171ec04..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.41-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
-IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_41_RTM/src/nss-3.41.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9a132c7b5c31d80adc23480076f2f64b
diff --git a/metadata/md5-cache/dev-libs/nss-3.42 b/metadata/md5-cache/dev-libs/nss-3.42
new file mode 100644
index 000000000000..c4741a497ddb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_42_RTM/src/nss-3.42.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9a132c7b5c31d80adc23480076f2f64b
diff --git a/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5 b/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5
deleted file mode 100644
index 50507d70e330..000000000000
--- a/metadata/md5-cache/dev-libs/sblim-sfcc-2.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl[ssl] >=app-portage/elt-patches-20170815
-DESCRIPTION=Small Footprint CIM Client Library
-EAPI=5
-HOMEPAGE=https://sourceforge.net/apps/mediawiki/sblim
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=net-misc/curl[ssl]
-SLOT=0
-SRC_URI=mirror://sourceforge/project/sblim/sblim-sfcc/sblim-sfcc-2.2.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d44f8f4c582b6f4495aaaecd52d8d0b
diff --git a/metadata/md5-cache/dev-libs/stfl-0.24 b/metadata/md5-cache/dev-libs/stfl-0.24
index 3d1610c8cf34..2760a95fc131 100644
--- a/metadata/md5-cache/dev-libs/stfl-0.24
+++ b/metadata/md5-cache/dev-libs/stfl-0.24
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0=[unicode] perl? ( dev-lang/perl:= ) ruby? ( dev-lang/
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.clifford.at/stfl/stfl-0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b9d8a248f5602e9d530483da04f9c61
diff --git a/metadata/md5-cache/dev-libs/uthash-2.0.2 b/metadata/md5-cache/dev-libs/uthash-2.0.2
index 0fb5627c9da3..c10634e90db3 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.0.2
+++ b/metadata/md5-cache/dev-libs/uthash-2.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=6
 HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 sparc ~x86
 LICENSE=BSD-1
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.0.2.tar.gz -> uthash-2.0.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=277ff9ad79e01ad5ae32750f2751dfad
+_md5_=285cac4e4f345f946dddecd39be62a4c
diff --git a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1 b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
index 8c5a8b2aac4f..199d5b888961 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
 EAPI=5
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cc470eea02a16f97764e8e4fc5f9093
+_md5_=d508a6e9cd010d6333c5d0f81fa9ebea
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.15 b/metadata/md5-cache/dev-libs/vala-common-0.36.15
index ccd0c06f4909..8a2d3056bb3a 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.36.15
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.15
@@ -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.36/vala-0.36.15.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=edec22d3131820d55e120e5c65ab3327
+_md5_=c6065047f51cfef6429e5be484710629
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.17 b/metadata/md5-cache/dev-libs/wayland-protocols-1.17
index 2eb7d7e05034..63c0f6fff9d6 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.17
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.17
@@ -3,10 +3,10 @@ DEPEND=dev-libs/wayland virtual/pkgconfig >=app-portage/elt-patches-20170815 !<s
 DESCRIPTION=Wayland protocol files
 EAPI=6
 HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.17.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8b169e2566098b6653794e7e984d2ab2
+_md5_=f6dd03e18fb992a1f92bbb796d4dab0f
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.69 b/metadata/md5-cache/dev-libs/zziplib-0.13.69
index 85c729984042..d2e00cf29c7f 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.69
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.69
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
 EAPI=7
 HOMEPAGE=http://zziplib.sourceforge.net/
 IUSE=doc sdl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 SLOT=0
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.69.tar.gz -> zziplib-0.13.69.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=06ef7e04c5c06a7238a54e391d668c13
+_md5_=734710faa81598564ddfd0fe69dee526
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 335b7e1f9062..6b2a0166e5a9 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/luaevent-0.4.3 b/metadata/md5-cache/dev-lua/luaevent-0.4.3
deleted file mode 100644
index 614b58f4dfe6..000000000000
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/lua-5.1 >=dev-libs/libevent-1.4 virtual/pkgconfig
-DESCRIPTION=libevent bindings for Lua
-EAPI=5
-HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/lua-5.1 >=dev-libs/libevent-1.4
-SLOT=0
-SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.3.tar.gz -> luaevent-0.4.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=74ed2137471428b96e9af4a7983add9a
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.4 b/metadata/md5-cache/dev-lua/luaevent-0.4.4
index 6037b44f025d..6ac7533b385c 100644
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.4
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/lua:0 dev-libs/libevent:0= virtual/pkgconfig
 DESCRIPTION=libevent bindings for Lua
 EAPI=5
 HOMEPAGE=http://luaforge.net/projects/luaevent
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/lua:0 dev-libs/libevent:0=
 SLOT=0
 SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.4.tar.gz -> luaevent-0.4.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=63de2ca52bac70dd8a2d1dfe2e465e57
+_md5_=a6442a315ba2f19b470dadb54f6fd6f0
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.6 b/metadata/md5-cache/dev-lua/luaevent-0.4.6
new file mode 100644
index 000000000000..8c7df7c83ab9
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/lua:0 dev-libs/libevent:0= virtual/pkgconfig
+DESCRIPTION=libevent bindings for Lua
+EAPI=7
+HOMEPAGE=http://luaforge.net/projects/luaevent
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/lua:0 dev-libs/libevent:0=
+SLOT=0
+SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz -> luaevent-0.4.6.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e754b48747fb76244f008fc01b4e0611
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
index 98e3dc8d5a3f..e3bf39fbe7eb 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Networking support library for the Lua language
 EAPI=7
 HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=12cf66d7d608262f69c9d172b986afb6
+_md5_=b98bafd672aa7043616dd3c3032aba44
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
index 178bc26c453f..0976d491e60d 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Diff-1.150.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eeb8b7e2154be331a3f1cbe483e80eb7
diff --git a/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0 b/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
index d38895bd2728..f6b561adbb58 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
+++ b/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Algorithm-ClusterPoints-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ce65010ffccb29a13303d9ab896eba6
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2 b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
index adbdd37e8ca9..785c6cfdb7fd 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Params-Util-0.31 >=virtual/perl-File-Spec-0.82 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Algorithm-Dependency-1.110.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d161a815e581428b99875151a24174ab
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300 b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
index 78cea3579f21..02db34a54773 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
+++ b/metadata/md5-cache/dev-perl/Algorithm-Diff-1.190.300
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b08053e11aeaaa03ca0a263426e68fe
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
index ec421c344de3..5b7246d7c326 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TP/TPEDERSE/Algorithm-Munkres-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e3d128bb8d90dccc860b8aac07183f6
diff --git a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0 b/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
index 647021a1b9c8..96fa92c5a10d 100644
--- a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
+++ b/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Archive-Extract dev-perl/Archive-Zip dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/File-Which dev-perl/Text-Patch media-libs/libsdl virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-MakeMaker dev-perl/Module-Build virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/Alien-SDL-1.446.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c839893a647786604767949b7fc23577
diff --git a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0 b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
index a8268b8bd97a..ba3bcc107476 100644
--- a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
+++ b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e6eb1e3b5dacbb89021e23d3e902e66
diff --git a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1 b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
index 8e6608b47380..1141348bf13d 100644
--- a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Linux-Pid !<www-apache/mod_perl-2.0.5 >=www-apache/mod_perl-2.0.5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-SizeLimit-0.97.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75abb748058af5eb1e02d57e68530358
diff --git a/metadata/md5-cache/dev-perl/App-CLI-0.313.0-r1 b/metadata/md5-cache/dev-perl/App-CLI-0.313.0-r1
index 603a364ceae5..a7d4ad1d33a5 100644
--- a/metadata/md5-cache/dev-perl/App-CLI-0.313.0-r1
+++ b/metadata/md5-cache/dev-perl/App-CLI-0.313.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Getopt-Long-2.35 virtual/perl-Locale-Maketext-Simple virtual/perl-Pod-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORNELIUS/App-CLI-0.313.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=785ac6bf682494f8200e2c43a04fb60a
diff --git a/metadata/md5-cache/dev-perl/AppConfig-1.710.0 b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
index 9d215c2aa727..e5e0e3362333 100644
--- a/metadata/md5-cache/dev-perl/AppConfig-1.710.0
+++ b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-HomeDir-0.57 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1984e7b3dd4bdac2dc5ee44404390f51
diff --git a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1 b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
index ae35dd71a2a8..d5b9daff10a3 100644
--- a/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-RefElem-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Array-RefElem-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d52876bbdea41be0193bed91a9895cb
diff --git a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1 b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
index f323c37c815d..e28c9db859dd 100644
--- a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Array-Window-1.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc00cd9f826932e57c952c03238330ba
diff --git a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0 b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
index 4f0f7e89a327..3a7202a2ae0d 100644
--- a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
+++ b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Astro-FITS-Header-3.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d866ab9ddceb4b3a1dcd81256acbba78
diff --git a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1 b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
index a230aff79960..46c63c395d00 100644
--- a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-libs/flac dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-FLAC-Header-2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91063ff901b7581951cb285446a9d730
diff --git a/metadata/md5-cache/dev-perl/Audio-Musepack-1.0.1 b/metadata/md5-cache/dev-perl/Audio-Musepack-1.0.1
index 49855c8511c3..b7b06ea013db 100644
--- a/metadata/md5-cache/dev-perl/Audio-Musepack-1.0.1
+++ b/metadata/md5-cache/dev-perl/Audio-Musepack-1.0.1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Audio-Scan-0.850.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-Musepack-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7bf8384809e4040a3bbe31d978dcfb26
diff --git a/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0 b/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
index 39e8d655839e..fb96d68bbf47 100644
--- a/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
+++ b/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-WMA-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=207867cfda4b54e4fa60d264b95115cb
diff --git a/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0 b/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0
index e80c342ddce3..5cff09dd3a46 100644
--- a/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0
+++ b/metadata/md5-cache/dev-perl/Audio-Wav-0.140.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=|| ( <dev-perl/Inline-0.790.0 ( >=dev-perl/Inline-0.790.0 dev-perl/Inline-C ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/Audio-Wav-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4110d5ce9ac9678b71b968826ec0d1b5
diff --git a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1 b/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
index bfd457008369..78c7183b4137 100644
--- a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Authen-DigestMD5-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=35ac92cf9cdc9ee62692bce9bfbed8ae
diff --git a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1 b/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
index f11d5a6d7759..937b7a476c32 100644
--- a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/IO-LockedFile dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24ecbe498a8352121db91b51cd1d2a31
diff --git a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1 b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
index 5b4dac5e2959..dc3a82d5b6ef 100644
--- a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.00 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e2a29aade2cabc228bb520d0b6f0022
diff --git a/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r1 b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r1
index d01e3abd3228..448fc29f68dd 100644
--- a/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/pam dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIKIP/Authen-PAM-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a371fcef415ca73ba37a466083a5b3b8
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1 b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
index 569f05e9a8f8..cbcec650ada9 100644
--- a/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-SASL-2.160.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Digest-HMAC kerberos? ( dev-perl/GSSAPI ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdf2c5140d072a4756c4a0c64979284b
diff --git a/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1 b/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
index 2b1350db6429..a51ec962f7ce 100644
--- a/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/AutoXS-Header-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/AutoXS-Header-1.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb720ec14d2bfb043a33e20c8602c6f2
diff --git a/metadata/md5-cache/dev-perl/B-Utils-0.270.0 b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
index d78f8aa731bb..e6ee1d510ff4 100644
--- a/metadata/md5-cache/dev-perl/B-Utils-0.270.0
+++ b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a95d7711418560034e821c2954bc0d9
diff --git a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700 b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
index 4646b11668da..1c8e9fd63281 100644
--- a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
+++ b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Benchmark-Timer-0.7107.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=078fa7d618df377b07f581bda5af5266
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
index 1ed820a20175..3518bf31fc67 100644
--- a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/db-2.0:* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.55.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5cc832c6dc4def955a23cc82ac055719
diff --git a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0 b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
index 207a152ed9d5..0b0c99a78d38 100644
--- a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
+++ b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-2.300.0 >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Bio-Graphics-2.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17b81b1bf1cf8fec2ed34c3e53e84689
diff --git a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0 b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
index a49db5bbf9fd..e47012329ee7 100644
--- a/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
+++ b/metadata/md5-cache/dev-perl/Bit-Vector-7.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Carp-Clan-5.300.0 >=virtual/perl-Storable-2.210.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1852c3ccfe2566af42990dd0f4a02dd4
diff --git a/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1 b/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
index 081ef238a41f..42aef8a1cdb1 100644
--- a/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Bit-Vector-Minimal-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Bit-Vector-Minimal-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47ef9cccaccb80965786a8fd71436ee4
diff --git a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1 b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
index b38c3fbea3d9..cb3eadfade11 100644
--- a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Boulder-1.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fac8cc26268f64069c774a1ba4ae4dec
diff --git a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
index 4821c15c6977..90779cd00611 100644
--- a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/Tie-StrictHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPOWERS/Business-FedEx-DirectConnect-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ed98a9f9e7b8ead07c9535ec7e0f42f
diff --git a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1 b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
index 0f5a009e530b..a0114ecfcdd1 100644
--- a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Business-UPS-2.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dac60cba84f2cd205f57d6d1e929a66e
diff --git a/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1 b/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
index 1682fa9808b9..968690f66ab6 100644
--- a/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/CDDB-File-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/CDDB-File-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb92328733dfd45c4776a9fe5367878b
diff --git a/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1 b/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
index 0da8b6e73ee8..fcc012fdb6bd 100644
--- a/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
+++ b/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz http://armin.emx.at/cddb/CDDB_get-2.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c8d42f4c98eb0b48965c9d13ac13c72
diff --git a/metadata/md5-cache/dev-perl/CGI-4.220.0 b/metadata/md5-cache/dev-perl/CGI-4.220.0
index 02bda7faabe5..b4dab0a84d73 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.220.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.220.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 virtual/perl-File-Temp >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=026d89d4adc33604ca4a52d9c272a090
diff --git a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0 b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
index a84b698ced63..d6b45c919ac0 100644
--- a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
+++ b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPEDERSE/CGI-Ajax-0.707.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3210a28d530b7aa4475c2ab943574d59
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
index 0c1292afecad..542e35ccb695 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7770a3ccee733bdee4cb5f491cc8453c
diff --git a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1 b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
index 1f3f14607637..a97f9a5e8bfd 100644
--- a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-3.330.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=546a338ff1f865b5a0b81514ff3cdf6a
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
index e4d87bc4f4c6..acb10a42b845 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48c1c57a99ec0d807985438757c22173
diff --git a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0 b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
index 898fd7053ceb..c22ea3a74204 100644
--- a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
+++ b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/CGI-Simple-1.115.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cc5f479ea6cb483cf536e5c6c081649
diff --git a/metadata/md5-cache/dev-perl/CHI-0.600.0 b/metadata/md5-cache/dev-perl/CHI-0.600.0
index 4958a7c28b07..b48ce1244c05 100644
--- a/metadata/md5-cache/dev-perl/CHI-0.600.0
+++ b/metadata/md5-cache/dev-perl/CHI-0.600.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Carp-Assert-0.200.0 dev-perl/Class-Load dev-perl/Data-UUID dev-perl/Digest-JHash virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.800.0 dev-perl/Hash-MoreUtils >=dev-perl/JSON-MaybeXS-1.3.3 >=dev-perl/List-MoreUtils-0.130.0 >=dev-perl/Log-Any-0.80.0 >=dev-perl/Moo-1.3.0 >=dev-perl/MooX-Types-MooseLike-0.230.0 dev-perl/MooX-Types-MooseLike-Numeric virtual/perl-Storable dev-perl/String-RewritePrefix dev-perl/Task-Weaken >=dev-perl/Time-Duration-1.60.0 >=dev-perl/Time-Duration-Parse-0.30.0 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2509413006aaee24bcdce23b73db00b3
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
index fcb35d4a5c51..052f8e50d5a5 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3d06c8c98a4fce63758f74994a9c21c
diff --git a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0 b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
index 47bd0ee797af..ca6807115cb7 100644
--- a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
+++ b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-0.100.0 >=dev-perl/Clone-0.150.0 >=dev-perl/String-Tokenizer-0.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CQL-Parser-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dac861c352a284ced8f90cb8c93f39d6
diff --git a/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1 b/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
index 0c8e37632ac0..2960a642c9ad 100644
--- a/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/CSS-Minifier-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMICHAUX/CSS-Minifier-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6ad2651ef5ee0444ba9a9d228926175
diff --git a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1 b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
index bf00b02a21bb..66fb3538d467 100644
--- a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9a1bcd8bba52d92bb4921ccd37d2661
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1 b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
index 4c107682530c..b735e889341a 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/String-CRC32 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e348c50fdebf0fc137e44b35f3c894a
diff --git a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1 b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
index f0af9bda1e8f..ca2cdca0c901 100644
--- a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b89d6810461215ff60ccc70e838cf6d
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.106.0 b/metadata/md5-cache/dev-perl/Cairo-1.106.0
index 84e8950b6c00..96ea80bf6353 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.106.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.106.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf0cca68d4d183b5c76415481d27afe8
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0 b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
index bfa09877399b..4d8fa6a3379c 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aeea85479f5bf8e3bebf966032824139
diff --git a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2 b/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
index 4d69a70119d5..9a155e1c502e 100644
--- a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
+++ b/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.70 >=virtual/perl-Storable-2.12 >=dev-perl/Params-Util-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Chart-Math-Axis-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91944c17ace947e2ecd03b16d7408532
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
index 677c3f89745d..7fdda8a60e0a 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4924ba21aea064d267deb8e10af6f940
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
index b1ddb29ecebb..12d6ec196fa9 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86930852aaa7deac9b164b50c35f4177
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120 b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
index 420c841341e7..cec3d96dc64e 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Class-XSAccessor-1.190.0 >=dev-perl/Sub-Name-0.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3979a362bbe643d15348601cd71896f3
diff --git a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
index 1a6ded9c7792..54e5ce123712 100644
--- a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Adapter-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36d5a34cb814694a27b31e851168bf88
diff --git a/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2 b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
index bf206a169b37..9630c6b05431 100644
--- a/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Autouse-2.10.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.18 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7453eb7a123cf5c3c966620c2cae9f4
diff --git a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1 b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
index 2cc6b9fb1cc7..df700997b136 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MRO-Compat dev-perl/Class-Inspector >=dev-perl/Class-C3-0.20 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56ba8ca5729874d97e00e1d44e3ae393
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0 b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
index 74d2ad21c8b9..591f062e849f 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
+++ b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-0.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JC/JCZEUS/Class-DBI-Plugin-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9f47f5fc7d18cd5c5b10d3071ac4ff7
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0 b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
index c07311f535e6..ee700c369cd2 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
+++ b/metadata/md5-cache/dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.80.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-DBI-Plugin-0.03 >=dev-perl/SQL-Abstract-1.60 dev-perl/Class-DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRIHA/Class-DBI-Plugin-DeepAbstractSearch-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37cdc7cdd8ddc85962e27ae1f77d52c5
diff --git a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1 b/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
index 55cd6b6e1bc4..24c65bd58261 100644
--- a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Default-1.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3822d5c818f6c57b459acd5a2789a0ec
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.200.0-r1 b/metadata/md5-cache/dev-perl/Class-Load-0.200.0-r1
index f8d4b4c5f35a..e18ca7358851 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.200.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-perl/Data-OptList >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Package-Stash-0.320.0 dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Class-Load-0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=024ed19ff4201709b431a210bcaa4c0a
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.230.0 b/metadata/md5-cache/dev-perl/Class-Load-0.230.0
index 498a37cfd9df..1b0a74f504e0 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.230.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.230.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-OptList virtual/perl-Exporter >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d1cb2eaae267f965dcacdeebe803e35
diff --git a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1 b/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
index 779e710d9f52..72d42fc0208d 100644
--- a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Class-Loader-2.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=59f62de679ff9593ac271ecd353af33c
diff --git a/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1 b/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
index ee72821d6547..75a3f47aa743 100644
--- a/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-MakeMethods-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bd8344dfd6147b0e7af38c0b0a48342
diff --git a/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1 b/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
index 9cba6616990f..ad99623f467f 100644
--- a/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Member-1.600.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Class-Member-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b67fc8d054c56885c7469982f7d729a9
diff --git a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0 b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
index 0116548726be..2bc4cf16db7b 100644
--- a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
+++ b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cc81137ac164583e47fac1462b8618c0
diff --git a/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1 b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
index 73ad6ea65ad7..146521783a7a 100644
--- a/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-StackTrace dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24f778a4758b6a865fe2a44bce97309f
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0 b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
index 9a426e42779c..a56c169d1b9a 100644
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
+++ b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f48403159b7c276f665e01a8074fa71
diff --git a/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1 b/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
index 180235264ccf..69c9109099d7 100644
--- a/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Spiffy-0.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Class-Spiffy-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=141becd391eb9ae3db09ea03998351cf
diff --git a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1 b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
index 797ea294476d..c7cdd7ce534b 100644
--- a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
+++ b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Std-0.11.0 virtual/perl-version virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad493ad04c6feb5aac67f7e2b58fe040
diff --git a/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1 b/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
index 23626e4a8f86..bc55e994f71a 100644
--- a/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Trigger-0.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Class-Trigger-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5dab3301a38393a33cdeddba0089bf0f
diff --git a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1 b/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
index 3d01ca041867..5a24ff47c77d 100644
--- a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-WhiteHole-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccc8d3102ccf46c4db76d61cee2d6dff
diff --git a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1 b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
index 64108657871e..04446a5ad937 100644
--- a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Class-XPath-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc6638c8763c7004e15dc450030902cf
diff --git a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0 b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
index c018697d74e5..0972156d368b 100644
--- a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
+++ b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/AutoXS-Header-1.01 !dev-perl/Class-XSAccessor-Array dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d83d9f162edb3feecd9f9f9dd653aaac
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
index 2d45d1b395e6..723a3841874e 100644
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f02bdba9dd35042a00c745d173ef316
diff --git a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1 b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
index 56c53d520ba2..46d691d37230 100644
--- a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker virtual/perl-Text-Balanced virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Config-ApacheFormat-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1cb7142d70e459039bcd76042179fc9c
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0 b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
index c44d9066783c..4e5ecf5684ea 100644
--- a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
+++ b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec >=dev-perl/YAML-0.670.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.44.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e4cc3fe495e05ebcca687c02fbc35bb
diff --git a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200 b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
index 7172b547ec56..103178cc95c3 100644
--- a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
+++ b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Moo dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIZEN/Config-JSON-1.5202.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ee94a36f1767bd70e44b363272c1963
diff --git a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0 b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
index d80b1d87d4f7..b8faa90d25a1 100644
--- a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
+++ b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp >=virtual/perl-Text-Tabs+Wrap-2001.92.900 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.80.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6628a4d1bf4bc991d5c2daf014ad4bce
diff --git a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1 b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
index 86b44036edb8..d0a9905b2a9d 100644
--- a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad9a98aa1baacc69685ed92cbc5d194b
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
index c9076b3afc1a..63c9a47e5d17 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a8b392f1440e9b40dd7ceae4bc32b7d
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
index e95473391740..50e85dc8fc41 100644
--- a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Exporter-Progressive-0.1.7 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df6f3cae81d715282b62414fd1804c03
diff --git a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1 b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
index 84257f452f88..1955d5cd6247 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8099f0837dac908e156a1adb68e5c65
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
index 679a3be7894c..4c9a10c54e57 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92e234b239ccd4afc70e6c48d17d9208
diff --git a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1 b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
index 2cc3bf753fbc..79144fdac1cb 100644
--- a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-BER-1.32.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e58dc462afd0bd02759be42dd920aa74
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
index 456146daa909..5c7e80dc8ece 100644
--- a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-ErrorHandler dev-perl/Convert-ASN1 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d08b371e845a26853740cb542feeec1d
diff --git a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2 b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
index 55ba38753d20..b55958fac0d8 100644
--- a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
+++ b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-tools dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Convert-TNEF-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7456c542bcecf7fb0d9bb1d3af4ad5a3
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.400.0-r1 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.400.0-r1
index 0d8fea808a7c..a78d30eaa8c3 100644
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-UUlib-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=593ab414b47c3ee6337f760c7a407883
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
index f16c8c177df9..ddb8b33dff27 100644
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-uulib? ( >=dev-libs/uulib-0.5.20-r1 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3717c5ea6d80518fe22c9469f6f9b4ea
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
index bbd60999a557..a963c4079db0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88a652ce86bc56d3a7a130068233cdc7
diff --git a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
index ac35eae95a4e..48e2858218a0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBMATH/Crypt-CAST5_PP-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9de27440952385497ef57a6ce78cb900
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
index f2151df284fd..deb9dda51c17 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9fb0ecdbe0543a0cfcd1dc203dfc174
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
index 5abd0bb8fb6a..8278007e707d 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/cracklib dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd8fad99e2fa7678c416e19176fac5d4
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
index 58a75fa878ec..1856d77208d0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-DES dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Crypt-DES_EDE3-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=193ffcd7c1f151dddd8857b6332ad224
diff --git a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0 b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
index 858db11e1cb1..a1a2fe54a292 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+++ b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-perl/File-Which virtual/perl-MIME-Base64 >=virtual/perl-Math-BigInt-1.78 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87e37c15a2d974ff055a01a5fe110689
diff --git a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
index b5f5662ca429..c0b73e2a5f35 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Mix-0.1.0 >=virtual/perl-MIME-Base64-2.21 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3d9e14a5147b62b0c2dd431d0b656d3
diff --git a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0 b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
index 47a89f0e8e5c..61d94a0c757e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
+++ b/metadata/md5-cache/dev-perl/Crypt-IDEA-1.100.0
@@ -8,5 +8,5 @@ LICENSE=Crypt-IDEA
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=51c31c8470db457952908846fcde48f1
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.150.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.150.0-r1
index ef2d34ab144b..8fc5c121aa93 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.150.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-DSA-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec1b0e1dfb6a2aca5182f41d54acd782
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
index 2543175c429f..4107d9c8710b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e702b0c57dcc4ee7ccf45cfe69bf4b4
diff --git a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0 b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
index 72c474acee67..b56ac9c47c5c 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
+++ b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e65dc6de752fb7126777f2109234b41
diff --git a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
index ce021f2b4972..9adfdfe02096 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Math-Pari dev-perl/Crypt-Random dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Primes-0.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b759da6a5c1d6198e7f6312e11205f7a
diff --git a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
index bb3056e2153e..c0165d807344 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5aa28327234796099c90e2c5b65bc6c
diff --git a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
index 7d28a8e7c9be..994f5c9689c5 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Loader dev-perl/Crypt-Blowfish dev-perl/Convert-ASCII-Armour dev-perl/Crypt-CBC dev-perl/Crypt-Primes dev-perl/Crypt-Random dev-perl/Data-Buffer dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 >=dev-perl/Math-Pari-2.010603 dev-perl/Sort-Versions dev-perl/Tie-EncryptedHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-RSA-1.99.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5d983acc6fb57b6713463a3c67cdded
diff --git a/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
index d145117ef805..3b2c3f035a0a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Random-1.250.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Math-Pari-2.010603 dev-perl/Class-Loader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=38e7b423b59eadbc4469d67ed7c01103
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
index be60782f0daf..780295cbf01a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c2438e0f7ee770514046ac8a35529f9
diff --git a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.150.0-r1 b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.150.0-r1
index b3ac9bbb1a3f..97ab922d64fd 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.150.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKAGE/Crypt-SMIME-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46bfbbd0588b4f9426a2c8eb49fb91c4
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
index 7323308a4b1d..c79742e59e89 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
@@ -10,5 +10,5 @@ PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7c:0 ) libressl? ( dev-libs/libressl ) virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6d4d2c2477ffa26cea2b51bdbfdd2eb
diff --git a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
index 9433b61e6093..88c7df836cd2 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/FreezeThaw virtual/perl-IO-Compress dev-perl/Crypt-Blowfish virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Crypt-Simple-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60580d74aac1268cb02f6222f3c2f849
diff --git a/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r1 b/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r1
index bd5b82ccedde..b8a9b486c115 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Digest-MD4 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69f30c8f649486543548167307721e6c
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
index 495abcb46f01..5b7bf8fb26d8 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0074ae0ef3264009fc4571ced9bc3bed
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
index 4cf209081640..4b3b1ce525c7 100644
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
+++ b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJUNG/Crypt-X509-0.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dbe13f77626de19c8771a2d5fc597819
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.32.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.32.0-r2
index 88bd1e653404..5b59b7e0e206 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.32.0-r2
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.32.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Test-Deep virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.032.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a84eee36d6e507c3ec5d2778c88d54e
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0 b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
index 80e6249207fc..c7b1ed4ca713 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBIx-Class-0.81.270 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/DBIx-Class-DynamicDefault-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0646155bcaaec23fbe6f9f8bd313e9d
diff --git a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1 b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
index cc18f25b3f03..2f3698479bcd 100644
--- a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.37 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/DBIx-ContextualFetch-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b90b2a27260bdb77146d9cff95a01d40
diff --git a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0 b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
index 22db839d8ee0..4bc540ea6c97 100644
--- a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+++ b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50afea3aafd62703a5c3bd2e4eae46d4
diff --git a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0 b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
index 3ed68c3e58fd..32059323648a 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/DBI dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/DBIx-Migration-0.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dcbc1083a321eabae02f8c8ef2d34d44
diff --git a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1 b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
index 4b7ad4c762e4..1a989a3c015c 100644
--- a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09434199aa87b5381b0f9f394f5ef4d5
diff --git a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1 b/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
index 0e6e3d6c5936..4e1d84d5a97a 100644
--- a/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DB_File-Lock-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-DB_File dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DH/DHARRIS/DB_File-Lock-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2434993a590110839a5739889c4cfa7
diff --git a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1 b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
index ebb00c26ceec..546526bfe99d 100644
--- a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
+++ b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sys-Syscall dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Danga-Socket-1.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a19bfbbf01f828509036c2fd9118b95
diff --git a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1 b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
index 33c40d8b2dd4..86b6158a26af 100644
--- a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Any-Moose dev-perl/UNIVERSAL-require dev-perl/XML-LibXML dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYPESTER/Data-AMF-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a97a90d3f339c24a143790ab700fb6e
diff --git a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
index e0dcc4cb274b..61c29b910d97 100644
--- a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Data-Buffer-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8410a5b954965a083e41cdd29d4b06f
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
index 3e14a2486f2d..eed460bf5abc 100644
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9ad1a48538d76192b50884d8a9aaea2
diff --git a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1 b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
index 985db4e15b47..843481b2699e 100644
--- a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
+++ b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Data-Diver-1.0101.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d0ac2b5a0975f15ec2af2acf87a5886
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
index 0934f92c0a83..2bce21e89f45 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac0f801edb60f5278dd96b43452eb4c3
diff --git a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1 b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
index ec529b50b006..5791cbcefff0 100644
--- a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2 >=dev-perl/XML-Parser-2 >=dev-perl/Array-RefElem-0.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-DumpXML-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a119d72d29dc9fc88e53b026520e725c
diff --git a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1 b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
index 4f9f9d32d928..b541cd9d61f4 100644
--- a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Data-Hexify-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbfef289ef2399ff19f006a1480de70c
diff --git a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1 b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
index 1323d91cf905..005cb39875fb 100644
--- a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8210bad4db356636990ebb0b05fe208
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0 b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
index d9c47864a45d..d8f67b4b09c7 100644
--- a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=70f8b9263ca88a652a76224bbbb365ea
diff --git a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
index a5b2de127bfc..0d18ca50b908 100644
--- a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f27afeb5bb99599c2a86511c60650f8
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
index e01309fcf970..a827534b08ef 100644
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dc055ed94ca6214bab98b0d5bc6c342b
diff --git a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0 b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
index b8b6582b62fd..2b575aef4158 100644
--- a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
+++ b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKSTE/Data-ShowTable-4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa82b7ffb30048d1f7e5b9428d13d01c
diff --git a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1 b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
index 24e6a6ecf409..3c5742161507 100644
--- a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CM/CMUNGALL/Data-Stag-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=32fc220cc295ecd9299b3f209be8b7c3
diff --git a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
index ce2ae2eac9fd..4ac5fdde2f3b 100644
--- a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-perl/Sub-Exporter dev-perl/Path-Class dev-perl/namespace-clean dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=361cdb27d76465c6e7c9dff615200a1a
diff --git a/metadata/md5-cache/dev-perl/Data-Types-0.90.0 b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
index 19e52515ba4d..021a895fdfc0 100644
--- a/metadata/md5-cache/dev-perl/Data-Types-0.90.0
+++ b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Data-Types-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc1f1d506a299364a8f29e6808f30311
diff --git a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
index a652ac2739b5..a214072415a8 100644
--- a/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-URIEncode-0.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=11a84521a6f105b294ed03bf3590f65f
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
index 3d7a39d7a044..1eb644695cb5 100644
--- a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+++ b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b40b5ec28ef47c6aa42799014fb2f39
diff --git a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1 b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
index f81a029c98bd..b2cd7fdfc7b5 100644
--- a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9cfdff889393704a487609d3f16b4cfd
diff --git a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
index e2c5262795ab..ff2043df470c 100644
--- a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORNELIS/Data-Utilities-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=132c42c82e3b0f512bef2a71c1dcedad
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
index 94c07b45cfa2..b15759216802 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Net-Domain-TLD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99dc546ca828560541ad70138f2f8e2e
diff --git a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1 b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
index b0a1fc0d03cc..5d0af8b34dcf 100644
--- a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.60.0 >=dev-perl/Moose-0.890.0 >=dev-perl/namespace-clean-0.190.0 >=dev-perl/Tie-ToObject-0.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a2cd92f476e7960c80443af41af5ff2
diff --git a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0 b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
index d941dd1f2ede..c7d4ad840ae5 100644
--- a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
+++ b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) LGPL-2
 RDEPEND=>=dev-perl/Bit-Vector-7.400.0 >=dev-perl/Carp-Clan-6.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b3a4c2a3a71246a61ebbb8d161f9832
diff --git a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1 b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
index 3845a87a38b0..cb62557066b9 100644
--- a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Date-Leapyear virtual/perl-Time-Local virtual/perl-Time-HiRes virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-ICal-2.678.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5e9b66263aaedcd29c68e78ee8c4c38
diff --git a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1 b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
index b996ad21e07f..23fbc9787634 100644
--- a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-Leapyear-1.72.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a611b0acea157b9e87a77940e70fbd38
diff --git a/metadata/md5-cache/dev-perl/Date-Manip-6.510.0 b/metadata/md5-cache/dev-perl/Date-Manip-6.510.0
index 0ba497944f9c..a044cf12682c 100644
--- a/metadata/md5-cache/dev-perl/Date-Manip-6.510.0
+++ b/metadata/md5-cache/dev-perl/Date-Manip-6.510.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO virtual/perl-Storable elibc_musl? ( sys-libs/timezone-data ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ef10f88c1550c2f930c2aba82aa3eac
diff --git a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1 b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
index 5357976502b6..2e9952302d88 100644
--- a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-7 >=dev-perl/Carp-Clan-5.3 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Pcalc-6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd5b33ecc39fa35df8f4df530966f38f
diff --git a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1 b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
index 9576577d8c2b..54a7758e86f9 100644
--- a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3cd9d20a811c526dc7c2e89d0d61f95e
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.200.0 b/metadata/md5-cache/dev-perl/DateTime-1.200.0
index fa9aa008124e..00fcf593be10 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.200.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.200.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-0.760.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b1c23a7ccb9686169754edf3dc58a05
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
index ef453deb5e62..114625b29517 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Class-Factory-Util >=dev-perl/Params-Validate-0.91 >=dev-perl/DateTime-Format-Strptime-1.0800 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4b078ed7690dd6a4cacc67146434675
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
index 964c6b97d481..545fd18c5819 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.29 dev-perl/DateTime-TimeZone dev-perl/TimeDate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d662a4952ce733b399a4be62c01fc3d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0 b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
index 59b87724d24e..4d2ff6f4ad6b 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c12e413d20f3510702c8bfbe4f11d55
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
index 52e302d961a1..64cc3b889c70 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ICal-0.90.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-ICal-0.03 >=dev-perl/DateTime-Set-0.1 >=dev-perl/DateTime-TimeZone-0.22 >=dev-perl/Params-Validate-0.59 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52d8b2b306839e21c2d04825c8c68ce
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
index 4ac89aafbebb..42361a22e2c1 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aeba8410f5e3b9e96c86306c5d007fc6
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.10.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.10.0-r1
index f0138eca0701..da663b0341bc 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/boolean dev-perl/Clone dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/Date-Calc virtual/perl-Getopt-Long dev-perl/Params-Validate dev-perl/List-MoreUtils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a939ddf951c3f32c48b4805acd638fc
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0 b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
index 68906019553e..7657f9235181 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba9189668c62b44bc69ea0399252f655
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
index 7004d0aa5257..1eed6ae54acd 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 dev-perl/List-MoreUtils dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.46.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f93086d5ff5f5e7f2c2b701310d33d9
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
index 9a9a61b3ffee..28789e7a8656 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/List-AllUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.93.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c4f2fba06789b40d4fe2091d06cdd57
diff --git a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0 b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
index 3101031bce8b..2bd656504fcc 100644
--- a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
+++ b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/TimeDate dev-perl/DateTime-Format-Flexible dev-perl/DateTime-Format-ICal dev-perl/DateTime-Format-Natural virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8735e66cb744de19f353134740ae82c
diff --git a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1 b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
index dd16174e8dfb..e8f8ad20626d 100644
--- a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
+++ b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWALSH/DelimMatch-1.06a.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=967285829fc0e449c0db67c565e13f2a
diff --git a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1 b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
index 828530b7e33d..abef85620590 100644
--- a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Devel-ArgNames-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=995abb43848968cec6a9e1ce3f4b2c53
diff --git a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0 b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
index 26be8ddc3cda..d5e23addfbc8 100644
--- a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b40310625456b28427548419e7690ac8
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
index c7141908b459..9885f3a52418 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7219ac50a96e40e1cec4a53d298d5c28
diff --git a/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1 b/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
index 44116f2bf881..4a6bd16d68aa 100644
--- a/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Dumpvar-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.18 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Devel-Dumpvar-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=104f2d594779b3f2c57318637bba9f3f
diff --git a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.120.0 b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.120.0
index ea4bcf8889c1..34fb90d9f83b 100644
--- a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.120.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6219c14f1b0b50f1bc353e97aad6f0e1
diff --git a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0 b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0
index 5e7da6bc0503..4c7de8fb17ec 100644
--- a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0
+++ b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9448e7fa4b6ce28254e4beb1fff0ff56
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900 b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
index 33ac5d49016f..6bf8d5df93a2 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0009.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a64dbe492541b629f677747ee538e44
diff --git a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0 b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
index 38dfa4ca34e8..68f51a139157 100644
--- a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
+++ b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Caller-2.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-LexAlias-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cecb28c47acf2ec5d404f146f7e7de03
diff --git a/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1 b/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
index a0ec327d45f6..f3e67d811456 100644
--- a/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Refactor-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SS/SSOTKA/Devel-Refactor-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf9ac702dc83bd471f41f52e72ceaea1
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.0.0 b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.0.0
index 4c35d597e4ce..a02c450ed29b 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.0.0
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.0.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=778ca12506f2469a6e963fb58df2f653
diff --git a/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r1 b/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r1
index b6645168a66d..4577db224a82 100644
--- a/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Device-SerialPort-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9094e540c007022db060a9026feeb5a7
diff --git a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1 b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
index b9effb585f35..e9295e29bdee 100644
--- a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Digest-BubbleBabble-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=266f81cf23af716849f0871396268ebc
diff --git a/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0 b/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
index 6b153e9ba384..a37e9df47dc9 100644
--- a/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
+++ b/metadata/md5-cache/dev-perl/Digest-CRC-0.210.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c615c92bad8a839babceac0871649c69
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
index 951db78aa50a..9c403c4e9bfc 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26588ed3dab50cc6f986fb0eba82978b
diff --git a/metadata/md5-cache/dev-perl/Digest-MD2-2.30.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD2-2.30.0-r1
index f27f1eb40681..1dc31ae33b10 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD2-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD2-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD2-2.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4d0b5713f99705b6fd5037e67be4133
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
index 5da2c4668d6c..0a15b4f0c374 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c53ef5f37663f20edee882f0921dc945
diff --git a/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
index eeafb586fab0..e2ce26a69bec 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD5-File-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17045a32d46f45e11cdb8347ca106223
diff --git a/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r1 b/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r1
index 1eb7f17b3ab1..733182c889a1 100644
--- a/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-Nilsimsa-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Digest-Nilsimsa-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d455413a3b03a8607cf7c66125e2a21
diff --git a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0 b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
index d30a230e4162..495a3a3bb547 100644
--- a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
+++ b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=387bd6ba614a84c4beaf8fd3045a7126
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1 b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
index 9c5a38c3121d..12a63ebdd673 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95a19bc79ec192a1a02f83e3e2580916
diff --git a/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0 b/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
index b5dee20b3ce5..cc1f12efbcba 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f00751a440b24f60541aaa702c75f86c
diff --git a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1 b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
index 37d9d9429606..bd745a248eac 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/TimeDate-1.16 >=dev-perl/Email-Abstract-2.13.1 dev-perl/Email-Date-Format virtual/perl-Time-Local virtual/perl-Time-Piece dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-1.104.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c56c3ca9213120be46ccbc64ad75127
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index bc07bddf04af..df9b2b3b1dc3 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad0e2ad0406829e81a405b94d4c79fc9
diff --git a/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0 b/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0
index a49310b58288..eb6630183289 100644
--- a/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0
+++ b/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Pluggable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-FolderType-0.814.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4dd31445de94b80aba88f3621b218145
diff --git a/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r1 b/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r1
index 282784e09ed7..2dfc39a69e37 100644
--- a/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Email-Simple dev-perl/Email-FolderType dev-perl/File-Path-Expand dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-LocalDelivery-1.200.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81c9a36178798c9bb993ff9727496177
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
index 9c538f71f7cb..6eddcff3b8b5 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Email-MIME-1.900 >=dev-perl/Email-MIME-ContentType-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e07ca1b0251ce228d1fe17a6e0dae430
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
index a227082c5555..e2e0594781e0 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.07 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b006ab285552526b9dcfa4572a851e0
diff --git a/metadata/md5-cache/dev-perl/Email-Send-2.201.0 b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
index c3e1078b582f..0a45e721de49 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-2.201.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Email-Abstract >=dev-perl/Email-Address-1.800.0 >=dev-perl/Email-Simple-1.920.0 virtual/perl-File-Spec >=dev-perl/Module-Pluggable-2.970.0 dev-perl/Return-Value >=virtual/perl-Scalar-List-Utils-1.20.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e258f493ae9cd99c27887e092a3db3b8
diff --git a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0 b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
index add927143d50..48351a977e35 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Authen-SASL dev-perl/Email-Address dev-perl/Email-Send dev-perl/Net-SMTP-SSL dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Email-Send-Gmail-0.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f38b801edd957f16437f05a4cb77660e
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
index 6c8c16bb6e85..5af88a267e1b 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec virtual/perl-IO dev-perl/List-MoreUtils dev-perl/Module-Runtime >=dev-perl/Moo-1.0.8 >=dev-perl/MooX-Types-MooseLike-0.150.0 virtual/perl-libnet dev-perl/Net-SMTP-SSL virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3c075f9864c86618d67f7b686c104fe
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.196.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.196.0
index 7086b3c72d5d..21c661d92852 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.196.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.196.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.196.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13a4bfe96f8296aa9943135b7bb311be
diff --git a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
index 22b7a9f75bab..26c2dda51421 100644
--- a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=411680c7245ac83276f01795cdb6f41f
diff --git a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1 b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
index dff40f72876f..1ab173ac6c12 100644
--- a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adb035ff8adf188256b980c3773f4769
diff --git a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0 b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
index f29ec7b95aae..f8f54afc8d52 100644
--- a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
+++ b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd74133d78e2b5af4ac4286f40cf186a
diff --git a/metadata/md5-cache/dev-perl/Encode-Locale-1.30.0-r1 b/metadata/md5-cache/dev-perl/Encode-Locale-1.30.0-r1
index 8942c80b7dec..1c7a81a968da 100644
--- a/metadata/md5-cache/dev-perl/Encode-Locale-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-Locale-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=37475dcde90d506af256799db36f78bd
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.240 b/metadata/md5-cache/dev-perl/Error-0.170.240
index 1217becbc3b7..79fa41530d48 100644
--- a/metadata/md5-cache/dev-perl/Error-0.170.240
+++ b/metadata/md5-cache/dev-perl/Error-0.170.240
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17024.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed050313b12737792126c88377d6db0a
diff --git a/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0 b/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
index 5e03f892a4e8..05da92f3f1a5 100644
--- a/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
+++ b/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Perl-Tidy ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=287a50404434828b8248afcced3acaea
diff --git a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0 b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
index 081899a1b34d..05d0575c4e94 100644
--- a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
+++ b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Eval-LineNumbers-0.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16926b85f8809d9ebbb27505a7ce50b9
diff --git a/metadata/md5-cache/dev-perl/Event-1.240.0 b/metadata/md5-cache/dev-perl/Event-1.240.0
index 6cf45c3b852a..8d9cd0269a0f 100644
--- a/metadata/md5-cache/dev-perl/Event-1.240.0
+++ b/metadata/md5-cache/dev-perl/Event-1.240.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Event-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0598fc0630365413470d488291520a9f
diff --git a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1 b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
index 1eedf04562a7..f69b3b51d5e4 100644
--- a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
+++ b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/AnyEvent dev-perl/libintl-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-ExecFlow-0.64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2350613b0a14b38b4dfb7be2e0a08d0b
diff --git a/metadata/md5-cache/dev-perl/Event-RPC-1.50.0 b/metadata/md5-cache/dev-perl/Event-RPC-1.50.0
index dd54ae831490..ac0a1e9e77dd 100644
--- a/metadata/md5-cache/dev-perl/Event-RPC-1.50.0
+++ b/metadata/md5-cache/dev-perl/Event-RPC-1.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=|| ( dev-perl/Event dev-perl/glib-perl ) dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-RPC-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c06cae75dd02975dcbc463dc51299ad9
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.390.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.390.0
index fcec5efab759..3d39bc82391a 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.390.0
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.390.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c976c9d55191102b348beddbfd04d03c
diff --git a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1 b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
index d4235a9b05c8..6403085f0ecf 100644
--- a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-System-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c1e3026137feb13f45379e3b4a77a7a3
diff --git a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1 b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
index af48090ef0ba..5cfb465b04db 100644
--- a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
+++ b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b366cc62017d46c4df3d00c015640e2e
diff --git a/metadata/md5-cache/dev-perl/Expect-1.320.0-r1 b/metadata/md5-cache/dev-perl/Expect-1.320.0-r1
index fb95844062e2..716a32f92cc7 100644
--- a/metadata/md5-cache/dev-perl/Expect-1.320.0-r1
+++ b/metadata/md5-cache/dev-perl/Expect-1.320.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO >=dev-perl/IO-Tty-1.110.0 !minimal? ( dev-perl/IO-Stty ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Expect-1.32.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0cd7c509a1c2e70321c43171efc04b67
diff --git a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1 b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
index 1f1569799c5d..490d9124de5a 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DH/DHAGEMAN/Exporter-Cluster-0.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8bc1fb0f9a899de34f4be2b6aab166b4
diff --git a/metadata/md5-cache/dev-perl/Exporter-Lite-0.20.0-r1 b/metadata/md5-cache/dev-perl/Exporter-Lite-0.20.0-r1
index 0f51743a01e0..8da5162170d7 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Lite-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Exporter-Lite-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Exporter-Lite-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06d2669b210cee2d5589f7eb31e3cfe4
diff --git a/metadata/md5-cache/dev-perl/Exporter-Tiny-0.42.0 b/metadata/md5-cache/dev-perl/Exporter-Tiny-0.42.0
index 2f4b4c21d3d0..e1e69c0b4c2c 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Tiny-0.42.0
+++ b/metadata/md5-cache/dev-perl/Exporter-Tiny-0.42.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-0.042.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa8de4ad697319e1eda912e3d73d0a47
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-AutoInstall-0.630.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-AutoInstall-0.630.0-r1
index a946316661ed..26ee66db0d0d 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-AutoInstall-0.630.0-r1
+++ b/metadata/md5-cache/dev-perl/ExtUtils-AutoInstall-0.630.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sort-Versions dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUTRIJUS/ExtUtils-AutoInstall-0.63.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9e6f2ebfe59250f15668adf64f11a5
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
index b9f6aede0c6f..3d67c45030f0 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.30 virtual/perl-Data-Dumper dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45440725393411872c8b0e8c1965849b
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.404.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.404.0
index 00b5c3db9c28..9d6ecf46fae2 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.404.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.404.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.404.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5baf4d6a11d390505ab60178c3672a06
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.180.0 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.180.0
index 7f62a8c52027..f22c69affed5 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.180.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.180.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/ExtUtils-F77-1.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9af5b9117c68e5b10d34a8c4085c1e70
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
index 029d2f5e69cb..c38f3997f828 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Text-ParseWords-3.240.0 virtual/perl-Module-Load dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdae582ed84684d95b7e658b20d98f25
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
index 33138b7ea5b4..3ddeebc37571 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7547b0cdcb7db9da542bdd3fb705a4fc
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
index a55a1fd00ab2..cc199689635a 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-perl/Tie-IxHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2d2c68dabeb35ff73de814809b81eb5
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
index 74bd603b84b6..f3673c4fca3f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-ExtUtils-ParseXS-3.70.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eeaa2c111d7a6a4cf9d015a7453a9357
diff --git a/metadata/md5-cache/dev-perl/FCGI-0.770.0 b/metadata/md5-cache/dev-perl/FCGI-0.770.0
index 1de0c8d63cff..f2062d3c0629 100644
--- a/metadata/md5-cache/dev-perl/FCGI-0.770.0
+++ b/metadata/md5-cache/dev-perl/FCGI-0.770.0
@@ -8,5 +8,5 @@ LICENSE=FastCGI
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.77.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=814ced8baad029525c1d43d53317daed
diff --git a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
index ffa9ebf2801b..4a8bc8b98288 100644
--- a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
+++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de614ebcd16010e0283f19699526d669
diff --git a/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r1 b/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r1
index f77a7d11d72c..214a384be821 100644
--- a/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r1
+++ b/metadata/md5-cache/dev-perl/Festival-Client-Async-0.30.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJHD/Festival-Client-Async-0.0303.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=328c8d9321cf0a78160f52bb1c01c1a2
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1 b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
index d7b7c47d9756..7d4f665a7c4a 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f53688469504ebf43770f525985b537b
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
index 3ff567f36f5c..a370e2ca33ef 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e0f4fc1ea5d522f4b67d57c6b2e7b4b5
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
index d89ecdbd4268..a42c367f6492 100644
--- a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec >=dev-perl/File-BaseDir-0.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PARDUS/File-DesktopEntry/File-DesktopEntry-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a72a3e9906acd0a41754a189eadc1bb
diff --git a/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1 b/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
index af52f02d4f92..a157750dd769 100644
--- a/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec >=dev-perl/Number-Compare-0.20.0 dev-perl/Text-Glob dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14271300a0c9fbf75d3d42aaf7b77b08
diff --git a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0 b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
index 3451b1a5addb..717bf2c8b64a 100644
--- a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
+++ b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/AnyEvent dev-perl/Event virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/File-Flock-2014.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4bce7e8b5862e2340c40b95146f3b019
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1 b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
index a186d0f81988..6c972720324e 100644
--- a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=536f8348d816adec80405bdfb337fd87
diff --git a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1 b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
index 36142b9714b1..2954174dcb66 100644
--- a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=File-MMagic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5afbb475aec908690472acb641c3167
diff --git a/metadata/md5-cache/dev-perl/File-Map-0.640.0 b/metadata/md5-cache/dev-perl/File-Map-0.640.0
index 2a538bd54230..37348134e37f 100644
--- a/metadata/md5-cache/dev-perl/File-Map-0.640.0
+++ b/metadata/md5-cache/dev-perl/File-Map-0.640.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progressive-0.1.5 virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2c5407efffda9325cfcc325feb58ca2
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
index d9e3e767a4f7..b318898328ec 100644
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-BaseDir-0.03 >=dev-perl/File-DesktopEntry-0.0 x11-misc/shared-mime-info dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=737f061458d6897af88082afd22c95e5
diff --git a/metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r1 b/metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r1
index d818dbacea21..b4128105fc81 100644
--- a/metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r1
+++ b/metadata/md5-cache/dev-perl/File-NCopy-0.360.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/File-NCopy-0.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6cd870c44bd1926e8b83125eaee089b5
diff --git a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0 b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
index 0d82a701657f..aa7ab622d6e4 100644
--- a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
+++ b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acbe4691fada049b635a65ebb7f78e72
diff --git a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1 b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
index 3e32c97eb78b..7b44a469fcfb 100644
--- a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Path-Expand-1.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9524cbf2ad873ee8fbb03eaca722ff8
diff --git a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1 b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
index 973d81a3ad76..f6dabffa59b2 100644
--- a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24b5cdfe710ec5a70a176a7b2c9dd117
diff --git a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0 b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
index 2f1c84ce1642..26d866624637 100644
--- a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
+++ b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/rsync dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CB/CBARRATT/File-RsyncP-0.74.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b090751aa41d0a1ea0cd4a7de3a794d
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1 b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
index 182498458543..d452f3606a0c 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f03c796ad659032376ba89fbdb129fe
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0 b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
index 597991badb45..aa44cdaf2d0f 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c481ec8d17253dd358c8ce673524dd3d
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1 b/metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1
index d580ed4d8309..785e25613f19 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1
+++ b/metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVID/File-Slurp-Unicode-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=edf2764159a9565147ac17165ece1683
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.0.800 b/metadata/md5-cache/dev-perl/File-Slurper-0.0.800
index 62a88a4db406..f62b8c286854 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.0.800
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.0.800
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.008.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afceabb39326f6dfc190ed09e2d4ac93
diff --git a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
index 6f7eac175258..8acc976447d2 100644
--- a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CN/CNANDOR/File-Sort-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46a27c16a496d6b0fc808d79b010796a
diff --git a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
index 143b6ca29174..8852f7e2ed74 100644
--- a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=File stat bit mask constants
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/File-Stat-Bits
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 s390 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FEDOROV/File-Stat-Bits-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba490f731ba9b7357ec988b6b9ca4d9f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=80a753b9af868309d03d17015d33b75c
diff --git a/metadata/md5-cache/dev-perl/File-Sync-0.110.0 b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
index 173b39d7f713..098c75a893cd 100644
--- a/metadata/md5-cache/dev-perl/File-Sync-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/File-Sync-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1141dcba6a04eb99ff0dfc3923a97aba
diff --git a/metadata/md5-cache/dev-perl/File-Tail-1.200.0 b/metadata/md5-cache/dev-perl/File-Tail-1.200.0
index b0d75272d713..bdc346bdeedc 100644
--- a/metadata/md5-cache/dev-perl/File-Tail-1.200.0
+++ b/metadata/md5-cache/dev-perl/File-Tail-1.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2730d3fa67d42ac127fffc32a07a11d2
diff --git a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1 b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
index 5ab7016d65cc..ee92f87568f3 100644
--- a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANARDON/File-Tempdir-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be5a8e3f855f0d6a0184e0dd329315a0
diff --git a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1 b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
index e16fcb56cf7f..34fc047a587c 100644
--- a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56a3523be4d30086c8b1fc965457776a
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1 b/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
index c125fd40e7e2..7fad58f232a0 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/File-Which-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=718cdcd45b0d4e560b4608e06209905d
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.420.0 b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
index b08d0e4a065f..296186148aab 100644
--- a/metadata/md5-cache/dev-perl/File-chmod-0.420.0
+++ b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f43be4b0fb6a9ebdf67693212d9c02a
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1 b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
index acb866e5152d..09a4472eb6b8 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.003.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=647b4a5bf84b58fc40ff5246b382a028
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
index 6b1d44921431..60c744f0359f 100644
--- a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1628.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a43c11430213e46013a475241a909ed4
diff --git a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0 b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
index 06e7b725ea47..76c6dbf42ae7 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
+++ b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d728fdc852b97d13b082a2c2e53e8a69
diff --git a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1 b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
index d607e9aad332..c7609cb1bc70 100644
--- a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab539d7bdf6f5b3f4ef1460b998d7f02
diff --git a/metadata/md5-cache/dev-perl/Font-TTF-1.20.0-r1 b/metadata/md5-cache/dev-perl/Font-TTF-1.20.0-r1
index 7230bf93841c..f4f4690363eb 100644
--- a/metadata/md5-cache/dev-perl/Font-TTF-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Font-TTF-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=virtual/perl-IO-Compress dev-perl/IO-String dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-1.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17a77b71023054df096b77534fc8df44
diff --git a/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1 b/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
index 0821eb341543..d31f31a5d9af 100644
--- a/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Format-Human-Bytes-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SE/SEWI/Format-Human-Bytes-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0317648d25fd1fc5e3b0269b43380fc5
diff --git a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1 b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
index 31bbb22a4325..30052ed55af7 100644
--- a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
+++ b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5769b43e692b26d1fff9b94313259d7e
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.16.1 b/metadata/md5-cache/dev-perl/Fuse-0.16.1
index 47fd8de3fbf3..76658470e8f6 100644
--- a/metadata/md5-cache/dev-perl/Fuse-0.16.1
+++ b/metadata/md5-cache/dev-perl/Fuse-0.16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPATES/Fuse-0.16.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=645ff51dde34399a29c60b1c6c9d187d
diff --git a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1 b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
index 4a61734f5259..c31e2906a54c 100644
--- a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWITKNR/GD-Barcode-1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=421d375836db0eb658711903e5590aa0
diff --git a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1 b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
index 91a9afa76f0e..36040a0ced73 100644
--- a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c9db8a76052dd5bd560049272b8c8f4
diff --git a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1 b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
index a136ea844b80..58d3a17f6fe9 100644
--- a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/SVG dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TW/TWH/GD-SVG-0.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=78f4d9cd59e8b8d7fc18e4dc6ca143be
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.490.0 b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
index 5e7aeb31a1c2..e1cdd5611e7f 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.490.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GDTextUtil dev-perl/GD media-libs/gd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.49.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff21d1bd38e63b6c86a5c113c4375378
diff --git a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1 b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
index 4d5c24d40156..4515f687fa34 100644
--- a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+++ b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa8a0eab15988386755a545742c5c16a
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
index b6a711d43448..08051e647ffe 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/krb5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d0ef2d997d442eda4f066ccb57de3e5
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
index f059a6eebb04..c0b9c8a32f2c 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.45.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b6f72a171319059509e2774814c54a1
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.500.0-r1 b/metadata/md5-cache/dev-perl/Geo-IP-1.500.0-r1
index 0f753458a021..e011db305661 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ea477c8561cbde8e2b350b161a3ca1e
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
index 83fe89e2e155..b7fe9d7b4d33 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a67bc53fc298524e9b175250bc757237
diff --git a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1 b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
index 890d51b680e9..f1bf3b27d347 100644
--- a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad9825028bb4f3bc21bd63e94c5a3dfe
diff --git a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1 b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
index b15836c9fd85..77f0da211a79 100644
--- a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a464163be5930a5b92c5a1d055338249
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
index fd635312b9bf..02c621abdbe3 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc02a1f876157e6e76b669947101e8e5
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
index ce84017fa8a2..5fb16b9ceb40 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.10 virtual/perl-Module-Loaded recommended? ( >=dev-perl/Color-Library-0.02 dev-perl/Tie-Sub >=dev-perl/Pod-Readme-0.09 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eace82e928d87c275869350cf72a3752
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
index aebc02e00d44..555397794aa4 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.320.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Graphics-ColorNames-WWW-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed0c844567f4f75aed6a0ceb45195b86
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
index e199a19e4822..6f1a1390134f 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.32 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AI/AIZVORSKI/Graphics-ColorObject-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98ffd3685d828647fcd884f65b93edbe
diff --git a/metadata/md5-cache/dev-perl/Guard-1.23.0 b/metadata/md5-cache/dev-perl/Guard-1.23.0
index 1e0b2530534f..b9e7b525c463 100644
--- a/metadata/md5-cache/dev-perl/Guard-1.23.0
+++ b/metadata/md5-cache/dev-perl/Guard-1.23.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ba386e1ebf42d7956e4c528ba84d657
diff --git a/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r1 b/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r1
index ad416e94a110..c042e0ada3dd 100644
--- a/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<app-text/html-xml-utils-5.3 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LINDNER/HTML-Clean-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6897b4e54c7dbc907a2203a2ed525bb7
diff --git a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1 b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
index c0845ff81d05..4b095a5ace13 100644
--- a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tree-3.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=955aac1432bb45670580708483477adf
diff --git a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0 b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
index d0d142d9cc9f..322437191361 100644
--- a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser virtual/perl-Carp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/HTML-FillInForm-2.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbb2c2afec389d6c0e206c51d0be29e4
diff --git a/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r1 b/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r1
index d73130ba2396..62ed5ea30287 100644
--- a/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.30.0 >=dev-perl/URI-1.10 dev-perl/HTML-Parser >=virtual/perl-Encode-2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7af9190d8920630faff0810c8fbd8d94
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
index 4bb47e4bf74f..ee5269c4c7dd 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8bdc4187bc8f075e16a65de8080f9916
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.50.0-r1 b/metadata/md5-cache/dev-perl/HTML-FromText-2.50.0-r1
index a3fb4aba441a..22c9feec7c2d 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.50.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser virtual/perl-Test-Simple dev-perl/Exporter-Lite >=virtual/perl-Scalar-List-Utils-1.14 dev-perl/Email-Find dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/HTML-FromText-2.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c179be6dd8cb28fb43e212b6efc8cd9
diff --git a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1 b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
index 9f58ae4e91b6..47d284a5d31a 100644
--- a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/htmldoc dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MF/MFRANKL/HTML-HTMLDoc-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c901da25342d6f9cf14bb608e975ba70
diff --git a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0 b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
index c2a9cbe08986..7d3871cf66e1 100644
--- a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
+++ b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TR/TRIPIE/HTML-Highlight-0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f5065d2fe9361755f56dec21e05f6c1d
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index c423541aea83..a1badc5b5aea 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Cache-Cache-1 >=dev-perl/Class-Container-0.70.0 >=dev-perl/Exception-Class-1.150.0 virtual/perl-File-Spec dev-perl/HTML-Parser >=dev-perl/Log-Any-0.80.0 >=dev-perl/Params-Validate-0.70.0 virtual/perl-Scalar-List-Utils modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4606f6895ef84c6de452b603dc91633
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0 b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
index 8426c91f5ff4..7eaf26a543b1 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7408c0d624058b0657bca82d50958a0c
diff --git a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2 b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
index 213fb2d1ea2e..4bc71b2ce42d 100644
--- a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
+++ b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-FormValidator dev-perl/Date-Manip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlobject/libhtmlobject-perl-2.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b0591a573b7524448f5403204f152d9
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1 b/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
index a81318857e8a..4315b17dd395 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tagset-3.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09dd16fa5a8aa08fce1064d888c9346c
diff --git a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1 b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
index 7ea9f5a3dd95..25508b02dedd 100644
--- a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJPEACOCK/HTML-Table-2.08a.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b0cad862cd1e9cf2d45d81c00519c46d
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
index 60cf77cf8f08..3d8c738c09f4 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDRABBLE/HTML-TableContentParser-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adf8e25d0d495e713ba64c4f0072b608
diff --git a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0 b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
index ff284e7f9883..a53d1c62b559 100644
--- a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROSS/HTML-TagFilter-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d85b76274de24909423648400fef868d
diff --git a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1 b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
index a0b65b879d21..c80ea81b72f1 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f86303aa78ee299c85ee484fdb2b0e7e
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
index 8b2a81a72f75..8b3fb534e7f4 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-0.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9eb3baf0a80f61dee8b3fc3358604fa
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0 b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
index fd92c32bbb82..5117cf445553 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.0.0 virtual/perl-File-Spec >=dev-perl/JSON-2.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIY/HTML-Template-Pro-0.9510.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e6b4de1a755cb70fdb26fb1c7c29840
diff --git a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1 b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
index d0f2af917bd5..97708dd93651 100644
--- a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.25 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=739b9e47f71dfd836e48193d8f186fd9
diff --git a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0 b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
index 784c472aeb6d..cc391728ca29 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Temp-0.140.0 dev-perl/HTTP-Message >=virtual/perl-IO-1.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e596d225a56c6035179f09b25a3a52ca
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.500.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.500.0
index cd3b260dd246..7af6b3d62b76 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.500.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.500.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-1.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4984bf8bf30d0ff542e0fd20295e0cc4
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.770.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.770.0
index 269a08e30a97..a82c940f57cc 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.770.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-1.770.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-1.77.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8f0e404ff4ac3030820ca67054fc726
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-2.40.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-2.40.0
index d8b74531bfb5..6645c6076ff9 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-2.40.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-2.40.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-2.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0854221c6d741ab825d3e5313252c1cb
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.10.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.10.0
index 107db4f6d9ca..0edc1ade1d53 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.10.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.10.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Cookies-6.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c2a055955d91a7172ef892f05ac177a3
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
index 00a6b1067f77..5d95080c4a29 100644
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
+++ b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdbaf278a4bc7f1aae06297587831a87
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r1
index a2538f0c4808..f96c80aa165d 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87979fc2aa97755399b843ce19758a09
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
index 335301e66c56..4aab5ee17b56 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a221b4cd04a894dda53e364cf1ae764a
diff --git a/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0 b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0
index ef606e9071c0..78c2f5b9e80a 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=10c236d0168e2fd0a7c00e9b75dce36f
diff --git a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
index 0f1bb6d108b3..4b94a34c1880 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81ce41e2d08678db33ffc22e644ce988
diff --git a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1 b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
index 550d435f64a9..25fa2bc032b5 100644
--- a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/HTTPD-User-Manage-1.66.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c4231d866dbfb2586721489c8611f41
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0 b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
index 4b9c60630cd3..bb3459378912 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.200.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08f83b96a327a97ab6fb8e8a8b992ff6
diff --git a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0 b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
index 137094f062b4..bdd0d2ca54ef 100644
--- a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
+++ b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=946e73bef8f87f32f755d32e18329fbc
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
index b5ffe068050e..2af9836f05fb 100644
--- a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=77d6c0e41dc1ba44ccd7f0fc9418bcde
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
index b8b2a8bf6da2..de5800ef337b 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=660ed5d5dbd97cef91e4c305616189d5
diff --git a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2 b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
index 93024713a86b..6e808d5d43d3 100644
--- a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
+++ b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PerlIO-via-dynamic-0.10 virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd7c4dcce3eee44b60b37337f85b1724
diff --git a/metadata/md5-cache/dev-perl/IO-Event-0.813.0 b/metadata/md5-cache/dev-perl/IO-Event-0.813.0
index 6a90fb15ea22..f3dce53907fc 100644
--- a/metadata/md5-cache/dev-perl/IO-Event-0.813.0
+++ b/metadata/md5-cache/dev-perl/IO-Event-0.813.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/AnyEvent dev-perl/Event dev-perl/List-MoreUtils virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/IO-Event-0.813.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5db7bc294c245c8d669327a24bd9de9
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
index 0c9631775557..a131b87560d8 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd933c3d1fdc5d0ce67b15390e495c32
diff --git a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1 b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
index c3fcf5942782..d88caa6bea09 100644
--- a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a698eabca2bf59e3b3c8cb347a48a744
diff --git a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0 b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
index 88c5cf7dae32..deadbf9a7c66 100644
--- a/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
+++ b/metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0c777b9756ca6a47ff56a89179222d11
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0
index 6039f3101b48..12cd3fbd35e0 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Socket6 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c9c51fcc3fd1b63e976048bd0b4dd99
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.24.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.24.0
index db81a6e69aa1..e68ec24a03f8 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.24.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.24.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSLeay-1.330.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.024.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5648850ba6b70a55c9afee8ea174b967
diff --git a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1 b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
index a9cb9155d2eb..7d2791e90c0e 100644
--- a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a10bef11c68cb7dd4d130aad625f844d
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
index ebbbeabeb1da..6b4fac34e330 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf67f7e85e12b26422b00f2aee451f35
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
index b088daa91ac6..c9120d0e4505 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=446c6b59fc4c18a8411fbba5bfdb60e6
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
index 5c97d75d9664..c711d5004d07 100644
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
+++ b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=602c645ccee69054c8d5b84af2c67095
diff --git a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1 b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
index 1473d7347eb8..949154c38730 100644
--- a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Rijndael dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTK/IP-Anonymous-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=526f91d865bfc3f3493751b76f467fa8
diff --git a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1 b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
index 57d2a3a6f34f..5b9ec6a3c054 100644
--- a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f5a1c9f4ad92e5383814dfee7c82456
diff --git a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1 b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
index bc7f65940e6d..0594e21a1fe1 100644
--- a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSOUTH/IPC-Shareable-0.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d5f95019651f83012364cd0e72662a8
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
index 0ec3481d2834..2e5c97f7eb7a 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d5fd05ebfceee67bd1620f816a36ec0
diff --git a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1 b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
index c6ba5e2baa7d..da6769e43b9c 100644
--- a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
+++ b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Class-WhiteHole dev-perl/DBIx-ContextualFetch virtual/perl-Test-Simple >=dev-perl/Class-Data-Inheritable-0.02 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERRIN/Ima-DBI-0.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f003904fed77e57d4de44da2735e27c9
diff --git a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1 b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
index ec278f4215c1..749dcfc44dd4 100644
--- a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-libs/imlib2-1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Image-Imlib2-2.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f12e9d52be64cccc62747a0113763fb6
diff --git a/metadata/md5-cache/dev-perl/Image-Size-3.300.0 b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
index edb63e6a16b7..87aef61ad0c6 100644
--- a/metadata/md5-cache/dev-perl/Image-Size-3.300.0
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b337bbe71a2b33e5412e4c77d52c88e9
diff --git a/metadata/md5-cache/dev-perl/Inline-0.500.0-r1 b/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
index 2466fcff4b14..20f07ed7f4e4 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SISYPHUS/Inline-0.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68286ea957e17fb9990bb822cb77b9e0
diff --git a/metadata/md5-cache/dev-perl/Inline-0.800.0 b/metadata/md5-cache/dev-perl/Inline-0.800.0
index 65f6e43ed38a..d2bc75073aba 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.800.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.800.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.80.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=914d4f263de58aabfcecf3adca99a5f2
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
index 868e52b3eda3..b54e47edada7 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.69.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9f731de1c24a176b6a400745e701606
diff --git a/metadata/md5-cache/dev-perl/JSON-2.900.0 b/metadata/md5-cache/dev-perl/JSON-2.900.0
index 6db439235b0f..c2849a35ed6b 100644
--- a/metadata/md5-cache/dev-perl/JSON-2.900.0
+++ b/metadata/md5-cache/dev-perl/JSON-2.900.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d19e9ca3dc5b3599dd6175d224d666c
diff --git a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0 b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
index f9f47b6b01e8..790039b903bd 100644
--- a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+++ b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp || ( >=dev-perl/JSON-XS-2.3 virtual/perl-JSON-PP dev-perl/JSON ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7d055d9494fba67ae3c9fe80c64b592
diff --git a/metadata/md5-cache/dev-perl/JSON-RPC-0.960.0-r1 b/metadata/md5-cache/dev-perl/JSON-RPC-0.960.0-r1
index 656de1efd946..d4913f5e2f66 100644
--- a/metadata/md5-cache/dev-perl/JSON-RPC-0.960.0-r1
+++ b/metadata/md5-cache/dev-perl/JSON-RPC-0.960.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/JSON-2.21 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-RPC-0.96.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33bf60b8fe3f26ca5b5738644f5e0b3d
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-3.10.0 b/metadata/md5-cache/dev-perl/JSON-XS-3.10.0
index 32b193141928..a3a71e885907 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-3.10.0
+++ b/metadata/md5-cache/dev-perl/JSON-XS-3.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90a7ce332224519a5a90e0932ea63a8c
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1 b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
index 708051ecd302..ee5fe2984a01 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/JSON-XS dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45fe6b47c3babfd1b5e1157f6cd97037
diff --git a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1 b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
index 35ec136d09ba..5e51decb7c4a 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Log-Log4perl >=dev-lang/spidermonkey-1.5:0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TB/TBUSCH/JavaScript-SpiderMonkey-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c10deea82576d53ea2c7e09b90fd8a8
diff --git a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1 b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
index 19b04e2e088b..fa7843b3474e 100644
--- a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Jcode-2.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=908b2515462eb1f575d506efd725b972
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
index 939acfc10d4c..4ff3943e0cbf 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d466e15f7045ad1421b44a584bf93c99
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.60.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.60.0
index 83e6363cd107..3d569005d8d0 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.60.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-misc/ca-certificates >=dev-perl/libwww-perl-6.20.0 >=dev-perl/Net-HTTP-6 >=dev-perl/IO-Socket-SSL-1.540.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/LWP-Protocol-https-6.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ec8c36931b39732d47c91f8f58842fd
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
index 199ec60b1c02..52be8e65b6f4 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=879ce23b7281f3c6670270cefd28284a
diff --git a/metadata/md5-cache/dev-perl/Lchown-1.10.0-r1 b/metadata/md5-cache/dev-perl/Lchown-1.10.0-r1
index 324fa6a4c4e6..a48e9771e601 100644
--- a/metadata/md5-cache/dev-perl/Lchown-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Lchown-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NC/NCLEATON/Lchown-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=28e8ed69c672540d97c7ee3725828c6e
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.899.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.899.0
index 8a82a9dcc74a..b26557e4634a 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.899.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.899.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.899.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=67e0d1f268fa36cac6e73b73573ad842
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
index a23b9e800df2..7966eafe6e15 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6425f79dea59747f6b1fe99deffad2ac
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
index 440ece84655d..1ad21bd4b5dd 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a45787dbb44b53feacb7a0888659d36
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
index 5ae16c72ccf5..3aff0b7cc48d 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Snowball-Norwegian dev-perl/Snowball-Swedish dev-perl/Lingua-Stem-Snowball-Da dev-perl/Lingua-Stem-Fr dev-perl/Lingua-Stem-It dev-perl/Lingua-Stem-Ru dev-perl/Lingua-PT-Stemmer dev-perl/Text-German dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c3d1c42b9173829008a4a9acdc680e9
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
index fd8194f86203..725a2e6e885a 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a7390e3e23b7dabb486e3e8db5f433f9
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
index 7855f05aa5c5..52bd915c66a5 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=687cd51a1ce990b6d559bf57402443d7
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
index e800c9ea2f99..bdcf6c6bc95e 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72632df73d7bf47668138e8ca68b2c89
diff --git a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1 b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
index 4b5a9bb863b1..5a6d14a73f22 100644
--- a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7229211cbc249070665a4d58ab72bf6b
diff --git a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1 b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
index ee589196824c..197f307259a5 100644
--- a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06c3ea497f60fc564f0fb709ee0c0320
diff --git a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0 b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
index 01e4685a5c02..5a900813ac04 100644
--- a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
+++ b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Linux-Smaps-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3309229be486a8c8af31c055dcfba27f
diff --git a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0 b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
index ef66d5dd290f..20b1061d2cec 100644
--- a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
+++ b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/File-Path-Expand >=dev-perl/Moo-1.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MG/MGRIMES/Lirc-Client-2.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=192633e047e1a8937dec9d7e12713e86
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
index 3ca52f2f74a9..ff37d0e7bbfe 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.310.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2fc35cd4b76c042fb7c645c6a6967c9
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
index 0ec43e9ce20b..939e5f65589c 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0127121d490744afd7f20ead555f0455
diff --git a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0 b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
index 7a41bee81702..3003bc3967f5 100644
--- a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
+++ b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/perl-Locale-Maketext-1.170.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f473689bdb1273970977432a32b683ae
diff --git a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0 b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
index c84117ddfede..3dea0e50afbb 100644
--- a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
+++ b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e96e6888b83e9a307847ae6a889afb0
diff --git a/metadata/md5-cache/dev-perl/LockFile-Simple-0.208.0-r1 b/metadata/md5-cache/dev-perl/LockFile-Simple-0.208.0-r1
index 9ed49155ab63..6de50f99f4a6 100644
--- a/metadata/md5-cache/dev-perl/LockFile-Simple-0.208.0-r1
+++ b/metadata/md5-cache/dev-perl/LockFile-Simple-0.208.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/lockfile-simple/LockFile-Simple-0.208.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03df4112d3ba396a4d8796da641f4119
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
index 572b21965247..d9fc1c362536 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=009959c84487a5b533c4725b9367b386
diff --git a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1 b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
index f5de50795e07..8f190dda0aee 100644
--- a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
+++ b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl[gdbm] dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-Charset-1.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=248108983f65faed5ba9f6cdf86cc90c
diff --git a/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.3 b/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.3
index 652bf236e766..a9fe1fd6af6c 100644
--- a/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.3
+++ b/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.3
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX dev-perl/XML-LibXML dev-perl/MARC-Charset dev-perl/MARC-Record dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-XML-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2dda25f6563d81d52220da88d89b40b
diff --git a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1 b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
index 26c0ddf73ef9..3e7b15a977d2 100644
--- a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MD5-2.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=498e900bbb3ac39b551b064f75dbff87
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.120.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
index 125247d94e6a..3ed261bfc8d0 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2c94576b32c3ffc8ce73819762bbd8f
diff --git a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1 b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
index 963534ee200f..8b4de0eac721 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MLDBM dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/MLDBM-Sync-0.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72d42a697f4c6b5375cf611e9fe237d5
diff --git a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0 b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
index 755e039d3ebb..f9106dcc2fdb 100644
--- a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
+++ b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHAR/MP4-Info-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43d9d284afa26b6afad87e2f286047f2
diff --git a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0 b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
index db9e79c1b36e..41a2657645cc 100644
--- a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
+++ b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.003.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98cb86771ee5f9fa004abc759626337b
diff --git a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1 b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
index 0a807476f2e3..887fbf439b2b 100644
--- a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mail-Builder-1.12 dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Config-Any dev-perl/Config-General dev-perl/Exception-Died >=dev-perl/MailTools-2.04 dev-perl/Email-MessageID dev-perl/MIME-tools dev-perl/HTML-Template dev-perl/Template-Toolkit dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEDDY/Mail-Builder-Simple-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=22f2d7779af0c0b3f2ced7c0b9aaf90b
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0 b/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
index 8effb2e3a727..7fd671e4fcbd 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Net-DNS dev-perl/MailTools dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JASLONG/Mail-DKIM-0.40.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3fa1ce1fbc0f1a3623a2facaa829503a
diff --git a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1 b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
index 1ebef693cef9..51244b637bb2 100644
--- a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.34 dev-perl/MailTools dev-perl/Crypt-OpenSSL-RSA dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANTHONYU/Mail-DomainKeys-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=810b721f4fc8bad3af8c9c1cf9d4481d
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.370.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.370.0
index 514026eed210..762a6d5d155a 100644
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.370.0
+++ b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.370.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-MIME-Base64 >=dev-perl/Parse-RecDescent-1.940.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.37.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=822f5a4318dba1d44bdf632ca0deb09c
diff --git a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1 b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
index 7ca29665bdb0..f8fe93685741 100644
--- a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI dev-perl/Email-Valid dev-perl/Email-Abstract dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTEVENS/Mail-ListDetector-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=596f9f46f766af871b57bd8be65c1845
diff --git a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0 b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
index f23042d27394..4dc550459380 100644
--- a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
+++ b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=298b38ee92b4d777b3b17982540fe36a
diff --git a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1 b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
index 786e5cac5130..b136bae146e3 100644
--- a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long >=dev-perl/MailTools-1.15 >=dev-perl/LockFile-Simple-0.2.5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Mail-Procmail-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d8a92198970f5cdf04fa064af868686
diff --git a/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r1 b/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r1
index d802bb34d485..750d38a69b07 100644
--- a/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Error >=dev-perl/Net-DNS-0.620.0 >=dev-perl/NetAddr-IP-4 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v2.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c30f42d7a8448718b668646c1ca8545
diff --git a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2 b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
index 1d870a282132..3fa99f4e888b 100644
--- a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
+++ b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Digest-HMAC-1.01-r1 >=dev-perl/MLDBM-2.01 >=virtual/perl-DB_File-1.807 >=virtual/perl-Digest-MD5-2.33 >=virtual/perl-Storable-2.04-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Mail-SRS-0.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ce81fe3f1b744af9077c3dd0e541a0a
diff --git a/metadata/md5-cache/dev-perl/Mail-Sendmail-0.790.0-r1 b/metadata/md5-cache/dev-perl/Mail-Sendmail-0.790.0-r1
index c408ee3cbd31..2e03388f157c 100644
--- a/metadata/md5-cache/dev-perl/Mail-Sendmail-0.790.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Sendmail-0.790.0-r1
@@ -8,5 +8,5 @@ LICENSE=Mail-Sendmail
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIVKOVIC/Mail-Sendmail-0.79.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8c9e63ee5eb215faba167cd640b2b81
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.140.0 b/metadata/md5-cache/dev-perl/MailTools-2.140.0
index 6521508fa0ee..61073064469b 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.140.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.140.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5985f8ed2ce9d97c4af9cd5d1fa19d81
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index f5294b14a66c..5b0d19ad12e8 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/Math-Base36-0.140.0 b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
index 880094b6a478..0fa7735b9c22 100644
--- a/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/Math-Base36-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8a8c3b13a240e8fc287b4336f639268
diff --git a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
index d1aa24aab5e5..273052cef2d6 100644
--- a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Math-Bezier-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d976ebc4efc5fbcffd00f93fe9e342a
diff --git a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1 b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
index b9c347c038a8..51db1e367fbc 100644
--- a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=faddf8696672bb787c2d1d1af2cf5445
diff --git a/metadata/md5-cache/dev-perl/Math-GMP-2.60.0-r1 b/metadata/md5-cache/dev-perl/Math-GMP-2.60.0-r1
index afafd234d0a4..d98a91828d62 100644
--- a/metadata/md5-cache/dev-perl/Math-GMP-2.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-GMP-2.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/gmp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/Math-GMP-2.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a4abae949bf6a82f6c35008c2711f74
diff --git a/metadata/md5-cache/dev-perl/Math-Random-0.720.0 b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
index 7c21d21c8ed7..14149173bfae 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-0.720.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
@@ -8,5 +8,5 @@ LICENSE=( || ( Artistic GPL-2 ) ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7782a4d347910bc14cd286f4d5e8412
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
index ad9c85ea42e8..a01d50088cee 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
@@ -10,5 +10,5 @@ PDEPEND=dev-perl/Math-Random-ISAAC-XS
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c921ac5ac9f34a24c0442f8bf6e289bc
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
index cdc7c4982b85..87318503ffc9 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain Artistic Artistic-2 GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Math-Random-ISAAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-1.004.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=062787a2f06c3ae538cdeb950b53cd09
diff --git a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0 b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
index f5742ef53473..d340dad88c65 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7fb7cd9cf882a29e90a4ae6e92bc2970
diff --git a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
index c298ba146f56..c8d3e9c0aba7 100644
--- a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EW/EWILHELM/Math-Vec-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f9e4f6991049c1a1070630aa61fede47
diff --git a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1 b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
index 81e2d110e2f4..4c37d7a5112d 100644
--- a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=756f34bbfdbd018205e25811f691292c
diff --git a/metadata/md5-cache/dev-perl/Mo-0.400.0 b/metadata/md5-cache/dev-perl/Mo-0.400.0
index d4033a4fe24a..35ccddead158 100644
--- a/metadata/md5-cache/dev-perl/Mo-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mo-0.400.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e11c557cf8ea96ac457d0970308a81cf
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index d61af35871be..8bcc46008952 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-CBuilder >=dev-perl/ExtUtils-Config-0.3.0 >=dev-perl/ExtUtils-Helpers-0.20.0 virtual/perl-ExtUtils-Install >=dev-perl/ExtUtils-InstallPaths-0.2.0 virtual/perl-ExtUtils-ParseXS virtual/perl-File-Path virtual/perl-File-Spec >=virtual/perl-Getopt-Long-2.360.0 >=virtual/perl-JSON-PP-2.0.0 virtual/perl-podlators virtual/perl-Test-Harness dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b0413a083b33ed1bc970848971ac5f6
diff --git a/metadata/md5-cache/dev-perl/Module-Find-0.130.0 b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
index c4ad79e0f4e7..3f6a74d59ace 100644
--- a/metadata/md5-cache/dev-perl/Module-Find-0.130.0
+++ b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eebb5bdd7dd26a878061075deabcc652
diff --git a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0 b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
index 45716580f99e..e560b523dbf6 100644
--- a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
+++ b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Locate-1.80.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17462d63b587ff314f252c57f7711a84
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
index a4ec6b802dc0..559597432105 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=97a7f0e3f2675b29b5f1e43d35cfd3b3
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1 b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
index 787ea3059032..3bf90da1d31b 100644
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b13a6df6f7e1092a7da376eba0e576a3
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0 b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
index 9c03346e7560..4ab7f5beb8bd 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Dist-CheckConflicts dev-perl/Module-Runtime dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.002.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cad56f77efacf94ad9a54d6922eed2d8
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
index 6a7f755753d6..db43c8cc88d1 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95f4341eabe82e156cb13bf8f72a5180
diff --git a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1 b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
index 35054c034185..31fe191a4527 100644
--- a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23ade618047f986d39c3c132d292d1e8
diff --git a/metadata/md5-cache/dev-perl/Mon-0.110.0-r1 b/metadata/md5-cache/dev-perl/Mon-0.110.0-r1
index 582a77261b4e..5372151ddcdd 100644
--- a/metadata/md5-cache/dev-perl/Mon-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Mon-0.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=net-analyzer/fping-2.2_beta1 >=dev-perl/Convert-BER-1.31 >=dev-perl/Net-Telnet-3.02 >=dev-perl/Time-Period-1.20 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TR/TROCKIJ/Mon-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5318cc4c6bbef65dc181663d8deeba1f
diff --git a/metadata/md5-cache/dev-perl/MooX-late-0.15.0 b/metadata/md5-cache/dev-perl/MooX-late-0.15.0
index df6ef31a6996..c223004c7ff3 100644
--- a/metadata/md5-cache/dev-perl/MooX-late-0.15.0
+++ b/metadata/md5-cache/dev-perl/MooX-late-0.15.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moo-1.6.0 >=dev-perl/Type-Tiny-1.0.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1a281676a81af891f51d838dab2148d
diff --git a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1 b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
index e0798b985820..ba5d3350ddc4 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-1.90.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a980cf111a404fa78e88f7faebf85453
diff --git a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0 b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
index 63b7b2cc9cc1..c9bca4702cbf 100644
--- a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
+++ b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-FollowPBP-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c8d23b6f47bf3e1601646ef73e1402f
diff --git a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100 b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
index 8090825ae808..e09aadf97834 100644
--- a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
+++ b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-0.96 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/MooseX-GlobRef-0.0701.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=430b9d77473d819881e95e1547542fe0
diff --git a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0 b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
index fc432bfdb2a8..dbf4e6dd7ec8 100644
--- a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
+++ b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c733bc65167ade7203ecc8ac907d227
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-0.360.0 b/metadata/md5-cache/dev-perl/MooseX-Types-0.360.0
index a48d160430a7..1d2f3d0af3cc 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-0.360.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-0.360.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-1.06 dev-perl/Sub-Name >=dev-perl/Carp-Clan-6.00 >=dev-perl/Sub-Install-0.924 >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56c106ae1227cc90fcf9d42837650805
diff --git a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0 b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
index 242cd36aa2c6..0e85aa6ff2d5 100644
--- a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
+++ b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Any-Moose-0.150.0 >=dev-perl/Mouse-0.770.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d51261a56254ccffa3323fece2996c5
diff --git a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0 b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
index ff36cbce39a1..8befbd8db997 100644
--- a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
+++ b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Message >=dev-perl/XML-Simple-2.80.0 >=virtual/perl-Time-HiRes-1.0.0 >=dev-perl/Log-Log4perl-0.300.0 virtual/perl-Digest-SHA dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOUMENOT/Net-Amazon-0.62.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75a4ac10f3c2fa0f1e560eb4a58bf0e1
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0 b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0
index 11cd23a780a4..aa1a7a9948c9 100644
--- a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0
+++ b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a702cbda693d7a44e8ab7222413541fd
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1 b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
index cbf65271ce73..834f570ef00a 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Net-DNS-Async-1.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c02bb00ddffa224de7b7945265463a04
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.3.0-r1 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.3.0-r1
index a87371a052cc..e4e280f9ca66 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.3.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS virtual/perl-version dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/Net-DNS-Resolver-Programmable-v0.003.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e53c8290931dc572cac3afdc378961c1
diff --git a/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0-r1 b/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0-r1
index ce099cda285c..0d4c37c2b36f 100644
--- a/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CDDB-File-1.10.0 virtual/perl-libnet >=virtual/perl-File-Temp-0.50.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROAM/Net-FreeDB-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=25c3b306f7aa8154a9c6348af4259973
diff --git a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1 b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
index 8b9848a8fff7..a4cfdcaab769 100644
--- a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-perl/URI >=virtual/perl-Math-BigInt-1.87 virtual/perl-DB_File || ( virtual/perl-Math-BigInt-FastCalc dev-perl/Math-BigInt-GMP ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBORN/Net-Google-SafeBrowsing-Blocklist-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16d10873e51c0c6358e158bb2d45892e
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
index 4bb19f585257..1c36626d8adf 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/Net-IMAP-Simple-SSL-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1c01d68695984c5c447d69afa2ff986
diff --git a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1 b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
index 6e15227ae513..9b846fc943cd 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4183ec55ed113a572c534338973bd291
diff --git a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0 b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
index bf35c80be598..819cbf910541 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
+++ b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Net-IP-Minimal-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ee068f7756a85741892a7954589129f
diff --git a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0 b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
index 7557cd0477d3..7b5cec20f9af 100644
--- a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a6e82f076c8705f2aa1085ff15174d2
diff --git a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1 b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
index 65508ad1aa80..54b2c6c93116 100644
--- a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Net-IRC-0.79.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2b96124f1cb433e41d654a0dd990e68a
diff --git a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0 b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0
index d580099ca513..54ab0ad9a79e 100644
--- a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0
+++ b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ac49bcf262a13f5757ed6640a3ed2bf
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
index c9fb88c7a651..4ddc8b333b3c 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0a8800fa717311c6fc164af765e7c97
diff --git a/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1 b/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
index 28b2c843e66a..854164ef1c9f 100644
--- a/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
+++ b/metadata/md5-cache/dev-perl/Net-Kismet-0.04-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/Net-Kismet-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4192d2942c5b60dbd031ed5de5b575b0
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1 b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
index 09d6e5660604..8f12ac7242f7 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-dns/libidn dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61c7c535f2f1d65661abc8ce7c26d522
diff --git a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200 b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
index 4c5004f29e9b..1b94e56f6a5c 100644
--- a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
+++ b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Net-Netmask-1.9022.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bddfaab767d2e0c3149078a66e2ecba8
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
index 6cb45683d373..0f3addab6873 100644
--- a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a31ec944e35ae681ea86d04e315a725b
diff --git a/metadata/md5-cache/dev-perl/Net-Pcap-0.170.0-r1 b/metadata/md5-cache/dev-perl/Net-Pcap-0.170.0-r1
index 52acc909b89e..c931e1881c3e 100644
--- a/metadata/md5-cache/dev-perl/Net-Pcap-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Pcap-0.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-Pcap-0.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2d4ac7e7aab4782fbfb24a5ae491514
diff --git a/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r1 b/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r1
index 0d1ab0dfa920..f31dab8dcb90 100644
--- a/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-PcapUtils-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-Pcap dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMPOTTER/Net-PcapUtils-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5a230a6e87a2f0f3a10ff4f7090502c
diff --git a/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r1 b/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r1
index b2969bd92ad7..a68885dc859b 100644
--- a/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-RBLClient-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes dev-perl/Net-DNS dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABLUM/Net-RBLClient-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a34d9611005cf6cdf05739aeec706708
diff --git a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r1 b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r1
index 457755024579..e35e2a56a9e3 100644
--- a/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-RawIP-0.250.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-libs/libpcap dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-RawIP-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f211259be4c8edcab852d94f860316e6
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-0.100.0-r1 b/metadata/md5-cache/dev-perl/Net-SFTP-0.100.0-r1
index bb79353f544c..cfdf96bd3d3b 100644
--- a/metadata/md5-cache/dev-perl/Net-SFTP-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSH-Perl-1.25 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBROBINS/Net-SFTP-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c67f2f6d7e9438a5cb11494388132b7d
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
index 55e55214a7c4..515baf098d44 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36f1735aad0b5a3fe6aa81ff1fa96b8d
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
index 23de81ddb456..322ece56be05 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0269ac76a3a084f9b01c1e2d46aa8e3
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
index 224696e96250..027c2ca8ad78 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e28c7adbe11220eb36b3e57ef2dfb2f3
diff --git a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r1 b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r1
index b17bb46d2adc..edd9776c9471 100644
--- a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r1
+++ b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-DES-2.03 >=virtual/perl-Digest-MD5-2.11 >=dev-perl/Digest-SHA1-1.02 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-libnet-1.0703 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdafb6667b2abf50b2f7a6339fe93d95
diff --git a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r1 b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r1
index 22491d1825fa..167d10241a63 100644
--- a/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SNPP-1.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-libnet dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBEYA/Net-SNPP-1.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1562e5e3759e5621d591f827bdb799de
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.170.0 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.170.0
index b953413bcc02..dd86612a0311 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.170.0
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Log-Log4perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e765f554159a6f98405f04d2f8de05a
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Perl-1.360.0-r1 b/metadata/md5-cache/dev-perl/Net-SSH-Perl-1.360.0-r1
index bbcbc5976d0f..3b2198405fe9 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-Perl-1.360.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Perl-1.360.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 >=dev-perl/String-CRC32-1.2 >=dev-perl/Math-GMP-1.04 >=dev-perl/Math-Pari-2.001804 >=dev-perl/Digest-SHA1-2.10 dev-perl/Digest-HMAC dev-perl/Crypt-DH >=dev-perl/Crypt-DSA-0.110.0 virtual/perl-MIME-Base64 >=dev-perl/Convert-PEM-0.05 dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-IDEA dev-perl/Crypt-OpenSSL-RSA dev-perl/Crypt-RSA dev-perl/Digest-BubbleBabble dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-1.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=95101da4852525ddcb1e63395ddf8fe7
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.100.0-r1 b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.100.0-r1
index ccc15d7d7532..438802e41dbb 100644
--- a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-Telnet dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSHUA/Net-Telnet-Cisco-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df07ba5bea64069ecad7d9c518716922
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
index 9550f7b571d1..1a8fd032823f 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.078.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de8d0c508418e55b5f8d072db5a6173a
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.6.0 b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
index 69961c70ec84..0d01f1ca1a51 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.6.0
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f336d5a61554c632bade1bb0aa23e9b
diff --git a/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r1 b/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r1
index 73d5b37490b5..49e7fde885f3 100644
--- a/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-perl/MD5 virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KJ/KJOHNSON/NetxAP-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e32c6e6e376a9dc96bd7d8ec2e83a13
diff --git a/metadata/md5-cache/dev-perl/Nmap-Parser-1.310.0 b/metadata/md5-cache/dev-perl/Nmap-Parser-1.310.0
index 1c55fa2e512a..233ae378e6e2 100644
--- a/metadata/md5-cache/dev-perl/Nmap-Parser-1.310.0
+++ b/metadata/md5-cache/dev-perl/Nmap-Parser-1.310.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/perl-Storable >=dev-perl/XML-Twig-3.16 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AP/APERSAUD/Nmap-Parser-1.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d1dc423d6b12b001a49e0a001650dc0
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
index 4ee7bdd031f0..c4ea5b3f3667 100644
--- a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5f5b4e944f0795a9e963b4bdf82e7f8
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.750.0 b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
index 11a54671ccef..d994102a62f3 100644
--- a/metadata/md5-cache/dev-perl/Number-Format-1.750.0
+++ b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c276fd2b225c169e1fa0907254fe77be
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
index 5b7e34baadac..5da4f8850804 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7053e007c6f924df15b808c760a030e8
diff --git a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0 b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
index 3140eac2e011..6d57412cf3ec 100644
--- a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
+++ b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Object-MultiType-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe9f69c2394ac20eb1df32e3c598c2cd
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index 8ef04138bcde..3de1a5435b9f 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0d7bbbadbeb7250112dadf78f8b6a838
diff --git a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.30.0-r1 b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.30.0-r1
index 017bc0ae1596..6f3f0d30ea19 100644
--- a/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Ogg-Vorbis-Header-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2
 RDEPEND=|| ( <=dev-perl/Inline-0.560.0 dev-perl/Inline-C ) media-libs/libogg media-libs/libvorbis dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBP/Ogg-Vorbis-Header-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ffc9a0a4097e92fe9e5dc58282adf8ab
diff --git a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1 b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
index 270dbfce7448..df299c29de2c 100644
--- a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
+++ b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev-perl/YAML ) dev-perl/Archive-Zip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db87f45a3d22aa4beefb03bd8d6aa93e
diff --git a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1 b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
index 3d9a75a6f84b..b6a505cb5f8e 100644
--- a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3d9d4681873c68883cd8433abbca100
diff --git a/metadata/md5-cache/dev-perl/POE-1.367 b/metadata/md5-cache/dev-perl/POE-1.367
index 36102cf1a472..889c17af9813 100644
--- a/metadata/md5-cache/dev-perl/POE-1.367
+++ b/metadata/md5-cache/dev-perl/POE-1.367
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/YAML dev-perl/Filter dev-perl/IO-Pipely dev-perl/FreezeThaw >=dev-perl/Event-1.09 >=virtual/perl-File-Spec-0.87 >=virtual/perl-IO-1.23.01 >=virtual/perl-IO-Compress-1.33 >=virtual/perl-Storable-2.12 >=dev-perl/IO-Tty-1.08 >=dev-perl/TermReadKey-2.21 >=virtual/perl-Time-HiRes-1.59 ipv6? ( >=dev-perl/Socket6-0.14 ) tk? ( >=dev-perl/Tk-800.027 ) libwww? ( >=dev-perl/libwww-perl-5.79 >=dev-perl/URI-1.30 ) ncurses? ( >=dev-perl/Curses-1.08 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e75b645371f792a4afc3c933cac8c9c2
diff --git a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1 b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
index 77396c6afd46..f32e23598065 100644
--- a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-API-Peek-2.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07107d5880ddffd1bbb0ee2f1a24a614
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
index 7c048989222f..7e956407ee21 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-0.272.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a75a75b03d406a7f232ef56bfa4fd31
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0 b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
index c107155b432c..44eec2c596cf 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Resolver-0.921.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d579710e023b99216780d6eedcffb9f
diff --git a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0 b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
index 1992326a08bb..a9ed3b897fec 100644
--- a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
+++ b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a41aaf749741fa8ff6ed581c281d1d5
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0 b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
index b28e3e77d66a..23d68b8de2bb 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-EPoll-1.003.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=608165a9343a051c0ac0d2233a7d0d8f
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
index 4708a27bf188..62c71a49b491 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd4864fdc9193df11c9fccc91221240b
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
index 04248fdd8810..28fd89d138fc 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/POE dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Queue-Array-0.006.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58b6fb101a2b61256e8cdcdfa36687db
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
index 39f4d8c98bb4..6db8f7b16723 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9fb80cafb27fdf1cf1e5db9c4264e51b
diff --git a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0 b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
index 9af7bee341aa..619c95bd587a 100644
--- a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
+++ b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbb9cd9a9b55f3a56b487c2934464f5d
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index 54268ce7faf1..fc8f69d45eb4 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e1e3e3685f7da42d5132c54ff19e2490
diff --git a/metadata/md5-cache/dev-perl/Palm-1.12.0-r1 b/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
index 66738695136e..1634b59fed94 100644
--- a/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
+++ b/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/p5-Palm-1.012.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f978af0e9f3db2bf9c2f7a0e2b35297
diff --git a/metadata/md5-cache/dev-perl/Params-Util-1.60.0-r1 b/metadata/md5-cache/dev-perl/Params-Util-1.60.0-r1
index eef320ac6684..17fb7479fdc8 100644
--- a/metadata/md5-cache/dev-perl/Params-Util-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Params-Util-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.18 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8d38285f0ed97eb20fd685510692922
diff --git a/metadata/md5-cache/dev-perl/Params-Validate-1.70.0-r1 b/metadata/md5-cache/dev-perl/Params-Validate-1.70.0-r1
index ab994815f26d..87af9d212c8e 100644
--- a/metadata/md5-cache/dev-perl/Params-Validate-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Params-Validate-1.70.0-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=virtual/perl-Attribute-Handlers dev-perl/Module-Implementation dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46fba39c25f37f81d0b13033f02cb5f8
diff --git a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1 b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
index 3f3b6f888d7b..b3529f2de5fe 100644
--- a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Parse-ExuberantCTags-1.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8b02673871e14b3790f3235fe02bb56
diff --git a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1 b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
index dabdf7cec25f..92b45842e280 100644
--- a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-perl/File-Tail dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a9912aa8d7186e8653069bc0286d67e
diff --git a/metadata/md5-cache/dev-perl/Parse-Yapp-1.50.0-r1 b/metadata/md5-cache/dev-perl/Parse-Yapp-1.50.0-r1
index 76b9b341f743..04e05ceb0379 100644
--- a/metadata/md5-cache/dev-perl/Parse-Yapp-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-Yapp-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!=net-fs/samba-4* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FD/FDESAR/Parse-Yapp-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=27a844140bb915de6c1017ba42291441
diff --git a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1 b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
index 9934c5c8f60c..20f53582c064 100644
--- a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
+++ b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b36778b8f2b4c634d33f496d106363ce
diff --git a/metadata/md5-cache/dev-perl/Pegex-0.600.0 b/metadata/md5-cache/dev-perl/Pegex-0.600.0
index b50a90a847e5..33d1490c9500 100644
--- a/metadata/md5-cache/dev-perl/Pegex-0.600.0
+++ b/metadata/md5-cache/dev-perl/Pegex-0.600.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Pegex-0.60.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=62ac263275ac1fec639578a3836016fe
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r1
index acaca9170c4a..92e91cb483df 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Dynamic-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=736cb05a172b2fffd957f03fde3b418c
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
index 4817a0c51ae1..089d403fe160 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d76cba8fecb57e358f4957e7563acd6b
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
index b203f5fb8fe2..13047f2bb205 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b6239487042187a749d00ab5eb8bc9d
diff --git a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0 b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
index caa67b272d10..8ceb247411c0 100644
--- a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
+++ b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5441fcb128fd5df2b640cde089dad588
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
index f2e54f10dfa6..6c5475218708 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6803bad6244c604a9a68c29518db491d
diff --git a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1 b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
index 5cbb119da2d6..8217520a7eab 100644
--- a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Perlbal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-XS-HTTPHeaders-0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b937f3d731855aea137b9a39fd125874
diff --git a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2 b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
index b2ad36396585..c4debc4b5849 100644
--- a/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
+++ b/metadata/md5-cache/dev-perl/PlRPC-0.202.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Storable-1.0.7 >=dev-perl/Net-Daemon-0.34 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/PlRPC/PlRPC-0.2020.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8d3bfd999693b0dc7d9bc156c2eb7eb
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
index e57ee95ed48b..beaeab64829d 100644
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45a7ee69d323dca189343cb41f826eb5
diff --git a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1 b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
index d8b04db27f6a..d4c1c4cb5be8 100644
--- a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5413e9b200ef20705dc3c18bb7546dee
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
index 5954f6d5dc5a..4198f1605a86 100644
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=982e5316958259869631c20ec261dffd
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index aabfbf9f002c..efeb7ca633c1 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6cd21717f0c4a10e1e8d74bd41a2b08e
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
index 815bba91e9bf..1f9c9353c10c 100644
--- a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+++ b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb50559465e7f5eccba81c854185e3df
diff --git a/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0-r1 b/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0-r1
index 94cf90482730..69d27c6f12c1 100644
--- a/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Pod-Escapes virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Pod-Spell-1.01.tar.gz mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=746d27e0de767df1ab8f8ff4e504a7f9
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index aaf0305e8d05..da5ff2e2f0f4 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f04b333ba9e68d8ab69bf7eafe60636
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
index 8ee4653ae7aa..1481dad3739b 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e54bd22077e5b77496227de6715af6f
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
index 434e1034a36c..5bf70448994a 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dee26e709bd74987cedde1c67994bca5
diff --git a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1 b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
index 63f438247f3f..f3a7abfa0d5e 100644
--- a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAWNPW/PostScript-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0849b8e6f23071b8405068bcc57530c0
diff --git a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1 b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
index ef041f35b9b5..7c61512fe79f 100644
--- a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BZ/BZAJAC/Proc-Background-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2571eb80c782b76d3f304237d708c9fd
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
index 764ff900a184..0b2ff2e9507c 100644
--- a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IPC-Signal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebc07ff472cbcc00543a926987cce76c
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
index e97a232e1211..005c742fe79a 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.79.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c65a561474cf516d5f8fcb00fb1c0aa1
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
index a82a2297e451..6685dc469158 100644
--- a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b532c0103d5af689ea85df04e9b03be
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.0.0 b/metadata/md5-cache/dev-perl/Readonly-2.0.0
index 8fadb5ba662b..44520dcaa56f 100644
--- a/metadata/md5-cache/dev-perl/Readonly-2.0.0
+++ b/metadata/md5-cache/dev-perl/Readonly-2.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b72f6bc6591e7fd29c27e295cc33ad22
diff --git a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1 b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
index 8bd451bf59af..bfb7dc77353d 100644
--- a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=244c8afa4cb673c4f6e2e61bc99bde5e
diff --git a/metadata/md5-cache/dev-perl/RedisDB-2.360.0 b/metadata/md5-cache/dev-perl/RedisDB-2.360.0
index 54cb53024a86..04c57a143802 100644
--- a/metadata/md5-cache/dev-perl/RedisDB-2.360.0
+++ b/metadata/md5-cache/dev-perl/RedisDB-2.360.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-IO-Socket-IP dev-perl/RedisDB-Parser dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-2.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0e22d50543ab2a6181088db73f61a94f
diff --git a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1 b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
index 82136b286efd..ebe8787ce2d0 100644
--- a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b182e07692f6de7fb5523a032eefa6dd
diff --git a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
index 625b5f5415a9..9ed2bfc9aeae 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBS/Regexp-Shellish-0.93.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=380946ecc8b069e7655e6e075ef964e1
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1 b/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
index e24fbf42231e..32c9c756fead 100644
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
+++ b/metadata/md5-cache/dev-perl/Return-Value-1.666.1-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3a82aeb5d66ce02dd365cf3114bbde8
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
index 92128e7034ed..333b3e4ff0b0 100644
--- a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+++ b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=425bfa47e3679e7b399b01e1cf13e174
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0 b/metadata/md5-cache/dev-perl/Roman-1.240.0
index 41d4d2d33448..8ae1862e15ae 100644
--- a/metadata/md5-cache/dev-perl/Roman-1.240.0
+++ b/metadata/md5-cache/dev-perl/Roman-1.240.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3cdd2a9e94b6a772c52d7542d7e0e83
diff --git a/metadata/md5-cache/dev-perl/SDL-2.546 b/metadata/md5-cache/dev-perl/SDL-2.546
index 25e1f4c18f69..a4155997ecc1 100644
--- a/metadata/md5-cache/dev-perl/SDL-2.546
+++ b/metadata/md5-cache/dev-perl/SDL-2.546
@@ -8,5 +8,5 @@ LICENSE=GPL-2 OFL-1.1
 RDEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.546.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9aa91cd31a6dd8272243d5f994bf0fc5
diff --git a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7 b/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
index f1334077249f..dc95a93436a1 100644
--- a/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
+++ b/metadata/md5-cache/dev-perl/SGMLSpm-1.03-r7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e51174486fefe5828dc7a9872c9fbe4
diff --git a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2 b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
index 36a2db3b3cfd..486e8b3ca083 100644
--- a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
+++ b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/SNMP_Session-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a7d83c8290f294a649fbf1ec13d824a4
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
index af7c93d01da0..6c29b0e2bdc8 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80eaabab53d4d46c12d72b85d618b094
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1 b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
index 8eaf1c8a989f..da53c1698d8c 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d686fde77fe06be58aa0b36246d72c29
diff --git a/metadata/md5-cache/dev-perl/SRU-1.10.0 b/metadata/md5-cache/dev-perl/SRU-1.10.0
index 1333606124c4..fce41363a471 100644
--- a/metadata/md5-cache/dev-perl/SRU-1.10.0
+++ b/metadata/md5-cache/dev-perl/SRU-1.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CQL-Parser-1.120.0 virtual/perl-Carp dev-perl/Class-Accessor dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/SRU-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e10567e8e9e531bd22239f4cc266cc2f
diff --git a/metadata/md5-cache/dev-perl/SVG-2.640.0 b/metadata/md5-cache/dev-perl/SVG-2.640.0
index 56556017a566..4e0406774772 100644
--- a/metadata/md5-cache/dev-perl/SVG-2.640.0
+++ b/metadata/md5-cache/dev-perl/SVG-2.640.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/SVG-2.64.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=438b9a2cf5d9019b4fa583633dd88a8c
diff --git a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1 b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
index 305d07987ebb..c8d7b1d76963 100644
--- a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-perl/Math-Derivative dev-perl/Math-Spline >=dev-perl/Statistics-Descriptive-2.6 dev-perl/SVG >=dev-perl/Tree-DAG_Node-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALLENDAY/SVG-Graph-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b542c07769752ce9f65794cb4583171
diff --git a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1 b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
index bc963a76c9ad..01eb60457de7 100644
--- a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1006e2af83c6a38b3a3cf8896c7f6e74
diff --git a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5 b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
index 71bb2712dda9..bc1f9039d82e 100644
--- a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
+++ b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000005.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0ff4c6e2b6fbcf7583306cf3d4a6b5d5
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
index 3d3f435ca983..c71e024007f0 100644
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=67db3d321ecb8fa9c4cdacda1780011e
diff --git a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1 b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
index 7930be04ef11..e3632e563c3f 100644
--- a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
+++ b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARCEL/Scalar-Properties-1.100860.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05f66b8f17f3d5d025346694ef6277f4
diff --git a/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r1 b/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r1
index fb4b06497564..5055c739a9ef 100644
--- a/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-process/at dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSERODR/Schedule-At-1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c27d7c897bf315b1d19e813468a77c6e
diff --git a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0 b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
index 9fc5313e6e75..149cc891444b 100644
--- a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
+++ b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Set-Crontab-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0aca8d4d52d157e4ec487779d7dcb34b
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
index 87e667473f9a..1064b0f27c14 100644
--- a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ffca66ecee97aeb81105898b0efb0a34
diff --git a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1 b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
index ad2d05b2686b..c8f642e05c84 100644
--- a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fad8e2238458bad8255f5d3ca743aa37
diff --git a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0 b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
index d1fd5c43db6f..2a9a0492faff 100644
--- a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
+++ b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b047a450ddd75c3f8dc0cef4d0762a6
diff --git a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2 b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
index d1ffd266d32f..cb5793e6a65e 100644
--- a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
+++ b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-MethodMaker-2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DF/DFARALDO/Shell-EnvImporter-1.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=20db3db67221e74ab3983a48fd53a44a
diff --git a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
index ecc2218da45c..033437f3031e 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a3b55bc8926c2d111864a91164ba0b8
diff --git a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
index 506a62e33ea6..c177c29ee351 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0540ed0629f1112d23fd6f8c74078aa0
diff --git a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0 b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
index 4b272ee37ebc..51936599a80d 100644
--- a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
+++ b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-0.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8de5c91f0ff9f7916e0979c19c2dd2f6
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.270.0 b/metadata/md5-cache/dev-perl/Socket6-0.270.0
index 4d221f4530bd..75750a9e86e8 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.270.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.270.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=109b5605f87568335122b4cfa9a46560
diff --git a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1 b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
index 91f16720f8d3..30c6cdd7e2fb 100644
--- a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c967ed5448282d460a3e9b1d76be03da
diff --git a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1 b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
index eb3332b4e71b..cf500a764694 100644
--- a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRYCE/Sort-Tree-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a56a32279261dab69b5ad85b620601e
diff --git a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1 b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
index 8220dce32bbd..ff6166f23667 100644
--- a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
+++ b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-accessibility/sphinx2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJHD/Speech-Recognizer-SPX-0.0801.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf4131158a5ddf1dcb8e590a528c379a
diff --git a/metadata/md5-cache/dev-perl/Spiffy-0.460.0 b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
index 57d6155bb0c1..27a76b5c077c 100644
--- a/metadata/md5-cache/dev-perl/Spiffy-0.460.0
+++ b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=124a851ff25a62f71510add251a63973
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0 b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
index cae2a450990b..c8c7c558af67 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-perl/Text-CSV_XS dev-perl/Crypt-RC4 dev-perl/Digest-Perl-MD5 unicode? ( dev-perl/Unicode-Map ) cjk? ( dev-perl/Jcode ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc5ba14c1e0bcd84e9136835f1ebfcf2
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
index 837b36876c01..54ea83223f9b 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31c687631c975c07e5e816281b04990a
diff --git a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1 b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
index 8e528f8aa6a0..ce101a4d0e5d 100644
--- a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Stat-lsMode-0.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b464d96722de462727bd1a2bc64dce5
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
index aad5a87965e5..909f0d60de49 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHETTBULL/Statistics-Descriptive-Discrete-0.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f8a9c33184eb35e9a04af600266b8eb
diff --git a/metadata/md5-cache/dev-perl/String-CRC32-1.500.0 b/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
index 9509cd868d31..27e2d30b09e7 100644
--- a/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
+++ b/metadata/md5-cache/dev-perl/String-CRC32-1.500.0
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d9cb254bec4ec5f5c9d83c4c45e4e61
diff --git a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1 b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
index 8ed3a2b94d83..cc625d9ce5d5 100644
--- a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOXZOU/String-Ediff-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d818b9864e5553aec6e5b773f6f20e6
diff --git a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1 b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
index 2de66de279a7..87a50fd43142 100644
--- a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DARREN/String-Format-1.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36e72a9ed1b6eed642596d30edfb04fc
diff --git a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1 b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
index f67fcf0b20d8..f3dabce6f497 100644
--- a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a61c747634bb04b4942d445f9bf5971d
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
index c2d45b84b505..9ccc8761f743 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e702f6bba55f4094b8de8e4f6202e37f
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11 b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
index a993aa92ee93..f001979b992e 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001011.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc1211e0114dc17d570462ae5d9babe8
diff --git a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0 b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
index 4b62f7f9a9a3..17fb74913d72 100644
--- a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+++ b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5a49f4cd932a6f6903108d674481fa8
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sub-Name-0.50.0-r1
index 76e7811fb3d4..c72da8832f23 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5797f548674fe9df4d0843847ba641e2
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
index 65276a41854c..2620ebf21881 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9f2319c120c732da7e0ac1ffb06f14cd
diff --git a/metadata/md5-cache/dev-perl/Switch-2.170.0 b/metadata/md5-cache/dev-perl/Switch-2.170.0
index 399c3aad0efa..206d97b677e3 100644
--- a/metadata/md5-cache/dev-perl/Switch-2.170.0
+++ b/metadata/md5-cache/dev-perl/Switch-2.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Switch-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=677397f93fca6342a190de66cdf7fdb5
diff --git a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1 b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
index a067d97751a4..ea655951cf91 100644
--- a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
+++ b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b63d7d1df1fbf8039b25a13dc04b828
diff --git a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0 b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
index 6f358e936dd3..862399bd8192 100644
--- a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
+++ b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca3c19d504382f5d6275b3a6f2e1ba9e
diff --git a/metadata/md5-cache/dev-perl/Sys-Hostname-Long-1.500.0 b/metadata/md5-cache/dev-perl/Sys-Hostname-Long-1.500.0
index e3a9f522f421..84918d94c1c1 100644
--- a/metadata/md5-cache/dev-perl/Sys-Hostname-Long-1.500.0
+++ b/metadata/md5-cache/dev-perl/Sys-Hostname-Long-1.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c411a89574b854a03e1cc710c7d26e37
diff --git a/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0 b/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
index 5ded447ed09d..cf447bd42bfc 100644
--- a/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
+++ b/metadata/md5-cache/dev-perl/Sys-MemInfo-0.980.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 || ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.98.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=204a03390f53ed57910267450d56fb7a
diff --git a/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0 b/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0
index c9f435483fac..cd6efa5178df 100644
--- a/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0
+++ b/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b1d940e1138ec5b1263cd3af47dcff0
diff --git a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1 b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
index 33f789daf0e1..d1355f42da92 100644
--- a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLOONIX/Sys-Statistics-Linux-0.66.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e67fa95c0a62a495e029c4faf4b8978c
diff --git a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2 b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
index ed1427bae166..497e37880eb3 100644
--- a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Sys-Syscall-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8cfdd8af77b39c82dd0661dfde49cb99
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2 b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
index 627de02b5908..fc1df450b04a 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-1.1.2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a164e4c63c696cde2358ad4524044ba7
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9 b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
index 3e263f509166..93d95d90dbd1 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-1.2.9 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8e2a0f7630ce691762af6368ba6e411
diff --git a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1 b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
index d191479b96fd..e582ce949653 100644
--- a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Taint-Runtime-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b919d4b4cb3916af3d274faa0af1667
diff --git a/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1 b/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
index b0bf5cce3533..3a65f3dc802b 100644
--- a/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8fb702f060579070e5a2123ba988dde1
diff --git a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1 b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
index 0b009f7b1f93..d2d89b7481ff 100644
--- a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/GD-Graph3d >=dev-perl/Template-Toolkit-2.15-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2052927e49b26d93f7d73da1d6c88a14
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index 114f20ba9c15..f7ddb7bebd7b 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-perl/Template-Toolkit-2.16 virtual/latex-base dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b57e85bb339512f7e8c57a9ba1c7cc92
diff --git a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1 b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
index c3d8a0e65cd4..0e6c9620a637 100644
--- a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16501cd40f46b85526e284f726148e18
diff --git a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1 b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
index a6d88649b3ed..3ce3fca5218d 100644
--- a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Template-Toolkit-2.15-r1 dev-perl/XML-DOM dev-perl/XML-Parser dev-perl/XML-RSS dev-perl/XML-Simple dev-perl/XML-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-XML-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=947b1af6e7419dbcb4909b380d18e4b6
diff --git a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1 b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
index 1aeb9f98593f..386324b6f51b 100644
--- a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Term-ANSIScreen-1.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=398dc9d77d2d9453cd46f5b2ce23eed2
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
index 8f204ad54165..5dd815eb0a36 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7824a9053d30d572f7e130dbdf83676
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0 b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
index 148b33cea98a..8f0627de5609 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.310.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Readline XS library wrapper
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-ReadLine-Gnu
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/readline-6.2:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=151fc2636550d0f9e49bb7238aeb9e84
+_md5_=4359ffcfac3870cb523c34ca8c95e129
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-Perl-1.30.300-r1 b/metadata/md5-cache/dev-perl/Term-ReadLine-Perl-1.30.300-r1
index 3e49b0e633f1..3b086aada482 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-Perl-1.30.300-r1
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-Perl-1.30.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/Term-ReadLine-Perl-1.0303.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6862959ddbc0c4d59d615fb697195448
diff --git a/metadata/md5-cache/dev-perl/Term-ReadPassword-0.110.0-r1 b/metadata/md5-cache/dev-perl/Term-ReadPassword-0.110.0-r1
index 8c3d3b7d66e1..9b712c028b33 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadPassword-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ReadPassword-0.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHOENIX/Term-ReadPassword-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73d4f3b0851051beb3ab222f88878b51
diff --git a/metadata/md5-cache/dev-perl/Term-Screen-1.50.0 b/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
index 2870fae77c91..2c41bb7c1eb0 100644
--- a/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
+++ b/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple Term::Cap based screen positioning module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-Screen
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 s390 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/Term-Screen-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=86979c7acec462822028899bab213d76
+_md5_=b2c2a9971b81b32642d45b46a4d3daa1
diff --git a/metadata/md5-cache/dev-perl/Term-Screen-1.60.0 b/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
index 4c649d6dc209..79cfae4719d0 100644
--- a/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
+++ b/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple Term::Cap based screen positioning module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-Screen
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 s390 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/Term-Screen-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=136b85fe5ba79b3ef2f3aed515cf565d
+_md5_=21a389396617e027e1de380e5d878ce0
diff --git a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1 b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
index 2c4b0fd256dc..78f68a5a4d4b 100644
--- a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Term-Screen-1.30.0 dev-lang/perl:=[-build(-)]
 DESCRIPTION=A Term::Screen based screen positioning and coloring module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Term-ScreenColor
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 s390 x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Term-Screen-1.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUITTENB/Term-ScreenColor-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38275ab5afe313d30261ab4f7efdc282
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=01b0c4cd9d6953f55f49670ab00024a9
diff --git a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1 b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
index e5cdb4059cee..8892bd3032d8 100644
--- a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-perl/Term-ReadLine-Gnu dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33f5807c0797333388c6ac761341806b
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.330.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
index 6923df9f4b62..08b6c5a724ab 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.330.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d032cbe5bf63d03af78e98a73ea065a
diff --git a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1 b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
index 8c00a2319287..041dbafa91ad 100644
--- a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
+++ b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.22.01 dev-perl/Symbol-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebcefce6da3de73f0f556aa9d11be0ac
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index af68d33047c8..1114679188d3 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afc95feba1161ab2bff281b2f8f62fc8
diff --git a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0 b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
index 9b46606d7f3f..81ca01013a7c 100644
--- a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
+++ b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=413d1279c8da3d01b59a7e98a4273c23
diff --git a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0 b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
index 0ed0a8430c11..ad0edffd3e18 100644
--- a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
+++ b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.120.920 >=dev-perl/CPAN-Meta-Check-0.7.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24979903a2ab7946a90e81b7372ae1db
diff --git a/metadata/md5-cache/dev-perl/Test-Class-0.500.0 b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
index 096e5b4da96b..12e56d4193e2 100644
--- a/metadata/md5-cache/dev-perl/Test-Class-0.500.0
+++ b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Attribute-Handlers-0.770.0 virtual/perl-Carp virtual/perl-File-Spec >=dev-perl/MRO-Compat-0.110.0 dev-perl/Module-Runtime >=virtual/perl-Storable-2.40.0 virtual/perl-Test-Simple dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=52b62116243a7a9749228c944df6826c
diff --git a/metadata/md5-cache/dev-perl/Test-ClassAPI-1.60.0-r2 b/metadata/md5-cache/dev-perl/Test-ClassAPI-1.60.0-r2
index bd94c2952182..736b6be0d5f4 100644
--- a/metadata/md5-cache/dev-perl/Test-ClassAPI-1.60.0-r2
+++ b/metadata/md5-cache/dev-perl/Test-ClassAPI-1.60.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.83 virtual/perl-Test-Simple >=dev-perl/Class-Inspector-1.12 dev-perl/Config-Tiny >=dev-perl/Params-Util-1.00 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-ClassAPI-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=69a0b2bece3502e24bb17e6de3bff30b
diff --git a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.180.0 b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.180.0
index 4e2daa6964b2..bade185cddb9 100644
--- a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.180.0
+++ b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.180.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Package-Stash-XS ) dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Package-Stash-0.140.0 dev-perl/Sub-Exporter dev-perl/Sub-Identify virtual/perl-Test-Simple dev-perl/namespace-clean dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8786d86d4f8f835d45034e3c00423646
diff --git a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0 b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
index d7634858c49f..06d2a7211517 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMCBRIDE/Test-Command-Simple-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ea973f95e9237c34e6181282a77fa1da
diff --git a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0 b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
index 203ab81c6eb9..3c343df44866 100644
--- a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+++ b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec >=dev-perl/Module-Manifest-0.70.0 virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba60d07939bd9f48f511ca33cbc664ce
diff --git a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1 b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
index 86a6091bf6ee..e565ae822877 100644
--- a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Pod-Coverage-0.20 >=dev-perl/File-Find-Rule-0.30 dev-perl/Test-Pod-Coverage >=virtual/perl-Module-CoreList-2.17 >=dev-perl/Test-Pod-1.26 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-2.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=937a4646684c787ca054d48a6fb81242
diff --git a/metadata/md5-cache/dev-perl/Test-EOL-1.600.0 b/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
index 03194b31b652..d53ef6f9bf4b 100644
--- a/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
+++ b/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Test-EOL-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9610786b06ecd33e600832dc3e05f9c7
diff --git a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1 b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
index 24fac44e997e..4b821d215e8c 100644
--- a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Add test failures if warnings are caught
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-FailWarnings
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.860.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=53a911f082ddec5a31d9eb117e529460
+_md5_=3d84d392a8a88cb084493044a0c62d36
diff --git a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0 b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
index 33893e59e0fe..81c2617481fa 100644
--- a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
+++ b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.150.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Test-LeakTrace-0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2001039d3a5be08a40418d3b872234b
diff --git a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0 b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
index d381fae34740..0c4750a4f22d 100644
--- a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
+++ b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07d28d59c8240a62016b104bb1086e3a
diff --git a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0 b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
index 43d9f4ec4b14..ca8a300ec8de 100644
--- a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.950.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98a7d3ac3016d9552d371b02037690ac
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
index 5b1b863399dc..64dc201f6c0c 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20150527.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d28a3266dfcb8c30a2fa2ce2edebfff
diff --git a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0 b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
index 678ff5aaf1d0..5fca6aeca6d1 100644
--- a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
+++ b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces random number generation with non-random number generation
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-MockRandom
 IUSE=test minimal examples
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-MockRandom-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=3e6b16a30bb7903f53b84ab71e4261c2
+_md5_=025bbed63cfd7f6af52ab3688162cce8
diff --git a/metadata/md5-cache/dev-perl/Test-Most-0.310.0-r1 b/metadata/md5-cache/dev-perl/Test-Most-0.310.0-r1
index a4dee6346438..d9acd52d0f6f 100644
--- a/metadata/md5-cache/dev-perl/Test-Most-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Most-0.310.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Warn-0.230.0 >=dev-perl/Test-Deep-0.106 >=dev-perl/Test-Differences-0.610.0 >=dev-perl/Test-Exception-0.310.0 >=virtual/perl-Test-Harness-3.210.0 >=virtual/perl-Test-Simple-0.88 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2f58b6773169671454f48b5c3be23fb
diff --git a/metadata/md5-cache/dev-perl/Test-Most-0.340.0 b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
index 889f25fe88fb..5b9fb573dfa9 100644
--- a/metadata/md5-cache/dev-perl/Test-Most-0.340.0
+++ b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Warn-0.230.0 >=dev-perl/Test-Deep-0.106 >=dev-perl/Test-Differences-0.610.0 >=dev-perl/Test-Exception-0.310.0 >=virtual/perl-Test-Harness-3.210.0 >=virtual/perl-Test-Simple-0.88 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c49271bc2e036243292323482ae7de34
diff --git a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3 b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
index 3ee1582143a9..a574d8661410 100644
--- a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
+++ b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f60eb692549d160df852ed5a6e99b9de
diff --git a/metadata/md5-cache/dev-perl/Test-Output-1.30.0 b/metadata/md5-cache/dev-perl/Test-Output-1.30.0
index 34f9c44e85a5..2520098fbce7 100644
--- a/metadata/md5-cache/dev-perl/Test-Output-1.30.0
+++ b/metadata/md5-cache/dev-perl/Test-Output-1.30.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.170.0 >=virtual/perl-File-Temp-0.170.0 dev-perl/Sub-Exporter virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da2228a1e8988e0a695e5095096793f4
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index 007dbe20d150..8c0a38538d9d 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03ab999f0557aa41671d20a22b7050b4
diff --git a/metadata/md5-cache/dev-perl/Test-Portability-Files-0.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Portability-Files-0.60.0-r1
index 4d12fb2b54b8..0a280c2f1aa3 100644
--- a/metadata/md5-cache/dev-perl/Test-Portability-Files-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Portability-Files-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=059e66f304f09a961974db207c33fe6c
diff --git a/metadata/md5-cache/dev-perl/Test-Spec-0.510.0 b/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
index 16dc6de27bfa..59df20e8eb9d 100644
--- a/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Spec-0.510.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils >=dev-perl/Package-Stash-0.230.0 virtual/perl-Test-Harness >=dev-perl/Test-Deep-0.103.0 >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Trap dev-perl/Tie-IxHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYJONES/Test-Spec-0.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c5503127c43168a044848d7c5d24a7c
diff --git a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
index a143a079b165..85ba0bc47f73 100644
--- a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Taint-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1452648e5e94a5cd0c0fdb050ec44db
diff --git a/metadata/md5-cache/dev-perl/Test-Trap-0.2.2-r1 b/metadata/md5-cache/dev-perl/Test-Trap-0.2.2-r1
index 2af7f6a7687d..fdc2ab321b75 100644
--- a/metadata/md5-cache/dev-perl/Test-Trap-0.2.2-r1
+++ b/metadata/md5-cache/dev-perl/Test-Trap-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d281bd06d0de4e52caee5cd7e193ab28
diff --git a/metadata/md5-cache/dev-perl/Test-Trap-0.3.2 b/metadata/md5-cache/dev-perl/Test-Trap-0.3.2
index 8709a8e2db76..f80f4d329947 100644
--- a/metadata/md5-cache/dev-perl/Test-Trap-0.3.2
+++ b/metadata/md5-cache/dev-perl/Test-Trap-0.3.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump virtual/perl-Exporter virtual/perl-File-Temp virtual/perl-IO dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=22f854687ee45ed628b94512ac7a93d6
diff --git a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1 b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
index 9971d4d77777..5b41b444e656 100644
--- a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
+++ b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3841a9527b0ff80ca5b4077cbd6ed4c
diff --git a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1 b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
index d1b77e2dc5e1..167e194d5622 100644
--- a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=>=dev-perl/WWW-Mechanize-1.680.0 dev-perl/Carp-Assert-More dev-perl/URI >=dev-perl/Test-LongString-0.150.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=317ff8739120c86c7261a253074fc9da
diff --git a/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1 b/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
index 4e0ff2954752..5e969f3f253e 100644
--- a/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Warn-0.300.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.220.0 >=dev-perl/Sub-Uplevel-0.12 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9d320c705760fe0215bf0c20d9dc423
diff --git a/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0 b/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
index 71547740bb8f..f98f6e5651a4 100644
--- a/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
+++ b/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Test-Simple virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.016.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e97bc60e9aa9ff734cc1957cc818ec87
diff --git a/metadata/md5-cache/dev-perl/Test-YAML-1.50.0 b/metadata/md5-cache/dev-perl/Test-YAML-1.50.0
index 07bfc60b6e9b..2647ff56275e 100644
--- a/metadata/md5-cache/dev-perl/Test-YAML-1.50.0
+++ b/metadata/md5-cache/dev-perl/Test-YAML-1.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Test-Base-0.860.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-YAML-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f3df721b11aea16dab99dedf7ff3d29
diff --git a/metadata/md5-cache/dev-perl/Text-Aspell-0.90.0-r1 b/metadata/md5-cache/dev-perl/Text-Aspell-0.90.0-r1
index a8efde1296f9..303abcce68e2 100644
--- a/metadata/md5-cache/dev-perl/Text-Aspell-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Aspell-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/aspell dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba3e660060b9f2fc381734e6a11c25eb
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1 b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
index e554736a8d8e..5e91f430a4a1 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=dev-perl/Text-CSV_XS dev-perl/Class-Trigger dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Text-CSV-Simple-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a81b453c90608b1da5b524a604dec52
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index ac700332cf04..27a873959678 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=718dc38de07978051a27fc0d45e642c7
diff --git a/metadata/md5-cache/dev-perl/Text-Format-0.590.0 b/metadata/md5-cache/dev-perl/Text-Format-0.590.0
index 896c099230f0..27cd73efc6dd 100644
--- a/metadata/md5-cache/dev-perl/Text-Format-0.590.0
+++ b/metadata/md5-cache/dev-perl/Text-Format-0.590.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.59.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91284ab5c4a9d8f3200ed571f5dbddd5
diff --git a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
index e7bcf85a206d..3e76ef5fcf82 100644
--- a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=374a3d59aa22415f255e6990f34936d3
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1 b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
index 35aa6a336b51..2d25884ff270 100644
--- a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc3e56c7e514afd5f9eb394d6312e80b
diff --git a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r1 b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r1
index 654103c36974..8857054f90c5 100644
--- a/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Iconv-1.700.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=110e71a9ffdf26a9098adc01ecc27ded
diff --git a/metadata/md5-cache/dev-perl/Text-Kakasi-2.40.0-r1 b/metadata/md5-cache/dev-perl/Text-Kakasi-2.40.0-r1
index 070dc6079fed..f847cc697db6 100644
--- a/metadata/md5-cache/dev-perl/Text-Kakasi-2.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Kakasi-2.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/kakasi-2.3.4 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Text-Kakasi-2.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3637cc6309c53ffece6fd96920ce0521
diff --git a/metadata/md5-cache/dev-perl/Text-Levenshtein-0.50.0-r1 b/metadata/md5-cache/dev-perl/Text-Levenshtein-0.50.0-r1
index 0883faca9c59..dfd276ffc69f 100644
--- a/metadata/md5-cache/dev-perl/Text-Levenshtein-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Levenshtein-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-Levenshtein-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5d20c380a8c4f7ea2909e95a4c0c9ec
diff --git a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1 b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
index 8e8d48f7a77c..d2144caeb568 100644
--- a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd7f4981f8092219e99cc15a1e987dc9
diff --git a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1 b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
index 9d9fb694c557..25eea69374ad 100644
--- a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRAFTERY/Text-Netstring-0.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b215dfe5ef8e3565d63ad2280c146f5
diff --git a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1 b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
index afa6e5a8131f..57e9f3d029b7 100644
--- a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47c2b2965c3323313d459f352e8ad5f5
diff --git a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1 b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
index 8cde47fb9558..427fe2293a57 100644
--- a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Diff dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CADE/Text-Patch-1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9627a96092b868b4225bd2ccb85312dd
diff --git a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1 b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
index fb896dd98876..482efdb28cd0 100644
--- a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1dfdae017cc14e717894987d6f515c43
diff --git a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0 b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
index 5c50fa76ec62..e9ea13e70c3f 100644
--- a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
+++ b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82975ee2ef8660dd07d8aca1c1226af2
diff --git a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
index 6364c491593e..957ff83c3509 100644
--- a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=38cbf7db6822dd643f36ea5fbe143480
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.460.0-r1 b/metadata/md5-cache/dev-perl/Text-Template-1.460.0-r1
index a37afb48e25e..47cb0c5c070a 100644
--- a/metadata/md5-cache/dev-perl/Text-Template-1.460.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.460.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Text-Template-1.46.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f42d0919147bbcf83cc8e59bf09ecd94
diff --git a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
index 51ce60431f12..326e75564c5a 100644
--- a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4ab08ab1bf8af4ed9c8d7c7514170af
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
index bde7a103d3b7..86a4a2992bc7 100644
--- a/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Unidecode-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14f4e56125e4b90e474c44f64224532e
diff --git a/metadata/md5-cache/dev-perl/Text-Unidecode-1.270.0 b/metadata/md5-cache/dev-perl/Text-Unidecode-1.270.0
index 3a54499ca8fb..74cfa6bdadb2 100644
--- a/metadata/md5-cache/dev-perl/Text-Unidecode-1.270.0
+++ b/metadata/md5-cache/dev-perl/Text-Unidecode-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9a9caf92ada4fbb3c76d50f9e45f5d6
diff --git a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0 b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
index 1bb409313b37..abc900eaa2d0 100644
--- a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
+++ b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=450718cc359f0847fe1d8146a6f5834b
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index 0f9c8886d6ea..0b0da715d612 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e15070cc75d5f7f2559cae992881468d
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
index 6a0816776d2d..9afc90416d11 100644
--- a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+++ b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=235942f4429cbeea1ace98e8f2ac43cc
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
index c041fcff4cc9..db7b91eb2d53 100644
--- a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40ccd2db617bd37e8c5c786f7154083d
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
index 559d51838159..9c3547fc9544 100644
--- a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=767220c238e38996f1a382c6c16ce477
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0 b/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0
index ce8935a3d504..568ccbcf18e0 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-0.210.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/Tie-Cache-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=025888f20ca63dee1adc4f2f5a35f696
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
index 76acbe05c241..fa17621d51d1 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bae52efb7b36e6834e445f1871352fc1
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
index afbdbea0a3a9..ca255f8dad44 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e728243602768548412d544ba4d2048a
diff --git a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1 b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
index 75f8f3a8dc34..a83b45ff3e93 100644
--- a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75411b43bd351b692d396b31dce1d98d
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
index 74cd091c69d8..2ce828c2e976 100644
--- a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+++ b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=661428604c56526a850bf7f204d2e029
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
index d98797740966..fc52b73fa85f 100644
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c5028249a04b7a363bee7d1bb4b20470
diff --git a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
index a2f0f07c63ed..2bf33fc76fd9 100644
--- a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Tie-ShadowHash-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14d81b664a83df40e45b05aa16991592
diff --git a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
index 8ec11635cd0c..c681c5712b2a 100644
--- a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KV/KVAIL/Tie-StrictHash-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a6f1df1d0eab27b93481b57058210944
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
index 69f795ac3355..5187cd379499 100644
--- a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=83762f8734dffcda322bb094de47855b
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
index 92fd31cce618..f27107c34cb7 100644
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa1abbb21271e520f6f20eb9242480bf
diff --git a/metadata/md5-cache/dev-perl/Time-Period-1.250.0 b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
index f7514993d2ce..a19bc3a1e6ba 100644
--- a/metadata/md5-cache/dev-perl/Time-Period-1.250.0
+++ b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=123d0c468bd4c3bc4bf0e1c36492c840
diff --git a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1 b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
index db8b687c40c3..62a793e26cc2 100644
--- a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Time-Piece-MySQL-0.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae2581723ece021f75efd98cbd083043
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
index 43929fe7470d..c5c2ff2b0e16 100644
--- a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+++ b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0c9f36a6888c2bc30ede5beba5147836
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index 24063d09cc47..6196fe3399de 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9bea5c380c2021b8ebdf4eb29d328a3c
diff --git a/metadata/md5-cache/dev-perl/Tk-804.33.0 b/metadata/md5-cache/dev-perl/Tk-804.33.0
index 3075eeb16aaf..eb02bd472690 100644
--- a/metadata/md5-cache/dev-perl/Tk-804.33.0
+++ b/metadata/md5-cache/dev-perl/Tk-804.33.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) tcltk BSD
 RDEPEND=media-libs/freetype >=media-libs/libpng-1.4:0 virtual/jpeg x11-libs/libX11 x11-libs/libXft dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.033.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45c4acf54dc31bfe1b6caf8854164c29
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
index bd4d2d831d03..5fc8ae10ac8a 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7fe403b626d66c9dee2af41b9890a55
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
index 08f938a675fe..7631ea421f5a 100644
--- a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
+++ b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/jpeg dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.01403.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26790d6ee0a7119fd8624b48ccec0512
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index 392eb09f6d94..b357c6ef4500 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7fc98f10e15156ef2f7b313600974ae
diff --git a/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.60.0-r1 b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.60.0-r1
index 0c402160113b..069d10fa2392 100644
--- a/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d247ec4d35e7a08a8b11629f2a32aef
diff --git a/metadata/md5-cache/dev-perl/Tree-Simple-1.180.0-r1 b/metadata/md5-cache/dev-perl/Tree-Simple-1.180.0-r1
index 36d5c9c503d3..b0a7ff3dc4b1 100644
--- a/metadata/md5-cache/dev-perl/Tree-Simple-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/Tree-Simple-1.180.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba18d749d38b7466f892dc961c0a9be5
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.0.5 b/metadata/md5-cache/dev-perl/Type-Tiny-1.0.5
index e97c3849c0bc..cabf8935fa39 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-1.0.5
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.26.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff516017bd529e42e2ea324d6d5915e5
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
index a3c008dc84be..b3f052014186 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=710786a1daf5f90b05d493243955883b
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
index 8237b9b6dc0a..6fb37099ae27 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20150614.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13ec4c246e9a28dc8a1839c17b30dddf
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
index 1e4ff16c6fe7..f3833874d0b5 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/UNIVERSAL-moniker-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f594c509801cf759cadfbd942e7e262a
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0 b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
index 2936b560a439..6c1b97cab642 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=330bc032a7d268c37705aa51b9841830
diff --git a/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0 b/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
index e9ddf8e29551..60596f5172ca 100644
--- a/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
+++ b/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/URI-1.600.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20140709.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=10e1e27c02161c00e446234a2cee3eda
diff --git a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0 b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
index 50fe6da19131..55264800229c 100644
--- a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
+++ b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0926fb018eb022902b19f4125f3fa1ee
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
index 68a1c5cc0545..222c2531c424 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=772ec77a4f5c4c50b5d40ad0197e56e7
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
index 6c93363f14dd..95ad43d13684 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e7c659b81c7aa492ddafdb65711cb3b
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
index 800e5ff6d4b5..12250195cc74 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=77eeec7caa584f655d7503a398df7211
diff --git a/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r1 b/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r1
index 1e143a3c20bd..e119a828b423 100644
--- a/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-MapUTF8-1.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Unicode-Map dev-perl/Unicode-Map8 dev-perl/Unicode-String dev-perl/Jcode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da239e922ec8e8746205b6ad92f447ed
diff --git a/metadata/md5-cache/dev-perl/Unicode-String-2.90.0-r1 b/metadata/md5-cache/dev-perl/Unicode-String-2.90.0-r1
index fc78c37b0ee0..d9a807097dd8 100644
--- a/metadata/md5-cache/dev-perl/Unicode-String-2.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-String-2.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-String-2.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d7de46d5085a2fdac0300c5e253046d
diff --git a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
index 18f5921a7825..36295233d1a1 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Unicode-Normalize-1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=85088bd21a324493639a1088588ad50a
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
index a3f62b7457ea..61aaa552a491 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
@@ -4,10 +4,10 @@ DESCRIPTION=Encoding and decoding of UTF-8 encoding form
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Unicode-UTF8
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~m68k ~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 GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=fa28afe302ee263cb20a7ef818fa207a
+_md5_=aa479a45b2d74712d6f4d64e9fea2af5
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
index 35ed8c17dd31..4ba844f6f2b1 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUS/Unicode-UTF8simple-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5059ae0cf4b519840db5a2e905ee4a45
diff --git a/metadata/md5-cache/dev-perl/Unix-Getrusage-0.030.0 b/metadata/md5-cache/dev-perl/Unix-Getrusage-0.030.0
index 4cf402d32a5f..241f0583dbfa 100644
--- a/metadata/md5-cache/dev-perl/Unix-Getrusage-0.030.0
+++ b/metadata/md5-cache/dev-perl/Unix-Getrusage-0.030.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1e3b5a413a7d1c279e90b0c193c8f9eb
diff --git a/metadata/md5-cache/dev-perl/Unix-Syslog-1.100.0-r1 b/metadata/md5-cache/dev-perl/Unix-Syslog-1.100.0-r1
index 3f420c62f095..03b4b55206e9 100644
--- a/metadata/md5-cache/dev-perl/Unix-Syslog-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Unix-Syslog-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHARNISCH/Unix-Syslog-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05039b3ca4752d16aed8ed5dbba6e91f
diff --git a/metadata/md5-cache/dev-perl/User-Identity-0.940.0 b/metadata/md5-cache/dev-perl/User-Identity-0.940.0
index e58968207816..779c3e33b96c 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-0.940.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-0.940.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.94.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46b27a8bdc00f9e91d3591c227e61e56
diff --git a/metadata/md5-cache/dev-perl/Validate-Tiny-1.551 b/metadata/md5-cache/dev-perl/Validate-Tiny-1.551
index 3861ed510cd8..bbf5747caab1 100644
--- a/metadata/md5-cache/dev-perl/Validate-Tiny-1.551
+++ b/metadata/md5-cache/dev-perl/Validate-Tiny-1.551
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MINIMAL/Validate-Tiny-1.551.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80ea48e09e8b88cbdaa573df1f0cac96
diff --git a/metadata/md5-cache/dev-perl/Validate-Tiny-1.600 b/metadata/md5-cache/dev-perl/Validate-Tiny-1.600
index 4abd5e0a4c26..f836600bfccd 100644
--- a/metadata/md5-cache/dev-perl/Validate-Tiny-1.600
+++ b/metadata/md5-cache/dev-perl/Validate-Tiny-1.600
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MINIMAL/Validate-Tiny-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58eec663c87f5730ee57ac7700286f1f
diff --git a/metadata/md5-cache/dev-perl/Video-Frequencies-0.03-r1 b/metadata/md5-cache/dev-perl/Video-Frequencies-0.03-r1
index 49106370170c..04ff8eb131b5 100644
--- a/metadata/md5-cache/dev-perl/Video-Frequencies-0.03-r1
+++ b/metadata/md5-cache/dev-perl/Video-Frequencies-0.03-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/ivtv/Video-Frequencies-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f98e9ed8b963f653bbd2456390664269
diff --git a/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r1 b/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r1
index 57037bda87b2..33768b8d7da0 100644
--- a/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r1
+++ b/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r1
@@ -8,5 +8,5 @@ LICENSE=Aladdin
 RDEPEND=dev-perl/Class-MakeMethods dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALLENDAY/Video-Info-0.993.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3f4b89e6da4edad45951b75b7cee7c3
diff --git a/metadata/md5-cache/dev-perl/Video-ivtv-0.13-r1 b/metadata/md5-cache/dev-perl/Video-ivtv-0.13-r1
index f15acab81042..8a639a439d4a 100644
--- a/metadata/md5-cache/dev-perl/Video-ivtv-0.13-r1
+++ b/metadata/md5-cache/dev-perl/Video-ivtv-0.13-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/ivtv/Video-ivtv-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a361335d30d45411be879b01f5088bf8
diff --git a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0 b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
index adc9a47fdd6c..478947de0c4c 100644
--- a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
+++ b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( MPL-1.0 MPL-1.1 MIT )
 RDEPEND=net-misc/curl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68b6cdaf5648c4439260fb1ea9f7f230
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
index 073d99926923..5732ad1c1cc6 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.750.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-SSL >dev-perl/libwww-perl-6 dev-perl/HTML-Form >=dev-perl/URI-1.36 >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/WWW-Mechanize-1.75.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e81a20d7723ca43ecac49e43c228414
diff --git a/metadata/md5-cache/dev-perl/WWW-RobotRules-6.20.0 b/metadata/md5-cache/dev-perl/WWW-RobotRules-6.20.0
index 2e8a4e5b2bcd..4a1107b2d870 100644
--- a/metadata/md5-cache/dev-perl/WWW-RobotRules-6.20.0
+++ b/metadata/md5-cache/dev-perl/WWW-RobotRules-6.20.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/URI-1.10 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ab99eff7541ec2c6887ef368234b87e
diff --git a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1 b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
index 73252e89d104..bea74df53de7 100644
--- a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
+++ b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/Device-SerialPort dev-perl/Time-TAI64 virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/wattsup-daemon/WattsUp-Daemon-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7876b13a169d51dcd699012a536928ba
diff --git a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1 b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
index 04f6d0f29c67..a6122b629913 100644
--- a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LU/LUKKA/WeakRef-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5685e5ee371eedbfe8a35b06b8782c54
diff --git a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0 b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
index 3d2de1f28d2a..5fcbac148a1e 100644
--- a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
+++ b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/JSON dev-perl/libwww-perl dev-perl/LWP-Protocol-https dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b38a9c4643102aaad580816ea6172699
diff --git a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-0.930.0-r1 b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-0.930.0-r1
index d82f8eeda78b..21a7c0254d45 100644
--- a/metadata/md5-cache/dev-perl/WebService-MusicBrainz-0.930.0-r1
+++ b/metadata/md5-cache/dev-perl/WebService-MusicBrainz-0.930.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/libwww-perl dev-perl/URI dev-perl/XML-LibXML dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-0.93.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3af7b3e9c229c1737bbb48105aa5876
diff --git a/metadata/md5-cache/dev-perl/WordNet-QueryData-1.490.0-r1 b/metadata/md5-cache/dev-perl/WordNet-QueryData-1.490.0-r1
index 70d8b629ba2a..195eea386af1 100644
--- a/metadata/md5-cache/dev-perl/WordNet-QueryData-1.490.0-r1
+++ b/metadata/md5-cache/dev-perl/WordNet-QueryData-1.490.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-dicts/wordnet dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRENNIE/WordNet-QueryData-1.49.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=821d7566d08020e49efbcabefb951b2e
diff --git a/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r2 b/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r2
index 98c472c3603a..92ad11e4e6d2 100644
--- a/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r2
+++ b/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-libs/wxGTK:3.0 >=dev-perl/Wx-0.97.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-Perl-ProcessStream-0.32.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=8760ae778af6024a246ffc09ebb5d24c
diff --git a/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r2 b/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r2
index 1655c8967a2c..587413772e71 100644
--- a/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r2
+++ b/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) HPND
 RDEPEND=dev-perl/Alien-wxWidgets dev-perl/Wx x11-libs/wxGTK:3.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AZ/AZAWAWI/Wx-Scintilla-0.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
 _md5_=3e2cfbec8939fdce3f9678e785e08b18
diff --git a/metadata/md5-cache/dev-perl/X-Osd-0.700.0-r1 b/metadata/md5-cache/dev-perl/X-Osd-0.700.0-r1
index 61e844897d7c..76c599e47c85 100644
--- a/metadata/md5-cache/dev-perl/X-Osd-0.700.0-r1
+++ b/metadata/md5-cache/dev-perl/X-Osd-0.700.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-libs/xosd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GO/GOZER/X-Osd-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b702806344ce57179eec77f625dfe30d
diff --git a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1 b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
index db383f51ab63..d65657544b3e 100644
--- a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/X11-FreeDesktop-DesktopEntry-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e9db9a4d741cf22b493bedb77d6c03e4
diff --git a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1 b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
index 66b1083af16b..e7f08f8ad845 100644
--- a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3e90dd07eebc1126b2b959c9a803468
diff --git a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1 b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
index fdf3f6ef10c7..fde7beead3a0 100644
--- a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJOOP/X500-DN-0.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=070160ba64fb0680e40cced2107727ad
diff --git a/metadata/md5-cache/dev-perl/XML-Catalog-1.30.0 b/metadata/md5-cache/dev-perl/XML-Catalog-1.30.0
index 7a11fadf4c52..59688914a643 100644
--- a/metadata/md5-cache/dev-perl/XML-Catalog-1.30.0
+++ b/metadata/md5-cache/dev-perl/XML-Catalog-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Parser >=dev-perl/libwww-perl-5.48 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JF/JFEARN/XML-Catalog-1.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b3eef275f764861f64bc947190bb3a2
diff --git a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1 b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
index 8036d9df8796..2b141c443627 100644
--- a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-LibXML-1.69 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PAJAS/XML-CompactTree-XS-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=228bf91f09373559d39a353ba3ffeeff
diff --git a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1 b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
index 2c3b017876d3..e2d41d56c42e 100644
--- a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JENDA/XML-DTDParser-2.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9837a73bf73ef1172709a0023fa3681c
diff --git a/metadata/md5-cache/dev-perl/XML-Directory-1.0.0 b/metadata/md5-cache/dev-perl/XML-Directory-1.0.0
index 87a1c8ace3e3..a0685ec01a35 100644
--- a/metadata/md5-cache/dev-perl/XML-Directory-1.0.0
+++ b/metadata/md5-cache/dev-perl/XML-Directory-1.0.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PC/PCIMPRICH/XML-Directory-1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75dbb8c208e4c09b7a8bec39c230741f
diff --git a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1 b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
index 37d17fe7fbc2..fd99949ed73c 100644
--- a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.16 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEWONG/XML-Dumper-0.81.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8b50efdcbc1ea93bc6e10a708e77ee0
diff --git a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1 b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
index 388c0a3974f4..98ea12b25087 100644
--- a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-Elemental-2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3eae0d8ec5f0e0223f341597b7c0c32
diff --git a/metadata/md5-cache/dev-perl/XML-Fast-0.110.0-r1 b/metadata/md5-cache/dev-perl/XML-Fast-0.110.0-r1
index dc8cc8adb9e6..a9cbd52439f5 100644
--- a/metadata/md5-cache/dev-perl/XML-Fast-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Fast-0.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONS/XML-Fast-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=29c6e7a5a12f0670827a7c4d77b74e1c
diff --git a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1 b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
index 19e566a52a77..027bc43bcb0e 100644
--- a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-0.12 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2659700bc86523563929b13fc240848
diff --git a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
index a579271407f1..1f0aacd237d6 100644
--- a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/expat dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BH/BHOLZMAN/XML-Generator-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ea8ce5b4219b703164879748808c9b36
diff --git a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2 b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
index e2fd5e1eecf1..ac9d958f4113 100644
--- a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
+++ b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=06ead52789809c5dd806c1d6471f9b64
diff --git a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r1 b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r1
index db544a489383..5a83b073452a 100644
--- a/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Handler-YAWriter-0.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f9ffef8d7e0e39c14194dd4d1637c02f
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
index 76f27823aa82..c556b335b0ea 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-LibXML dev-perl/XML-NodeFilter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Iterator-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=521839adf58a3a015b75337c70248dc1
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
index b280f0832335..2460a22cd45b 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.940.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/libxslt-1.1.32 >=dev-perl/XML-LibXML-1.700.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.94.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a30ea412a3bba72820a5ef70bc98558d
diff --git a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1 b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
index 5ceea417b694..62cfaab7f7bd 100644
--- a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dccd873b833e909b1164a89bf0652d4c
diff --git a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1 b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
index e4beec750510..95b3aa216633 100644
--- a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-NodeFilter-0.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=babc8501358afdc30b547d845d18c825
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
index 631c7e942ef5..7e73f69cae8e 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45418e37077e0cc8f30216c695af010b
diff --git a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1 b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
index c3978b3c5a2a..588a1f329333 100644
--- a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
+++ b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-perl/TimeDate-1.16 dev-perl/XML-Elemental >=dev-perl/XML-RSS-Parser-4 dev-perl/Class-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RAI-1.3031.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8275c4e5d29423e73d3b8577159075d
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
index 6b178077c41f..df1163a5ea4d 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/XML-RSS dev-perl/Clone virtual/perl-Time-HiRes dev-perl/URI virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JB/JBISBEE/XML-RSS-Feed-2.4.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/XML-RSS-Feed/XML-RSS-Feed-2.320.0-patch.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6497026203af62feb33c36d2155f6a8
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
index 06c684768ab2..c24e880b146d 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Class-XPath-1.4 >=dev-perl/XML-Elemental-2.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RSS-Parser-4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d601ff287c93a1b4da4ebcdc15ea5ac6
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 3ceb2d30e3d0..fb23f82ed282 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
@@ -8,5 +8,5 @@ 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5522e6e5a39792e4500c2157aa1b841b
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1 b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
index d89eca3ca2a4..6dc31ef7999a 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.99.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5b5adc84223ac7219bcbf65d2e73f81
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0 b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
index 8f890d166705..17a25b444bdd 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/XML-SAX-0.15-r1 >=dev-perl/XML-NamespaceSupport-1.09 dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eac3ee689ee3557e735908aaef599ccb
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.560.0 b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.560.0
index 312f57740721..8b3c2722b6bb 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.560.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.560.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Filter-BufferText dev-perl/XML-SAX >=dev-perl/XML-NamespaceSupport-1.04 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.56.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4dbaff74f6e83de22834280d0e8b3612
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-2.200.0-r1 b/metadata/md5-cache/dev-perl/XML-Simple-2.200.0-r1
index 115024246459..31508060bc88 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-2.200.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Simple-2.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable dev-perl/XML-SAX dev-perl/XML-LibXML >=dev-perl/XML-NamespaceSupport-1.04 >=dev-perl/XML-Parser-2.30 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=791fdffa80392f23db71544a322958b1
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
index 29414e941619..2d6f8f900c32 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.34 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/XML-Simple-DTDReader-0.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0e39a1dd2350512e08876f4f92c7967
diff --git a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1 b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
index faaa9ec73505..e97b534e8206 100644
--- a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.30 >=dev-perl/XML-LibXML-1.54 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBRIAN/XML-SimpleObject-0.53.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0579ec46970ab317b9ef4b097d6e931
diff --git a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0 b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
index bae47776eac1..e292e7d6acd1 100644
--- a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
+++ b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Object-MultiType-0.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMHARISH/XML-Smart-1.79.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f925e2fb8269d9413dd707fd6f6410a1
diff --git a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0 b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0
index 5a3bdefb63f2..d0f0028c0210 100644
--- a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0
+++ b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-perl/Authen-SASL dev-perl/Net-DNS ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/XML-Stream-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72388ebe0dcd9186ce9724dc696a73ee
diff --git a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0 b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
index ccc4b1424e15..529d343c80f6 100644
--- a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
+++ b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX dev-perl/Tree-DAG_Node dev-perl/XML-Filter-BufferText dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8df9e8afbd9da94ad3f2bfb1b83e2ad
diff --git a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0 b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
index 1d7ecea252bf..dc8bd0385bbd 100644
--- a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+++ b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8902370f7d0314fa7cb380bfaa93374
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1 b/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
index 46949dd21710..2fc86b4764a8 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.30 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSERGEANT/XML-XPath-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d83893a0aeee9fbb510eb4e51802ed4
diff --git a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1 b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
index d432e662b19d..d294b1368e64 100644
--- a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55971ddd4c9c50be5632cbf9d25c8144
diff --git a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1 b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
index 9f96a7432ea8..56d0e462012c 100644
--- a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 >=dev-perl/XML-DOM-1.39-r1 >=dev-perl/Parse-Yapp-1.05 dev-perl/libwww-perl >=dev-perl/Date-Manip-5.40-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-XQL-0.68.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=59c5ffbc2a43f8820b07b02795e27629
diff --git a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1 b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
index 60df8c8a9118..e2dc0fcf0dec 100644
--- a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 >=dev-perl/XML-DOM-1.25 >=dev-perl/libwww-perl-5.48 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/XML-XSLT-0.48.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1101b988bbdecac68a0d7eff03bedf12
diff --git a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1 b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
index 26a069742c9d..661064e2cc50 100644
--- a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PAJAS/XML-XUpdate-LibXML-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b2ff3ca5df6467e4d28c9ab72ab02f8
diff --git a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0 b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
index 57e7e9da0771..dfe174fdb92a 100644
--- a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
+++ b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/SOAP-Lite dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XMLRPC-Lite-0.717.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c68a04b8e2563b04cc9b470e174bf49
diff --git a/metadata/md5-cache/dev-perl/YAML-1.150.0 b/metadata/md5-cache/dev-perl/YAML-1.150.0
index fa425803fb86..f2b8e6eeef73 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.150.0
+++ b/metadata/md5-cache/dev-perl/YAML-1.150.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=767e4dee8976f7f1919cfa8b07830076
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
index 9a786b7a6c2f..21bc8f243380 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ef203d0f83dfa0a53880d1ffca2202e2
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
index 9909f04315b2..8012916b8e21 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.69.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e9fc48552d3e7e41e5950767ddba673
diff --git a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1 b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
index dce0568b5e8c..ef4556515872 100644
--- a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-Symdump dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=941ae3582336906a286a2b297becf39e
diff --git a/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1 b/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
index b70b657d4f7f..d53d4212e6c3 100644
--- a/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/constant-boolean-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Symbol-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b836ef5aa93c2c9c1a8e90b3566392d
diff --git a/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r1 b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r1
index 72cef8210465..77089cd516cf 100644
--- a/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r1
+++ b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.07b4.tar.gz http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3ad8f03165dac1bb3a06674662f6f54a
diff --git a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1 b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
index adb1d7bf1e50..fd9c5d7881b5 100644
--- a/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
+++ b/metadata/md5-cache/dev-perl/gnome2-vfs-perl-1.81.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gnome-vfs-2 >=dev-perl/glib-perl-1.120 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-VFS-1.081.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=35975f1c9aada0e1807b098e043a6eeb
diff --git a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1 b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
index d344be00f1cf..408890714d42 100644
--- a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=553962e92f05ca879cc9f3dce39120c1
diff --git a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1 b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
index 01ad2d9c82d7..af05f93f274a 100644
--- a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-perl/Gtk2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Gtk2-Ex-FormFactory-0.67.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c83191ef14e3aa38573aeb5fbef8cec2
diff --git a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1 b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
index c3f796428236..7f67a3a2b9d5 100644
--- a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c041ea813faf83e82a342d94b917b5d0
diff --git a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1 b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
index ade68cace431..9317c6fe0a68 100644
--- a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-Spell-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=482c4340976d1d38700b7b78b6b2dff4
diff --git a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1 b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
index e2e528c159b0..6724b95cf306 100644
--- a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f65f00fedef465bb844bbbfe39db6114
diff --git a/metadata/md5-cache/dev-perl/indirect-0.360.0 b/metadata/md5-cache/dev-perl/indirect-0.360.0
index c4e77699d835..039e09757306 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.360.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.360.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6dc60c32fef950f7ca5ab9c5eee53d4a
diff --git a/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r1 b/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r1
index c311ebc3ce63..c0ed064ae9c2 100644
--- a/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=media-libs/libogg media-libs/libvorbis dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FO/FOOF/libvorbis-perl-0.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90dff7d5c33557d4f8ccc9ce2f89ffed
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.150.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
index 8364caa57c82..89229e9cb4b3 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
@@ -10,5 +10,5 @@ PDEPEND=ssl? ( dev-perl/LWP-Protocol-https )
 RDEPEND=>=dev-perl/File-Listing-6.0.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=dev-perl/Net-HTTP-6.40.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-Digest-MD5-2.120.0 dev-perl/Encode-Locale >=dev-perl/HTML-Parser-3.340.0 >=virtual/perl-MIME-Base64-2.120.0 virtual/perl-libnet >=dev-perl/URI-1.100.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14cfd5391e5495be14d42623f8747b8f
diff --git a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1 b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
index 4eb8fc6010ec..40165d76858e 100644
--- a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3fac58cc875598bcc5f3e346a45c658
diff --git a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1 b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
index 899ac9b60b40..05e03e2fa56f 100644
--- a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
+++ b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/maybe-0.0202.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1245ee32fec6fd1cc8ef0d9564e081c9
diff --git a/metadata/md5-cache/dev-perl/mime-construct-1.900.0-r1 b/metadata/md5-cache/dev-perl/mime-construct-1.900.0-r1
index 7d22dae093a4..4827540ff6f2 100644
--- a/metadata/md5-cache/dev-perl/mime-construct-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/mime-construct-1.900.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-perl/MIME-Types dev-perl/Proc-WaitStat dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b3504325575c3d5aac0af6146a39cfdb
diff --git a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2 b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
index 91775ee8108a..bd7524eb0daf 100644
--- a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
+++ b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.80 >=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad0454ef55a44e4b9da6cd53b6ed154e
diff --git a/metadata/md5-cache/dev-perl/rename-1.900.0 b/metadata/md5-cache/dev-perl/rename-1.900.0
index 99974a338aea..52af14faa1f0 100644
--- a/metadata/md5-cache/dev-perl/rename-1.900.0
+++ b/metadata/md5-cache/dev-perl/rename-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEDERST/rename-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d79feb78dc8fd5265f68583d3fddb1ba
diff --git a/metadata/md5-cache/dev-perl/tkispell-0.180.0 b/metadata/md5-cache/dev-perl/tkispell-0.180.0
index b84a9c682121..225c605882ec 100644
--- a/metadata/md5-cache/dev-perl/tkispell-0.180.0
+++ b/metadata/md5-cache/dev-perl/tkispell-0.180.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/aspell dev-perl/Tk virtual/perl-Carp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RK/RKIES/tkispell-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=292f1dbfd586f47ede29f41e5b52df9b
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.520.100 b/metadata/md5-cache/dev-perl/txt2html-2.520.100
index 06b57e0f4632..3787832761d8 100644
--- a/metadata/md5-cache/dev-perl/txt2html-2.520.100
+++ b/metadata/md5-cache/dev-perl/txt2html-2.520.100
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-perl/TextToHTML virtual/perl-Getopt-Long dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUBYKAT/txt2html-2.5201.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=982cf1d3328dda8b073a66951053ac84
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.10 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
deleted file mode 100644
index d8346358d1bc..000000000000
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.10
+++ /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(-)] dev-python/coverage python_targets_python2_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=fail Python program unit tests unless they test everything
-EAPI=5
-HOMEPAGE=http://liw.fi/coverage-test-runner/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.10.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=224f5fc953ccb24c10476d0dd37cdc57
diff --git a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1 b/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
deleted file mode 100644
index 77bdafbfba7c..000000000000
--- a/metadata/md5-cache/dev-python/CoverageTestRunner-1.9-r1
+++ /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(-)] dev-python/coverage python_targets_python2_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=fail Python program unit tests unless they test everything
-EAPI=5
-HOMEPAGE=http://liw.fi/coverage-test-runner/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/coverage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-coverage-test-runner/python-coverage-test-runner_1.9.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb7c60bbd29ce1dd65095956a7242728
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 551ed04338a2..ead3d77a9c8b 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/PyRSS2Gen-1.0.0-r1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
deleted file mode 100644
index 67429c026b10..000000000000
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=RSS feed generator written in Python
-EAPI=5
-HOMEPAGE=http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/
-IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=df15635eceb42a016d15d051ff62fd0e
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0
deleted file mode 100644
index fc41bc69af3f..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/selenium[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.0.tar.gz -> aiohttp-cors-0.5.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b1bccf9e1cd8e8dcde3f313749253138
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1
deleted file mode 100644
index e4778a11d9b5..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-pylint[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/selenium[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.1.tar.gz -> aiohttp-cors-0.5.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e7a2e8ea14eda8f9424312461e2fed29
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
index c1ebd5e5e6e1..ff4528566187 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.3.tar.gz -> aiohttp-cors-0.5.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d059d16d288909ce93ff3e0738db316
+_md5_=7506dde3fecb3d1767698ffc9b16fae4
diff --git a/metadata/md5-cache/dev-python/asciitree-0.3.3 b/metadata/md5-cache/dev-python/asciitree-0.3.3
new file mode 100644
index 000000000000..48ec64d5d8ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asciitree-0.3.3
@@ -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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Fast erasure codec for the command-line, C, Python, or Haskell
+EAPI=7
+HOMEPAGE=https://pypi.org/project/asciitree/
+IUSE=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_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/a/asciitree/asciitree-0.3.3.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8f760f189753ab01bcea1d2f9ca692c6
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.5 b/metadata/md5-cache/dev-python/astroid-1.6.5
index 5bfbfabf3c71..29d6cdb03467 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.5
+++ b/metadata/md5-cache/dev-python/astroid-1.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/pylint-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pylint-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=6
 HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.6.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2a35a3e75382b2e0545d526b9eb2162a
+_md5_=6557a0a9a5d6a9120f728cfdc9ea2d34
diff --git a/metadata/md5-cache/dev-python/attrs-18.2.0 b/metadata/md5-cache/dev-python/attrs-18.2.0
index 518555e776b8..237471405547 100644
--- a/metadata/md5-cache/dev-python/attrs-18.2.0
+++ b/metadata/md5-cache/dev-python/attrs-18.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Attributes without boilerplate
 EAPI=6
 HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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
+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
 LICENSE=MIT
 RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-18.2.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6932b474ec4425f37f74e0bc776ec0fb
+_md5_=5d590d44b565cd4dcbcf164efa24e807
diff --git a/metadata/md5-cache/dev-python/awscli-1.16.91 b/metadata/md5-cache/dev-python/awscli-1.16.91
index f5eec7f09df9..36f75139b36f 100644
--- a/metadata/md5-cache/dev-python/awscli-1.16.91
+++ b/metadata/md5-cache/dev-python/awscli-1.16.91
@@ -1,16 +1,16 @@
 BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/colorama-0.3.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=7
 HOMEPAGE=https://pypi.org/project/awscli/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/colorama-0.3.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/rsa-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.16.91.tar.gz -> awscli-1.16.91.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d4a4918eea615232005e90610018e970
+_md5_=20825f27f288745c3ba88dd8c7c60e90
diff --git a/metadata/md5-cache/dev-python/awscli-1.16.95 b/metadata/md5-cache/dev-python/awscli-1.16.95
new file mode 100644
index 000000000000..4d26e4bd6fab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awscli-1.16.95
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.3.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/rsa-3.5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-3.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.3.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/rsa-3.5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3transfer-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-3.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.16.95.tar.gz -> awscli-1.16.95.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e1328514c3251aa12269e32670fa1a2e
diff --git a/metadata/md5-cache/dev-python/backports-os-0.1.1 b/metadata/md5-cache/dev-python/backports-os-0.1.1
index 14e5bf274293..c6706561fd21 100644
--- a/metadata/md5-cache/dev-python/backports-os-0.1.1
+++ b/metadata/md5-cache/dev-python/backports-os-0.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of new features in Python's os module
 EAPI=7
 HOMEPAGE=https://github.com/pjdelport/backports.os
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PYTHON
 RDEPEND=dev-python/backports[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/future[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/setuptools_scm[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/pjdelport/backports.os/archive/v0.1.1.tar.gz -> backports-os-0.1.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=43c04d7b2b5a8f89f1214e9ebe800bb0
+_md5_=04bfa4e4364bc7fa66137425ef432a37
diff --git a/metadata/md5-cache/dev-python/bandit-1.4.0 b/metadata/md5-cache/dev-python/bandit-1.4.0
index 5706e451dcea..7717703c8f7a 100644
--- a/metadata/md5-cache/dev-python/bandit-1.4.0
+++ b/metadata/md5-cache/dev-python/bandit-1.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.4.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05121f52d0a61962e0039362f9cbd047
+_md5_=27aa654d627633f3104eab60cddc58fe
diff --git a/metadata/md5-cache/dev-python/bandit-1.5.1 b/metadata/md5-cache/dev-python/bandit-1.5.1
new file mode 100644
index 000000000000..364f426a314e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bandit-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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/pbr-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(-)] test? ( >=dev-python/coverage-4.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/coverage-4.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/fixtures-3.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/hacking-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/mock-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/stestr-1.0.0 >=dev-python/testscenarios-0.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/testtools-2.2.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/oslotest-3.2.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/beautifulsoup-4.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/pylint-1.4.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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=A security linter from OpenStack Security
+EAPI=6
+HOMEPAGE=https://openstack.org
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~s390 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-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/git-python-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/pyyaml-3.12.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.10.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/stevedore-1.20.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(-)] 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/b/bandit/bandit-1.5.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef139c0ac2d6df82fa3e5f7074f2e36b
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.2 b/metadata/md5-cache/dev-python/bleach-3.0.2
index 3b7e42ab8c2b..9f0b528c7995 100644
--- a/metadata/md5-cache/dev-python/bleach-3.0.2
+++ b/metadata/md5-cache/dev-python/bleach-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
 EAPI=7
 HOMEPAGE=https://github.com/mozilla/bleach https://pypi.org/project/bleach/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/webencodings[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.0.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=14210e4a1092a0e580acc6f2bbbad66f
+_md5_=f8f1707d5d9ef335d9f064fee79bcd7b
diff --git a/metadata/md5-cache/dev-python/cachetools-3.1.0 b/metadata/md5-cache/dev-python/cachetools-3.1.0
new file mode 100644
index 000000000000..a4fc1cc4e57f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-3.1.0
@@ -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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4(-)?,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_4(-),-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_4(-)?,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_4(-),-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_4 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cachetools/cachetools-3.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=82b4780439618fa9dff6ff139580604f
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.8.0 b/metadata/md5-cache/dev-python/cairocffi-0.8.0
index a24b3fd812e2..26d1d52f934e 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=6
 HOMEPAGE=https://github.com/Kozea/cairocffi
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.8.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d83ab2460d218e96784e5522154f7a0c
+_md5_=05447c43749eb0221c5712cd0eb66d82
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.9.0 b/metadata/md5-cache/dev-python/cairocffi-0.9.0
index 9e484443ba4a..d5363dbb2746 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.9.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.9.0
@@ -1,15 +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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 )
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 )
 DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/cairocffi
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.9.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=63f79460f28b96e453728eb591b5e675
+_md5_=fe5970bd607bcd4fb61830bb34d2bc40
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20140315 b/metadata/md5-cache/dev-python/cliapp-1.20140315
deleted file mode 100644
index 4f815c3e24b3..000000000000
--- a/metadata/md5-cache/dev-python/cliapp-1.20140315
+++ /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(-)] test? ( dev-python/CoverageTestRunner ) python_targets_python2_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=Framework for Unix-like command line programs
-EAPI=5
-HOMEPAGE=http://liw.fi/cliapp/
-IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20140315.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41ca358e6e9730c83271edfda65d89c3
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20150305 b/metadata/md5-cache/dev-python/cliapp-1.20150305
deleted file mode 100644
index c9fe3685299e..000000000000
--- a/metadata/md5-cache/dev-python/cliapp-1.20150305
+++ /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(-)] test? ( dev-python/CoverageTestRunner ) python_targets_python2_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=Framework for Unix-like command line programs
-EAPI=5
-HOMEPAGE=http://liw.fi/cliapp/
-IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20150305.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4720e6eea185d051b6b4e996dd239fe9
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20160724-r1 b/metadata/md5-cache/dev-python/cliapp-1.20160724-r1
deleted file mode 100644
index b3423aace22c..000000000000
--- a/metadata/md5-cache/dev-python/cliapp-1.20160724-r1
+++ /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(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/CoverageTestRunner-1.11 dev-python/pep8 ) python_targets_python2_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=Framework for Unix-like command line programs
-EAPI=5
-HOMEPAGE=http://liw.fi/cliapp/
-IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/cliapp-1.20160724.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=00c8b7a2c1434462867d8d0fe081257e
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0 b/metadata/md5-cache/dev-python/cliff-2.12.0
index a58b69e5474e..6de4454a6cd7 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=6
 HOMEPAGE=https://github.com/dreamhost/cliff
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a09d960394dfea1020e113272e0be45e
+_md5_=a447b10e313e2380f6a17fc182bb64e0
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0-r2 b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
index 5c72db983cfe..ffed3549bb23 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0-r2
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stestr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Command Line Interface Formulation Framework
 EAPI=6
 HOMEPAGE=https://github.com/dreamhost/cliff
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=918790e86f092bf5556c9a431385f34a
+_md5_=7263913e5fe21bac61de6fe5485ca4b5
diff --git a/metadata/md5-cache/dev-python/cmd2-0.7.9 b/metadata/md5-cache/dev-python/cmd2-0.7.9
index f213d063d8cd..c4d7e1d9f33c 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.7.9
+++ b/metadata/md5-cache/dev-python/cmd2-0.7.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-2.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyperclip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pyparsing-2.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyperclip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Extra features for standard library's cmd module
 EAPI=6
 HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/pyparsing-2.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyperclip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pyparsing-2.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyperclip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.7.9.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7e5cd4ef8123b89f11e58be6186aaecd
+_md5_=de3958cdaee3a9cd1dc9b273445157e5
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.0 b/metadata/md5-cache/dev-python/colorspacious-1.1.0
index f42d6c5a4fba..7eed5e876739 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.0
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unzip test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Powerful, accurate, and easy-to-use Python library for colorspace conversions
 EAPI=6
 HOMEPAGE=https://colorspacious.readthedocs.org/en/latest/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.0.zip
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c5654164e7f7e20281a16bfff1062b80
+_md5_=a4f9c3d1ae4c741f24952bb3f7599393
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index c69cf461fa27..ab58bc8eca4e 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=6
 HOMEPAGE=https://pypi.org/project/contextlib2/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=PSF-2.4
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cea3887b9c43e847778d3475c0bf6ec7
+_md5_=3e5ee2a5cee9c7fe0848616e1bf5d410
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0 b/metadata/md5-cache/dev-python/cycler-0.10.0
index 873bea054f06..c4a1b6d45182 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0
+++ b/metadata/md5-cache/dev-python/cycler-0.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Composable style cycles
 EAPI=5
 HOMEPAGE=https://matplotlib.org/cycler/ https://pypi.org/project/Cycler/ https://github.com/matplotlib/cycler
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cycler/cycler-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c4b850f41a6cdead22e07a9169e31367
+_md5_=69574f14ebccd9de7865305e393e1518
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.8 b/metadata/md5-cache/dev-python/dbus-python-1.2.8
index 7fbb0d5d1748..0944737a6af2 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.8
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.8
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=sys-apps/dbus-1.8:= >=dev-libs/glib-2.40 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bd44b01d32b6549b701488396c36c6f6
+_md5_=9ab190e1a7d6ca4c1a7c98fb184e1bbb
diff --git a/metadata/md5-cache/dev-python/ddt-1.1.1 b/metadata/md5-cache/dev-python/ddt-1.1.1
index a8cf52f44e08..f1aee28af807 100644
--- a/metadata/md5-cache/dev-python/ddt-1.1.1
+++ b/metadata/md5-cache/dev-python/ddt-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A library to multiply test cases
 EAPI=6
 HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/txels/ddt
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/ddt/ddt-1.1.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4027a5a8dbcf1797ad9efc2d40b4cc9d
+_md5_=a391d1f026d0bc7e04f9e2770c611131
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.17.1 b/metadata/md5-cache/dev-python/debtcollector-1.17.1
index 3b83ba621ebe..4be9db05229c 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.17.1
+++ b/metadata/md5-cache/dev-python/debtcollector-1.17.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/doc8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/doc8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python deprecation patterns and strategies that collect technical debt
 EAPI=6
 HOMEPAGE=https://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.17.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9163f76361c6ad7ac56a42feec4d70b2
+_md5_=d8e021319aeb3dc74a9b00282a7cbe2d
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.19.0 b/metadata/md5-cache/dev-python/debtcollector-1.19.0
index 3221b3fb275e..1b6b8e0108ef 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.19.0
+++ b/metadata/md5-cache/dev-python/debtcollector-1.19.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/doc8-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/doc8-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python deprecation patterns and strategies that collect technical debt
 EAPI=6
 HOMEPAGE=https://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.19.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=09dfaf00b6d6f12f09d0e12d925b6fe1
+_md5_=52d493e4fbb345ebd8926fcbb65f30e9
diff --git a/metadata/md5-cache/dev-python/django-otp-0.3.4 b/metadata/md5-cache/dev-python/django-otp-0.3.4
deleted file mode 100644
index 6be86dc09e72..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-0.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=5
-HOMEPAGE=https://bitbucket.org/psagers/django-otp
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-otp/django-otp-0.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e1f1ee037f53d16b56864688150e539e
diff --git a/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3 b/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3
deleted file mode 100644
index b22ec9ebdbf6..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-yubikey-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-otp-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yubiotp-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=django-otp plugin that verifies YubiKey OTP tokens
-EAPI=5
-HOMEPAGE=https://bitbucket.org/psagers/django-otp
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-otp-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yubiotp-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-otp-yubikey/django-otp-yubikey-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=99dd8b51d9eeb9ed4306459b5329b4d1
diff --git a/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2 b/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.2
deleted file mode 100644
index 4d2b7e6bae08..000000000000
--- a/metadata/md5-cache/dev-python/django-phonenumber-field-0.7.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_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/Babel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/phonenumbers-7.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/django-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Phone number normalisation in Django with python-phonenumbers
-EAPI=5
-HOMEPAGE=https://github.com/stefanfoulis/django-phonenumber-field
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-phonenumber-field/django-phonenumber-field-0.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f517faeb4c850b55bfb13a8258802168
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
index 558fbfc7c87d..fc32b1d6f50a 100644
--- a/metadata/md5-cache/dev-python/doc8-0.6.0
+++ b/metadata/md5-cache/dev-python/doc8-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Style checker for Sphinx (or other) RST documentation
 EAPI=5
 HOMEPAGE=http://git.openstack.org/cgit/stackforge/doc8
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/restructuredtext-lint-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/stevedore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/restructuredtext-lint-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/stevedore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doc8/doc8-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6de42e4e09414d8517d0e8b033d4742f
+_md5_=489ace3ed16cd29f45b22dc7521a4d2e
diff --git a/metadata/md5-cache/dev-python/enable-4.4.1 b/metadata/md5-cache/dev-python/enable-4.4.1
deleted file mode 100644
index e8e59798b2e6..000000000000
--- a/metadata/md5-cache/dev-python/enable-4.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/freetype-2 virtual/opengl virtual/glu x11-libs/libX11 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/swig:0 dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Drawing and interaction packages
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/enable/ https://pypi.org/project/enable/ https://github.com/enthought/enable
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/freetype-2 virtual/opengl virtual/glu x11-libs/libX11 python_targets_python2_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/e/enable/enable-4.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b1623ea270c57a4991ef37c9a2820ca
diff --git a/metadata/md5-cache/dev-python/enable-4.5.1 b/metadata/md5-cache/dev-python/enable-4.5.1
deleted file mode 100644
index b48535e81363..000000000000
--- a/metadata/md5-cache/dev-python/enable-4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/freetype-2 virtual/opengl virtual/glu x11-libs/libX11 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/swig:0 dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Drawing and interaction packages
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/enable/ https://pypi.org/project/enable/ https://github.com/enthought/enable
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/freetype-2 virtual/opengl virtual/glu x11-libs/libX11 python_targets_python2_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/enthought/enable/archive/4.5.1.tar.gz -> enable-4.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=314b403c0334694aa84ed1268bb643c2
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.4 b/metadata/md5-cache/dev-python/flake8-2.5.4
index b5355c0a7351..56cdaa681335 100644
--- a/metadata/md5-cache/dev-python/flake8-2.5.4
+++ b/metadata/md5-cache/dev-python/flake8-2.5.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
 HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7c9cad3b7e59f7461c8d808b09a2cdec
+_md5_=818250aa95d85e43efa952196c866fa7
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.11 b/metadata/md5-cache/dev-python/git-python-2.1.11
index 6bce8647d847..0ec2432b5228 100644
--- a/metadata/md5-cache/dev-python/git-python-2.1.11
+++ b/metadata/md5-cache/dev-python/git-python-2.1.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/git >=dev-python/gitdb2-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/ddt-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-vcs/git >=dev-python/gitdb2-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/ddt-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Library used to interact with Git repositories
 EAPI=6
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/gitdb2-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-vcs/git >=dev-python/gitdb2-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.11.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2566360277ec6462669fa6927a0b4b3
+_md5_=9e615aaf711f9f96a57189a3c61ba0df
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
index 0db730551cd2..a24747926511 100644
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.3
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=GitDB is a pure-Python git object database
 EAPI=6
 HOMEPAGE=https://github.com/gitpython-developers/gitdb https://pypi.org/project/gitdb2/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba069632b1362343b951eaf832bea413
+_md5_=63cc000615050eead2aba48986e1a996
diff --git a/metadata/md5-cache/dev-python/h5py-2.9.0 b/metadata/md5-cache/dev-python/h5py-2.9.0
new file mode 100644
index 000000000000..fd7990657e41
--- /dev/null
+++ b/metadata/md5-cache/dev-python/h5py-2.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pkgconfig[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/alabaster[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mpi? ( dev-python/mpi4py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Simple Python interface to HDF5 files
+EAPI=6
+HOMEPAGE=http://www.h5py.org/
+IUSE=doc test examples mpi python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/h/h5py/h5py-2.9.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8455964c870d14ec38ebeb0bd0eb652a
diff --git a/metadata/md5-cache/dev-python/hacking-0.13.0 b/metadata/md5-cache/dev-python/hacking-0.13.0
deleted file mode 100644
index 24050c54ce08..000000000000
--- a/metadata/md5-cache/dev-python/hacking-0.13.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack-dev/hacking
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hacking/hacking-0.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bab04fd40917542e9971fda9cc073703
diff --git a/metadata/md5-cache/dev-python/hacking-1.1.0 b/metadata/md5-cache/dev-python/hacking-1.1.0
new file mode 100644
index 000000000000..827f0a5331fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hacking-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flake8-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/flake8-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A client for the OpenStack Nova API
+EAPI=7
+HOMEPAGE=https://github.com/openstack-dev/hacking
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/flake8-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/flake8-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hacking/hacking-1.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=815b704997f3ed96ba008f7a3ff57cf9
diff --git a/metadata/md5-cache/dev-python/hpack-2.3.0-r1 b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
index bb41fc12bc52..a9aabd820755 100644
--- a/metadata/md5-cache/dev-python/hpack-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Pure-Python HPACK header compression
 EAPI=6
 HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hpack/hpack-2.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c15ebfb1f4a699f97f8d1b67f30906e
+_md5_=09dfa9507eff84240997737c42d98278
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index dbb8e23360d1..c038152f355f 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pure-Python HPACK header compression
 EAPI=6
 HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae5779411175a27c66c8e834ce87ddc3
+_md5_=a208db13faa712cef9420a7cf2fb7f34
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.2 b/metadata/md5-cache/dev-python/httmock-1.2.2
deleted file mode 100644
index a7e6fb9ec719..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.2.2
+++ /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_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A mocking library for requests
-EAPI=5
-HOMEPAGE=https://github.com/patrys/httmock
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.2.2.tar.gz -> httmock-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a51ac802975453ef602f94f2efd355b6
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.3 b/metadata/md5-cache/dev-python/httmock-1.2.3
deleted file mode 100644
index a46ccabdd52b..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.2.3
+++ /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_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A mocking library for requests
-EAPI=5
-HOMEPAGE=https://github.com/patrys/httmock
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.2.3.tar.gz -> httmock-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2416e00b9ff1f9e82b35d2c1b3689860
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.4 b/metadata/md5-cache/dev-python/httmock-1.2.4
deleted file mode 100644
index b79ca67620d1..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.2.4
+++ /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_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A mocking library for requests
-EAPI=6
-HOMEPAGE=https://github.com/patrys/httmock
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.2.4.tar.gz -> httmock-1.2.4.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8e06af81a88960eef1fbf7be02a9d58
diff --git a/metadata/md5-cache/dev-python/httplib2-0.11.3 b/metadata/md5-cache/dev-python/httplib2-0.11.3
index 260db6392856..91aa4ea766bc 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.11.3
+++ b/metadata/md5-cache/dev-python/httplib2-0.11.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A comprehensive HTTP client library
 EAPI=6
 HOMEPAGE=https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.11.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=772e29c52a849426f18be971a3398f02
+_md5_=4cb005c0fcc382d52228e313afa8fcbc
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.1.1 b/metadata/md5-cache/dev-python/hyperlink-17.1.1
index 29f83fb534ae..5e69e522d023 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.1.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A featureful, correct URL for Python
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.1.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1000bf296ea932e03080999d59743ed
+_md5_=7e91b1ec9ec63d684339804acd704aad
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.3.1 b/metadata/md5-cache/dev-python/hyperlink-17.3.1
index c6d137391541..62c39d7a0ba6 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.3.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A featureful, correct URL for Python
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.3.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6099a8f0f42593f1106240f55af8a3f
+_md5_=2679c9cfb1a0efa47c71e4e11a0bbed3
diff --git a/metadata/md5-cache/dev-python/hyperlink-18.0.0 b/metadata/md5-cache/dev-python/hyperlink-18.0.0
index a8ce42811c23..6e6939cad91f 100644
--- a/metadata/md5-cache/dev-python/hyperlink-18.0.0
+++ b/metadata/md5-cache/dev-python/hyperlink-18.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A featureful, correct URL for Python
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-18.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=555d14f7ff67d85b64f69a75830cfd67
+_md5_=58fe15529723d92839b87411bf6cfd92
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2 b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
index 302b0dc99fd1..907fe7672990 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=IPython Kernel for Jupyter
 EAPI=6
 HOMEPAGE=https://github.com/ipython/ipykernel
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 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/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.6.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=73df9223e0e5d6bbce4d47287be36d78
+_md5_=9a2fe58e73336f285863649ae0a26844
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.1.0 b/metadata/md5-cache/dev-python/ipykernel-5.1.0
index 4efce6a44553..e319fcad3638 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.1.0
+++ b/metadata/md5-cache/dev-python/ipykernel-5.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ipython-4.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose_warnings_filters[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ipython-4.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=IPython Kernel for Jupyter
 EAPI=6
 HOMEPAGE=https://github.com/ipython/ipykernel
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_4 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/ipython-4.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/ipython-4.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8a5fce5db7f66be76ddc774acef92bbf
+_md5_=bcd191e7a53ae1ea67c30bdc0da405e1
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
index d6ab0573613b..ea4eacdb7d5b 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/ipython-4.0.0[smp,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<dev-python/ipython-4.0.0[smp,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Interactive Parallel Computing with IPython
 EAPI=6
 HOMEPAGE=https://ipyparallel.readthedocs.io/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 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/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/ipython-4.0.0[smp,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<dev-python/ipython-4.0.0[smp,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( <dev-python/ipython-6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.0.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fbf8bf14cfebc4e0e5b79415b34cee3c
+_md5_=cefb6e6f802197ff3118a6bcf5237303
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r2 b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
index 46d0a6875bb6..ac4137147d9b 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1-r2
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Advanced interactive shell for Python
 EAPI=6
 HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=587df3cb37dc1cdb68d9cc957c102053
+_md5_=d0f920098e70ac4868802d08ab679584
diff --git a/metadata/md5-cache/dev-python/ipython-6.1.0-r2 b/metadata/md5-cache/dev-python/ipython-6.1.0-r2
index 94584c73379f..79c878b81214 100644
--- a/metadata/md5-cache/dev-python/ipython-6.1.0-r2
+++ b/metadata/md5-cache/dev-python/ipython-6.1.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/ipykernel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Advanced interactive shell for Python
 EAPI=6
 HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib notebook nbconvert qt5 smp test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples matplotlib notebook nbconvert qt5 smp test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipywidgets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipywidgets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) smp? ( dev-python/ipyparallel[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+RDEPEND=dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jedi-0.10.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pickleshare[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplegeneric[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-6.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=70015a52dd3e7d036c4de982b2fe4043
+_md5_=2388029fa09ab85f7f9098234446c404
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index db1500b3a6a7..c087992db9e1 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Vestigial utilities from IPython
 EAPI=6
 HOMEPAGE=https://github.com/ipython/ipython_genutils
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c3bb7226a1025c63c83c1dfd8553a69d
+_md5_=4ea658f0318660adf3df0fce21cdf8e4
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.0.0 b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
index 6c08f2ecf1aa..d4376bf5bba5 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.0.0
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=IPython HTML widgets for Jupyter
 EAPI=6
 HOMEPAGE=https://ipywidgets.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=720818941dfb969844ccccee653cac61
+_md5_=d1dfc22f4d7096447616f00cdff392b9
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.4.2 b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
index e977dfb42ba9..cfb2b58803e3 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.4.2
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=IPython HTML widgets for Jupyter
 EAPI=6
 HOMEPAGE=https://ipywidgets.readthedocs.io/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86c75b683f3cdf2b4075748a4e3762a7
+_md5_=982d8dd97eea2f85fcb571d215096e29
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1 b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
index 9c64ba5af8cd..0320300b6d5d 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43e7e1515d4e422c4eb5d5d8a952c5a8
+_md5_=46a632cd5050ccb2a48123e775201ed7
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.3 b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
index 68239b810331..66f76b22a1c4 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7aaf18ac8cb503f6d62d1edd7795b045
+_md5_=17cb4b0391b17872ea518efbb61f42d6
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.4.0 b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
index b315cea6bf8e..c1658cd92b25 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.4.0
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!<dev-python/jupyter-1.0.0-r1 doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-github-alt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/ipython-4.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !!<dev-python/jupyter-1.0.0-r1 doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-github-alt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/ipython-4.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Core common functionality of Jupyter projects
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.4.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc462c2d2eb19c71f4d7f0d418dcba34
+_md5_=f42874b5bc650d0c512f1da1a02025da
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.10.0 b/metadata/md5-cache/dev-python/keystoneauth-3.10.0
index 484a5c0eeae0..4480e9ed466a 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.10.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud.
 EAPI=6
 HOMEPAGE=https://github.com/openstack/keystoneauth
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-service-types-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.10.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1f374caef5ee9ba1beb67926592842e7
+_md5_=bb0ddc7c2ee67f97c3a155268e551a3e
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.0.1 b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
index c5e547301414..bfab0155bfc4 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.0.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving algorithm
 EAPI=6
 HOMEPAGE=https://github.com/nucleic/kiwi
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=Clear-BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.0.1.tar.gz -> kiwisolver-1.0.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db8ef815453d63750526abcfbbab9971
+_md5_=cd83431a135b966b6639ae9012cc8f95
diff --git a/metadata/md5-cache/dev-python/larch-1.20130808 b/metadata/md5-cache/dev-python/larch-1.20130808
deleted file mode 100644
index 8d6f7ef89e5e..000000000000
--- a/metadata/md5-cache/dev-python/larch-1.20130808
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/CoverageTestRunner dev-util/cmdtest ) python_targets_python2_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=Copy-on-write B-tree data structure
-EAPI=5
-HOMEPAGE=http://liw.fi/larch/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp dev-python/tracing dev-python/ttystatus python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20130808.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=342cae3d0c53c0c7ab648bd65d40b888
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
index 158b6ba5cdce..59ff2aa1e8f5 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A fast and thorough lazy object proxy
 EAPI=6
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.org/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=55b8e8beccfa26042ddd837ce01cb2c1
+_md5_=e0beaa1ff8aaa76b1b20b2fa40bcdd1c
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.10.0 b/metadata/md5-cache/dev-python/libvirt-python-4.10.0
index 78a1768db34b..865e0e14fa5d 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.10.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.10.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-4.10.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a1360919a5d393992b65a9074174feb2
+_md5_=afb0ff008f7d6939eeaca565c2d8c15b
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.0.0 b/metadata/md5-cache/dev-python/libvirt-python-5.0.0
new file mode 100644
index 000000000000..18c8e74a8a0c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/libvirt:0/5.0.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=libvirt Python bindings
+EAPI=7
+HOMEPAGE=https://www.libvirt.org
+IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/5.0.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.0.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=afb0ff008f7d6939eeaca565c2d8c15b
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index ae51d9a73dac..ef4b3ae74d94 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Pure python plotting library with matlab like syntax
 EAPI=6
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=584351931e8439909d07fd9ad51a417e
+_md5_=2c4631fd6ce2386b8a461cf10534b8a4
diff --git a/metadata/md5-cache/dev-python/matplotlib-9999 b/metadata/md5-cache/dev-python/matplotlib-9999
index baf1c269a622..36b36373b30b 100644
--- a/metadata/md5-cache/dev-python/matplotlib-9999
+++ b/metadata/md5-cache/dev-python/matplotlib-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.3.4 dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.3.4 dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5cbe15e059b0194826d7a3ad8d9a2ebc
+_md5_=686378995535a7af831934d012021ef0
diff --git a/metadata/md5-cache/dev-python/maybe-0.3.0 b/metadata/md5-cache/dev-python/maybe-0.3.0
deleted file mode 100644
index 87f1b1c754ee..000000000000
--- a/metadata/md5-cache/dev-python/maybe-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/blessings[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-ptrace[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=See what a program does before deciding whether you really want it to happen
-EAPI=6
-HOMEPAGE=https://github.com/p-e-w/maybe https://pypi.org/project/maybe/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/blessings[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-ptrace[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/m/maybe/maybe-0.3.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bae27400c7d1b0c70c6bdd072e00fc4a
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index f70f3bdef73e..93dd932b7ad0 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.2.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A plugin for flake8
 EAPI=5
 HOMEPAGE=https://github.com/flintwork/mccabe
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ab716d2519f1c1c33e86b7a17fe081aa
+_md5_=630e378a91a9d589c2a59e1a5128dce0
diff --git a/metadata/md5-cache/dev-python/mox3-0.10.0 b/metadata/md5-cache/dev-python/mox3-0.10.0
deleted file mode 100644
index 3ebd7c1f4448..000000000000
--- a/metadata/md5-cache/dev-python/mox3-0.10.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flake8-2.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/flake8-2.4.1-r9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Mock object framework for Python
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mox3/mox3-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4e9d67e0573ca60f154f96c19c6084d3
diff --git a/metadata/md5-cache/dev-python/mox3-0.12.0 b/metadata/md5-cache/dev-python/mox3-0.12.0
deleted file mode 100644
index a3f4af38384f..000000000000
--- a/metadata/md5-cache/dev-python/mox3-0.12.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Mock object framework for Python
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mox3/mox3-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=61e1028e5a3b9bf2332c3d1056e7002e
diff --git a/metadata/md5-cache/dev-python/mox3-0.24.0 b/metadata/md5-cache/dev-python/mox3-0.24.0
index 738ea269fd68..3f24042a9bee 100644
--- a/metadata/md5-cache/dev-python/mox3-0.24.0
+++ b/metadata/md5-cache/dev-python/mox3-0.24.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Mock object framework for Python
 EAPI=5
 HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.24.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2014d4d4a0f8418834cf31d6f3ca1ccf
+_md5_=a803ac37d43e11f7126c0f4e84965785
diff --git a/metadata/md5-cache/dev-python/mpmath-1.0.0 b/metadata/md5-cache/dev-python/mpmath-1.0.0
index 58cee5bcadc7..b5816133856e 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.0.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=5
 HOMEPAGE=http://mpmath.org/
-IUSE=gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://mpmath.org/files/mpmath-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da223580b93bdef5beb65be0c37fa670
+_md5_=96e4ce665eb4f9cc7530ab7a14e20837
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
index a152fa48363f..1e6d515d54d4 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=6
 HOMEPAGE=http://mpmath.org/
-IUSE=gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a0e1a469a91dc2d41c15ed8e1b9ab63
+_md5_=275f6ce39834befca7b6541c3d5d5ec0
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.1 b/metadata/md5-cache/dev-python/msgpack-0.5.1
index 336ce06a1a92..56fb1c847a10 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=MessagePack (de)serializer for Python
 EAPI=6
 HOMEPAGE=https://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.org/project/msgpack-python/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.5.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=901388853d6ed2a4846d111c02233a7b
+_md5_=12d1153beef255284f31ac1b882e5478
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
index 4a1bcb49c5a0..ba2ea772b2e2 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.6
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] native-extensions? ( python_targets_python2_7? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) test? ( dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] native-extensions? ( python_targets_python2_7? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) test? ( dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+native-extensions test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 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	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0e17978deec18dd00f06363a226f5154
+_md5_=24c03b7a4d12e18b6d12175f3e5cc2d2
diff --git a/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0 b/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
index b164a1528cb5..f7cc9550651a 100644
--- a/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
+++ b/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for sphinxcontrib
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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 ~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=public-domain
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ef8bd470cae429538d761abc508a9845
+_md5_=afdd4a9351c058ccee7483e8fd092ce5
diff --git a/metadata/md5-cache/dev-python/nbconvert-5.2.1 b/metadata/md5-cache/dev-python/nbconvert-5.2.1
index 831dade15cc6..62e123352dd8 100644
--- a/metadata/md5-cache/dev-python/nbconvert-5.2.1
+++ b/metadata/md5-cache/dev-python/nbconvert-5.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_client-4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=6
 HOMEPAGE=https://nbconvert.readthedocs.io/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 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/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/entrypoints-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandocfilters-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-5.2.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6a3daa8b15848ca2cf7719e4ab021060
+_md5_=2cb219f26254d2225b40c264050bc181
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0 b/metadata/md5-cache/dev-python/nbformat-4.4.0
index 2cbb73956777..6fea46081e48 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Reference implementation of the Jupyter Notebook format
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbformat/nbformat-4.4.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=75e0f53f6a57b3a641ce324093b7a7ed
+_md5_=c54ed925cc45c8cc9955196bab0f5c37
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.2.14 b/metadata/md5-cache/dev-python/nbsphinx-0.2.14
index 7530bf92beeb..457ae69d4c86 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.2.14
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.2.14
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter Notebook Tools for Sphinx
 EAPI=6
 HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.2.14.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=905e9335911a14e1c5196310f17b0deb
+_md5_=44e82ea38509cd7b59372c8718c08575
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.4.1 b/metadata/md5-cache/dev-python/nbsphinx-0.4.1
index 97ef893731ea..781c97ee9e0e 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.4.1
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter Notebook Tools for Sphinx
 EAPI=6
 HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/docutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.4.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d9773961a9097c733c8500f08ea3405
+_md5_=a89c2ebc4e9b425eeec9e0d936d8ebaf
diff --git a/metadata/md5-cache/dev-python/nbval-0.7 b/metadata/md5-cache/dev-python/nbval-0.7
index cca410990f05..4bc15fe68ce3 100644
--- a/metadata/md5-cache/dev-python/nbval-0.7
+++ b/metadata/md5-cache/dev-python/nbval-0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A py.test plugin to validate Jupyter notebooks
 EAPI=6
 HOMEPAGE=https://github.com/computationalmodelling/nbval
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.7.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b2ee0504b55eb09ace6aa901b8c01c87
+_md5_=3cb32e26c5ba077b3192297718a990e6
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.19 b/metadata/md5-cache/dev-python/netaddr-0.7.19
index 9cd2e2ee8e85..e3b51e1414b5 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.19
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.19
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Network address representation and manipulation library
 EAPI=6
 HOMEPAGE=https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org
-IUSE=cli test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=cli test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.19.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b89ebe5d688f7d03f5e8ebc003087c9e
+_md5_=258efa417fbad31d1298836d4a4d1caa
diff --git a/metadata/md5-cache/dev-python/netlib-0.10 b/metadata/md5-cache/dev-python/netlib-0.10
deleted file mode 100644
index daf3ea3392af..000000000000
--- a/metadata/md5-cache/dev-python/netlib-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/pathod[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=Collection of network utility classes used by pathod and mitmproxy
-EAPI=5
-HOMEPAGE=https://github.com/cortesi/netlib/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.12[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/n/netlib/netlib-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=88b99296a81741448ba3cf922efd89f5
diff --git a/metadata/md5-cache/dev-python/netlib-0.10.1 b/metadata/md5-cache/dev-python/netlib-0.10.1
deleted file mode 100644
index 944ed705c743..000000000000
--- a/metadata/md5-cache/dev-python/netlib-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/pathod[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=Collection of network utility classes used by pathod and mitmproxy
-EAPI=5
-HOMEPAGE=https://github.com/cortesi/netlib/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.12[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/n/netlib/netlib-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bbec944f44e012c1f40ff41575a8f782
diff --git a/metadata/md5-cache/dev-python/netlib-0.11.1 b/metadata/md5-cache/dev-python/netlib-0.11.1
deleted file mode 100644
index 2fca58bae960..000000000000
--- a/metadata/md5-cache/dev-python/netlib-0.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/pathod[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=Collection of network utility classes used by pathod and mitmproxy
-EAPI=5
-HOMEPAGE=https://github.com/cortesi/netlib/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.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=mirror://pypi/n/netlib/netlib-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d04b38bc3910428bde5e7654ba09d6dd
diff --git a/metadata/md5-cache/dev-python/netlib-0.11.2 b/metadata/md5-cache/dev-python/netlib-0.11.2
deleted file mode 100644
index 1a778bc874d5..000000000000
--- a/metadata/md5-cache/dev-python/netlib-0.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =www-servers/pathod-0.11*[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=Collection of network utility classes used by pathod and mitmproxy
-EAPI=5
-HOMEPAGE=https://github.com/cortesi/netlib/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.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=mirror://pypi/n/netlib/netlib-0.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc6f0b5c9762baae3809b16c515c0483
diff --git a/metadata/md5-cache/dev-python/netlib-0.12.0 b/metadata/md5-cache/dev-python/netlib-0.12.0
deleted file mode 100644
index 19574ccefd5b..000000000000
--- a/metadata/md5-cache/dev-python/netlib-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =www-servers/pathod-0.12*[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=Collection of network utility classes used by pathod and mitmproxy
-EAPI=5
-HOMEPAGE=https://github.com/cortesi/netlib/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/passlib-1.6.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=mirror://pypi/n/netlib/netlib-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc6f0b5c9762baae3809b16c515c0483
diff --git a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0 b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
index 90dc78d7b704..d9e058c94300 100644
--- a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
+++ b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Parameterized testing with any Python test framework
 EAPI=6
 HOMEPAGE=https://github.com/kgrandis/nose-exclude
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-parameterized/nose-parameterized-0.5.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c28b9b58eafe2d867039de5fe03054e4
+_md5_=0334933d4420855cac2b087fe9eccd83
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
index 49d7f2de63b7..fdbd65768d2c 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A python module to inject warning filters during nosetest
 EAPI=6
 HOMEPAGE=https://github.com/Carreau/nose_warnings_filters
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=MIT
-RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=06a15b3ff730b32e287fe779d0b21388
+_md5_=9010f8687084a3ad94439fecc992e75d
diff --git a/metadata/md5-cache/dev-python/notebook-5.0.0 b/metadata/md5-cache/dev-python/notebook-5.0.0
index 9ec43ae89c09..9a9a2c1295f0 100644
--- a/metadata/md5-cache/dev-python/notebook-5.0.0
+++ b/metadata/md5-cache/dev-python/notebook-5.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter Interactive Notebook
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d4115bda1c0ffec4a7fd9feefa9d276
+_md5_=f62819fd3445efe5a810224c0e7b2a98
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.0 b/metadata/md5-cache/dev-python/notebook-5.7.0
index a6653d86f3dc..4b0613956215 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.0
+++ b/metadata/md5-cache/dev-python/notebook-5.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( python_targets_python3_4? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python3_4? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/nbval[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/pytest[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Jupyter Interactive Notebook
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7516b6ed6628a6035b364e7b393c51ca
+_md5_=0272fdf085af03afaa4b31c6388fa66a
diff --git a/metadata/md5-cache/dev-python/numpy-1.14.5 b/metadata/md5-cache/dev-python/numpy-1.14.5
index d9c8c41d8e40..b45d6175ed89 100644
--- a/metadata/md5-cache/dev-python/numpy-1.14.5
+++ b/metadata/md5-cache/dev-python/numpy-1.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=6
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 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 ~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=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.14.5.zip doc? ( http://docs.scipy.org/doc/numpy-1.14.5/numpy-html-1.14.5.zip http://docs.scipy.org/doc/numpy-1.14.5/numpy-ref-1.14.5.pdf http://docs.scipy.org/doc/numpy-1.14.5/numpy-user-1.14.5.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5787b8ee6f296123922805142199d58
+_md5_=fe9d3041dd5fdf9ebf85e30af0f966ef
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.7.0 b/metadata/md5-cache/dev-python/numpydoc-0.7.0
index b169c0d56e93..135269b1335a 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.7.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/matplotlib-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/matplotlib-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=6
 HOMEPAGE=https://pypi.org/project/numpydoc/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.7.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=acbaa176b0c66dc2925b11b5d8327ad1
+_md5_=660ff696df02a3316ee59a87a3815a9e
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
index 956f11527509..b4cfdbbbc2c5 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Theme and extension support for Sphinx documentation
 EAPI=6
 HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.18.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=510a6187f951ae2cd9e0c224fe802ca9
+_md5_=c617db2ddc15ccb4a9695cec4dbda1a3
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.29.0 b/metadata/md5-cache/dev-python/os-client-config-1.29.0
index eb7a206772c5..0c8d2595f544 100644
--- a/metadata/md5-cache/dev-python/os-client-config-1.29.0
+++ b/metadata/md5-cache/dev-python/os-client-config-1.29.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=OpenStack Client Configuation Library
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requestsexceptions-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requestsexceptions-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.29.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9d9325fc30f9b58a0ad1d74095e0a118
+_md5_=26ff3f25d51c65f0f7acc844ce576a07
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.3.0 b/metadata/md5-cache/dev-python/os-service-types-1.3.0
index 1373f58bcd89..2d96c86fdcd9 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.3.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A library to handle official service types for OpenStack and it's aliases.
 EAPI=6
 HOMEPAGE=https://github.com/openstack/os-service-types
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2ef9e21a8a93c72be6b1736e98bf0d2
+_md5_=7ec9ca3bcf205c7112efe8c5a12b49ec
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.4.1 b/metadata/md5-cache/dev-python/oslo-config-6.4.1
index 836088672884..d269e886221b 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.4.1
+++ b/metadata/md5-cache/dev-python/oslo-config-6.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-mock-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Oslo Configuration API
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.4.1.tar.gz -> oslo-config-6.4.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=101458eb94664cafa7fa3aab7e9ac8e2
+_md5_=cb16a23a929938f53c26c95312518f02
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.21.0 b/metadata/md5-cache/dev-python/oslo-context-2.21.0
index b60976cade11..b5f45ba829e9 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.21.0
+++ b/metadata/md5-cache/dev-python/oslo-context-2.21.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Helpers to maintain useful information about a request context
 EAPI=6
 HOMEPAGE=https://pypi.org/project/oslo.context/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.21.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4904327bba745488df0156f4c4721d5c
+_md5_=da3683118e693e0680411c3a0aa070dd
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0 b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
index 991dbc1c8488..1b4e57bb3430 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Oslo i18n library
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.19.0.tar.gz -> oslo-i18n-3.19.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae7611a271e8c0923a0262f1924cc823
+_md5_=ae8a9dccb0937111cfa811b14e923c26
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.39.2 b/metadata/md5-cache/dev-python/oslo-log-3.39.2
index a856b916f6eb..64d8b7466d7f 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.39.2
+++ b/metadata/md5-cache/dev-python/oslo-log-3.39.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=OpenStack logging config library, configuration for all openstack projects.
 EAPI=6
 HOMEPAGE=https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.39.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=019c7766734bce191dbc75239b8f1be2
+_md5_=da11bcd005f5697d5d3266b29c5a5238
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1 b/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
index 246b1f04acf0..b1067b347dd4 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-serialization-2.24.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Oslo Serialization library
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-2.24.0.tar.gz -> oslo-serialization-2.24.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e498585eba9c826d628bb36a29da2a89
+_md5_=91544ea0103e0ee22f4ca22fd8366f77
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0 b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
index ae03c3811f19..c60a504b8ba5 100644
--- a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
+++ b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=OpenStack Sphinx Extensions and Theme
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-4.18.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ec15f0245736460d8b852551fda4377
+_md5_=8f09860c303ee9bf60492c9a97706f39
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.36.4 b/metadata/md5-cache/dev-python/oslo-utils-3.36.4
index f42bfcd2efdd..9c8fb96af134 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-3.36.4
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.36.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ddt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stestr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ddt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Oslo Utility library
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.36.4.tar.gz -> oslo-utils-3.36.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=777e4abd6451c4fe6e5eaf3c94fc48bf
+_md5_=21c222046a452a3d655c62e69bfbe951
diff --git a/metadata/md5-cache/dev-python/oslotest-3.2.0 b/metadata/md5-cache/dev-python/oslotest-3.2.0
index 5f6760019907..9d4c74bf46f6 100644
--- a/metadata/md5-cache/dev-python/oslotest-3.2.0
+++ b/metadata/md5-cache/dev-python/oslotest-3.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Oslo test framework
 EAPI=5
 HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mox3-0.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mox3-0.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-3.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=35fc66577d6bfc5aa856ebecacb5f383
+_md5_=15966c60cf18b2188e3c86cef2f16257
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1 b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
index 27f84656c8ce..2f329d245be1 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Utilities for writing pandoc filters in python
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandocfilters
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=abcf1103896adfc9c2b7d73338f9aefe
+_md5_=e224745ce565db757dc7a1c9a890f65f
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.2 b/metadata/md5-cache/dev-python/paramiko-2.4.2
index 058bdd64ff3c..cf624b88187c 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.2
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-relaxed[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-relaxed[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SSH2 protocol library
 EAPI=7
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
-IUSE=doc examples server test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples server test python_targets_python2_7 python_targets_python3_4 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.4.2.tar.gz -> paramiko-2.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f5f13a8f5c7c907f361ad36735b0acc7
+_md5_=6f4ae79c172d46b17a70ff1a3bcba7e3
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.0 b/metadata/md5-cache/dev-python/pep8-1.7.0
index f39bbbbbac2e..f1b3a38cbe99 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.0
+++ b/metadata/md5-cache/dev-python/pep8-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python style guide checker
 EAPI=5
 HOMEPAGE=https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cdee4b21763ebf08e423d728b79c806e
+_md5_=14daf27248b59732e8d38bf9e6e8c332
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1 b/metadata/md5-cache/dev-python/pep8-1.7.1
index 17f84940c8c3..98f146c63a78 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.1
+++ b/metadata/md5-cache/dev-python/pep8-1.7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python style guide checker
 EAPI=6
 HOMEPAGE=https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c953f129526b5291d7f890a8b5c681f
+_md5_=6c3ab11ae644d0a47a4ef5ca9a842285
diff --git a/metadata/md5-cache/dev-python/pexpect-4.2.1 b/metadata/md5-cache/dev-python/pexpect-4.2.1
index aa0e15ab2614..0bd4d6cd741c 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.2.1
+++ b/metadata/md5-cache/dev-python/pexpect-4.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python module for spawning child applications and responding to expected patterns
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python module for spawning child apps and responding to expected patterns
 EAPI=6
 HOMEPAGE=https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/
-IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=>=dev-python/ptyprocess-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/ptyprocess-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.2.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49aae5784f67f863d505912a2f733ff0
+_md5_=25f3ee6521283dd4b854c15bda65938f
diff --git a/metadata/md5-cache/dev-python/pexpect-4.6.0 b/metadata/md5-cache/dev-python/pexpect-4.6.0
new file mode 100644
index 000000000000..a002673e41b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pexpect-4.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python module for spawning child apps and responding to expected patterns
+EAPI=6
+HOMEPAGE=https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/ptyprocess-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pexpect/pexpect-4.6.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1b78c6d883333c8767b2ef80f280122c
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1 b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
index 53a1b416e953..c81331700459 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A small 'shelve' like datastore with concurrency support
 EAPI=6
 HOMEPAGE=https://github.com/pickleshare/pickleshare
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f986df23f1e9b6f41cf9c443167fab29
+_md5_=3814506bed1edcf942ffff8cffc26ce0
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.2.1 b/metadata/md5-cache/dev-python/pkginfo-1.2.1
index 6a2bda905c1a..33e28f3fc06f 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.2.1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pkginfo/
-IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8a43c3506e618418af179f3f304ed543
+_md5_=5bf9acef4acb22724be62a0aaaedd6c2
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.4.2 b/metadata/md5-cache/dev-python/pkginfo-1.4.2
index 93402b03fc26..07367dedc67d 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.4.2
+++ b/metadata/md5-cache/dev-python/pkginfo-1.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pkginfo/
-IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9473ada2e372bfa17dcde83f4e8f80b8
+_md5_=628a87227ea86d6aaaf0d6ad1081e234
diff --git a/metadata/md5-cache/dev-python/pluggy-0.7.1 b/metadata/md5-cache/dev-python/pluggy-0.7.1
index 8dcab9855001..c846cfe838cf 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.7.1
+++ b/metadata/md5-cache/dev-python/pluggy-0.7.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.7.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=822a2ba46b6b788cc41c052f16f3bde2
+_md5_=a1d7f65577efd9f6dfedef5c3c216026
diff --git a/metadata/md5-cache/dev-python/pluggy-0.8.1 b/metadata/md5-cache/dev-python/pluggy-0.8.1
new file mode 100644
index 000000000000..94e7cf8fb684
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pluggy-0.8.1
@@ -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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=plugin and hook calling mechanisms for python
+EAPI=7
+HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pluggy/pluggy-0.8.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a1d7f65577efd9f6dfedef5c3c216026
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index dbb9b4639714..f62c062742fe 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=6
 HOMEPAGE=https://python-hyper.org/priority/en/latest/ https://github.com/python-hyper/priority https://pypi.org/project/priority/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=051f93916b6719152adf7dd73fcef1c4
+_md5_=a45c05e2e9a0fdb69bec4aa0f5b67b3e
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.4.2 b/metadata/md5-cache/dev-python/prometheus_client-0.4.2
index 498b6c87f1d9..2b27d7c2886e 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.4.2
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prometheus_client/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.4.2.tar.gz -> prometheus_client-0.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7d5b3d506770f28ef10db3402276926e
+_md5_=a1e7392562b567634041b2ef9956278b
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.5.0 b/metadata/md5-cache/dev-python/prometheus_client-0.5.0
index 7d78614f053c..342875dc08c7 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.5.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prometheus_client/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.5.0.tar.gz -> prometheus_client-0.5.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae8b256b591f713937f2422ddc162086
+_md5_=7230f753de71946d495d8dab62c1cf6a
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index 71b50d46bdd5..788392be2bfa 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5ee6b382f7106c8289e09c435e859bf
+_md5_=01d56c7191d3da657c058648fbb42fa7
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.7 b/metadata/md5-cache/dev-python/psutil-5.4.7
index 34b7e328fab2..8b2d0ac058ed 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.7
+++ b/metadata/md5-cache/dev-python/psutil-5.4.7
@@ -5,7 +5,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.4.7.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9db1cb66e1edef7cde744aee3d6f082c
+_md5_=eeea1fe3bc759083f2bc07807aac074b
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.8 b/metadata/md5-cache/dev-python/psutil-5.4.8
index eb0a18ae587f..095c95a75766 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.8
+++ b/metadata/md5-cache/dev-python/psutil-5.4.8
@@ -5,7 +5,7 @@ DESCRIPTION=Retrieve information on running processes and system utilization
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.4.8.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=340a43453e3900c4fbe55582f746408d
+_md5_=17b27b88c63d057ff537fdb9308feb2c
diff --git a/metadata/md5-cache/dev-python/psutil-5.5.0 b/metadata/md5-cache/dev-python/psutil-5.5.0
new file mode 100644
index 000000000000..ce3471c95d2b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.5.0
@@ -0,0 +1,16 @@
+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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=7
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-5.5.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=17b27b88c63d057ff537fdb9308feb2c
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.2 b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
index a0a408f5d152..32d609814ab8 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.2
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Run a subprocess in a pseudo terminal
 EAPI=6
 HOMEPAGE=https://github.com/pexpect/ptyprocess
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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-linux ~x86-linux
 LICENSE=ISC
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.5.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8ccaa99aefee46d894329f3b724ea049
+_md5_=4d5d403d4b32de9cbf14bb075b3ccc22
diff --git a/metadata/md5-cache/dev-python/py-1.5.4 b/metadata/md5-cache/dev-python/py-1.5.4
index 661e3de27da6..c785c81184fc 100644
--- a/metadata/md5-cache/dev-python/py-1.5.4
+++ b/metadata/md5-cache/dev-python/py-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilitie
 EAPI=6
 HOMEPAGE=https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf9301b28f438b35b9e4d91c459674d0
+_md5_=8b763644b0c613d5761b246dc4b1ed20
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.3.17 b/metadata/md5-cache/dev-python/pyClamd-0.3.17
deleted file mode 100644
index 0ce1c94c7326..000000000000
--- a/metadata/md5-cache/dev-python/pyClamd-0.3.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=python interface to Clamd (Clamav daemon)
-EAPI=5
-HOMEPAGE=https://xael.org/norman/python/pyclamd/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01fa699fbce29ea4d010177d7d444b64
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.1.0 b/metadata/md5-cache/dev-python/pyclipper-1.1.0
index c4b9d749db87..2c204fa45a49 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.1.0
+++ b/metadata/md5-cache/dev-python/pyclipper-1.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clippe
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/pyclipper
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=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/fonttools/pyclipper/archive/1.1.0.tar.gz -> pyclipper-1.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c089fe528e39f68f9c7203f656118636
+_md5_=b163edcde4de6e5efc8ef428c6b3f5e2
diff --git a/metadata/md5-cache/dev-python/pydot-1.0.28-r2 b/metadata/md5-cache/dev-python/pydot-1.0.28-r2
index aa1155d7fc22..87c0fc61d3ec 100644
--- a/metadata/md5-cache/dev-python/pydot-1.0.28-r2
+++ b/metadata/md5-cache/dev-python/pydot-1.0.28-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pydot/
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz python_targets_python2_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/p/pydot/pydot-1.0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d20f0606804aba74301ac6c83a15787
+_md5_=7a82bb993ff0731a38674d535d167007
diff --git a/metadata/md5-cache/dev-python/pydot-1.2.3 b/metadata/md5-cache/dev-python/pydot-1.2.3
index 93475746c8b0..7deab590976d 100644
--- a/metadata/md5-cache/dev-python/pydot-1.2.3
+++ b/metadata/md5-cache/dev-python/pydot-1.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=6
 HOMEPAGE=https://github.com/erocarrera/pydot https://pypi.org/project/pydot/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.2.3.tar.gz -> pydot-1.2.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e6114f7242fb3837a9052b2ef058075b
+_md5_=2f9362fe97551942d3ee2e1671435e8d
diff --git a/metadata/md5-cache/dev-python/pyface-6.0.0 b/metadata/md5-cache/dev-python/pyface-6.0.0
index 44442e9cf8cb..6e11d7d63a31 100644
--- a/metadata/md5-cache/dev-python/pyface-6.0.0
+++ b/metadata/md5-cache/dev-python/pyface-6.0.0
@@ -4,6 +4,7 @@ DESCRIPTION=Enthought Tool Suite: Traits-capable windowing framework
 EAPI=6
 HOMEPAGE=https://github.com/enthought/pyface
 IUSE=examples test python_targets_python2_7 test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[gui,network,opengl,printsupport,svg,test?,webengine,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/wxpython:*[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 )
@@ -11,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyface/pyface-6.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c4e88d39c0104320a466ab962cdf341
+_md5_=91f5a7a8d08353712213461962f10ddf
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.8.1 b/metadata/md5-cache/dev-python/pyflakes-0.8.1
index 911b8664ad2b..cac61c356bb4 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.8.1
+++ b/metadata/md5-cache/dev-python/pyflakes-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Passive checker for Python programs
 EAPI=5
 HOMEPAGE=https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=93156bc6c4a66cea5b600abece00f089
+_md5_=5076781d28c814552ce0a36baa7408bb
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.0.0 b/metadata/md5-cache/dev-python/pyflakes-1.0.0
index e0c5fad1444e..e0a6dd85a8b0 100644
--- a/metadata/md5-cache/dev-python/pyflakes-1.0.0
+++ b/metadata/md5-cache/dev-python/pyflakes-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Passive checker for Python programs
 EAPI=5
 HOMEPAGE=https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e1f9917b142edc81beeebee5f89af2df
+_md5_=0f2e0a6d27d41d67cbb89ea932297958
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index 466efc349094..d42f1f8e1cf5 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.3
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python interface to Fltk library
 EAPI=5
 HOMEPAGE=http://pyfltk.sourceforge.net/
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=LGPL-2
-RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.3_py3.tar.gz -> pyFltk-1.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6b7e324561ddb6a05b9b87221e04f513
+_md5_=8cca0d533db608dc2071b194f6bcd2f2
diff --git a/metadata/md5-cache/dev-python/pyglet-1.2.4 b/metadata/md5-cache/dev-python/pyglet-1.2.4
index 2c93c3bade97..6fa4b4e4d229 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.2.4
+++ b/metadata/md5-cache/dev-python/pyglet-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Cross-platform windowing and multimedia library for Python
 EAPI=5
 HOMEPAGE=http://www.pyglet.org/
-IUSE=alsa examples gtk +openal python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=alsa examples gtk +openal python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyglet/pyglet-1.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f4a66139beb2546ecacd7675899ca6a
+_md5_=d6bf365e282de08a0ae0a43197189d19
diff --git a/metadata/md5-cache/dev-python/pyicu-2.0.3 b/metadata/md5-cache/dev-python/pyicu-2.0.3
deleted file mode 100644
index b8b9b3592fd6..000000000000
--- a/metadata/md5-cache/dev-python/pyicu-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyICU/PyICU-2.0.3.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=aaa3cec85e48e0132521de3c211d0cbc
diff --git a/metadata/md5-cache/dev-python/pyicu-2.1 b/metadata/md5-cache/dev-python/pyicu-2.1
deleted file mode 100644
index 0356205d2151..000000000000
--- a/metadata/md5-cache/dev-python/pyicu-2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyICU/PyICU-2.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=aaa3cec85e48e0132521de3c211d0cbc
diff --git a/metadata/md5-cache/dev-python/pyicu-2.2 b/metadata/md5-cache/dev-python/pyicu-2.2
index ef0029b54b4c..aa54a5986dcf 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.2
+++ b/metadata/md5-cache/dev-python/pyicu-2.2
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu test? ( dev-python/pytest dev-python/six )
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-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_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a9e5fc21e86bcd165b310368d682ab9c
+_md5_=0cc441d870f22989fb221db394539f16
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 7d63609f94f3..96cf5df1afa6 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python module used for monitoring filesystems events
 EAPI=5
 HOMEPAGE=http://trac.dbzteam.org/pyinotify https://pypi.org/project/pyinotify/
-IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=72f7f24818e8e76e44bb6766ef34ece7
+_md5_=d9e10071c6fe7116ac14d5737223fe70
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.4 b/metadata/md5-cache/dev-python/pylint-1.8.4
index 6c6d59017f0d..db3a49f79019 100644
--- a/metadata/md5-cache/dev-python/pylint-1.8.4
+++ b/metadata/md5-cache/dev-python/pylint-1.8.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <dev-python/pytest-3.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) <dev-python/pytest-3.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python code static checker
 EAPI=6
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
-IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_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_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_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_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.8.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5ac659242df4b82908b7c4bff6f0874
+_md5_=504ff0220ca1ab0f28a8f70f58ac5b51
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index 015a1bf98b17..0e7967d6eb9b 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.1
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/hypothesis-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=6
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 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
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.1.tar.gz -> pynacl-1.2.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe9a9c929cc0e1d7602b89675285872d
+_md5_=f62beac3126af86e8c38936285252c7c
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0 b/metadata/md5-cache/dev-python/pyopengl-3.1.0
index 9dc1abd80e0a..9fb9e68ad28e 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.0
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=tk python_targets_python2_7 python_targets_python3_4 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
 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_4? ( dev-lang/python:3.4[tk?] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=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_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 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	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60ae0c3cde759a5e44c45d228ef1ca29
+_md5_=53d84d30186381ac7d3ee63fb14c4e98
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.2 b/metadata/md5-cache/dev-python/pypax-0.9.2
index f689d4ab4db6..fc7c842ff759 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.2
+++ b/metadata/md5-cache/dev-python/pypax-0.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+ptpax +xtpax python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 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.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=635a661fa720a5e2d2bdf454ea35c36c
+_md5_=8d3bcc5729f3c965104a128b658dd092
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.3 b/metadata/md5-cache/dev-python/pypax-0.9.3
index b0ec2c6ada7b..79ca461cf327 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.3
+++ b/metadata/md5-cache/dev-python/pypax-0.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+ptpax +xtpax python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 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.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b95df99d6d0c61ab7fa3b331fb2914fd
+_md5_=c713bb51a972fbc6fce103fc5bb1d937
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.4 b/metadata/md5-cache/dev-python/pypax-0.9.4
index 1bc5f9c18607..b799e84582db 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.4
+++ b/metadata/md5-cache/dev-python/pypax-0.9.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+ptpax +xtpax python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 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.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e9265c148090f124c388dc490eda7019
+_md5_=8d3bcc5729f3c965104a128b658dd092
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
index 05e9d1c5f535..616988d28985 100644
--- a/metadata/md5-cache/dev-python/pypax-9999
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 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_4 python_targets_python3_5 python_targets_python3_6
+IUSE=+ptpax +xtpax python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32eb6e2ee857ab87875029f718a96915
+_md5_=3411883be790bd09c237948abdce1e07
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.5.27 b/metadata/md5-cache/dev-python/pyperclip-1.5.27
index 14948b166e19..8859ac501855 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.5.27
+++ b/metadata/md5-cache/dev-python/pyperclip-1.5.27
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A cross-platform clipboard module for Python.
 EAPI=6
 HOMEPAGE=https://github.com/asweigart/pyperclip
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 x86
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.5.27.zip
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=82ce62a8aeca7fd8681d2093a0b41a4f
+_md5_=75f5c98be3d8695065c66855111063a2
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.6.4 b/metadata/md5-cache/dev-python/pyperclip-1.6.4
index bb773ee77ae3..dc48b3352ea0 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.6.4
+++ b/metadata/md5-cache/dev-python/pyperclip-1.6.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A cross-platform clipboard module for Python.
 EAPI=6
 HOMEPAGE=https://github.com/asweigart/pyperclip
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.6.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=586b12fa2b976a7b99c067c976582e51
+_md5_=9f40288df71257797ac226d8c9d6912e
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0
index aadf9abcfec7..dd6b4f423bd4 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 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	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	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
index fc9e3aaa717a..b1e9b509fd1d 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:
 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	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	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
index d2e2de8be9b4..165aa479c8c6 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:
 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	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4c747712498ed47355d50b35fa084e9d
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
index ede64f0aad49..57879996b798 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
+++ b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:
 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	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	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
index 7006ec2f489d..69c3a41d8a21 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
+++ b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:
 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	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=cf0e9b55d594ee7d13bc3cff5763ecc1
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
index 74d0a497c19b..b3a67e93614d 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface to the sendfile(2) system call
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/pysendfile
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=09075c99d2c0da870111e43533a6cd61
+_md5_=b1ccff5be5af08a1f56ff8fafebfa5f1
diff --git a/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2 b/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2
deleted file mode 100644
index 447d193e8824..000000000000
--- a/metadata/md5-cache/dev-python/pyswisseph-2.00.00_p2
+++ /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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python extension to the AstroDienst Swiss Ephemeris
-EAPI=6
-HOMEPAGE=https://github.com/astrorigin/pyswisseph
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyswisseph/pyswisseph-2.00.00-2.tar.bz2
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a404dcbde1d40a78cc7654997d4904c9
diff --git a/metadata/md5-cache/dev-python/pytest-3.2.2 b/metadata/md5-cache/dev-python/pytest-3.2.2
index 78e0186a809d..76c631c1f79b 100644
--- a/metadata/md5-cache/dev-python/pytest-3.2.2
+++ b/metadata/md5-cache/dev-python/pytest-3.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/pytest-xdist-1.13[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >dev-python/pytest-xdist-1.13[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Simple powerful testing with Python
 EAPI=6
 HOMEPAGE=http://pytest.org/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !<dev-python/logilab-common-1.3.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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/py-1.4.33[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !<dev-python/logilab-common-1.3.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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.2.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c8ea0b68de925df2ccf05caca281f7b
+_md5_=9f99eb25f24b63e2c85035701f238f5a
diff --git a/metadata/md5-cache/dev-python/pytest-3.4.2 b/metadata/md5-cache/dev-python/pytest-3.4.2
index c75ea0831ea5..f06bf2dc0525 100644
--- a/metadata/md5-cache/dev-python/pytest-3.4.2
+++ b/metadata/md5-cache/dev-python/pytest-3.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!dev-python/flaky !!dev-python/pytest-capturelog ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pluggy-0.7 >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!dev-python/flaky !!dev-python/pytest-capturelog ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Simple powerful testing with Python
 EAPI=6
 HOMEPAGE=http://pytest.org/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !<dev-python/logilab-common-1.3.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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pluggy-0.7 >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !<dev-python/logilab-common-1.3.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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.4.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=170f0cddc3fe856c425ef681107155be
+_md5_=b71b626ab3ae8cf23c1d79e2acb8e208
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
index 5aa8dd8729d5..dc9266355bf9 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
@@ -1,15 +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(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=py.test plugin for relaxed test discovery and organization
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=BSD-2
-RDEPEND=>=dev-python/pytest-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/pytest-3.3 >=dev-python/six-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/decorator-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(-)] 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=>=dev-python/pytest-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-3.3 >=dev-python/six-1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/decorator-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-relaxed/pytest-relaxed-1.1.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cc22cd9e0ab5cd0cb047e1f0b6f54e04
+_md5_=30fc5361b95cb192e1818355c91a8a71
diff --git a/metadata/md5-cache/dev-python/python-evdev-0.7.0-r1 b/metadata/md5-cache/dev-python/python-evdev-0.7.0-r1
deleted file mode 100644
index 2bc8b9d57923..000000000000
--- a/metadata/md5-cache/dev-python/python-evdev-0.7.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library for evdev bindings
-EAPI=7
-HOMEPAGE=https://python-evdev.readthedocs.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/gvalkov/python-evdev/archive/v0.7.0.tar.gz -> python-evdev-0.7.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7a51577e2875f6c9e8779b8a2f61d116
diff --git a/metadata/md5-cache/dev-python/pyzmq-16.0.2 b/metadata/md5-cache/dev-python/pyzmq-16.0.2
index 703f554e482b..42f81570ade9 100644
--- a/metadata/md5-cache/dev-python/pyzmq-16.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-16.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Lightweight and super-fast messaging library built on top of the ZeroMQ library
 EAPI=6
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
-RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-16.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a2bb7b48367fb185444f0caa443eaca
+_md5_=53c7399e1dea7bcbc1f499710cc579e3
diff --git a/metadata/md5-cache/dev-python/pyzmq-17.1.0 b/metadata/md5-cache/dev-python/pyzmq-17.1.0
index fdabe4290c8d..405297ff9696 100644
--- a/metadata/md5-cache/dev-python/pyzmq-17.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-17.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=www-servers/tornado-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=www-servers/tornado-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Lightweight and super-fast messaging library built on top of the ZeroMQ library
 EAPI=6
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
-RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-17.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a24772740dde668816c43c89147ac21d
+_md5_=a5cdbecdcbad90602401f0bb438d5b61
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.3.1 b/metadata/md5-cache/dev-python/qtconsole-4.3.1
index f8cd62eb473c..330931a7de67 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.3.1
+++ b/metadata/md5-cache/dev-python/qtconsole-4.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/ipython-4.0.0-r2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg,testlib] ) dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),svg] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/ipython-4.0.0-r2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),svg,testlib] ) dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),svg] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Qt-based console for Jupyter with support for rich media output
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.3.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7fccfaf9c2fc7b8d7831f23146127add
+_md5_=58cb5fb884ba82ce6ab68daf37ac540c
diff --git a/metadata/md5-cache/dev-python/raven-5.2.0 b/metadata/md5-cache/dev-python/raven-5.2.0
deleted file mode 100644
index faa52acc6fa6..000000000000
--- a/metadata/md5-cache/dev-python/raven-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Raven is a client for Sentry
-EAPI=5
-HOMEPAGE=https://github.com/getsentry/raven-python
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/raven/raven-5.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=607c3caf32b33fecc7d069629f537135
diff --git a/metadata/md5-cache/dev-python/raven-5.3.0 b/metadata/md5-cache/dev-python/raven-5.3.0
deleted file mode 100644
index cfab70b47a12..000000000000
--- a/metadata/md5-cache/dev-python/raven-5.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Raven is a client for Sentry
-EAPI=5
-HOMEPAGE=https://github.com/getsentry/raven-python
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/raven/raven-5.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=607c3caf32b33fecc7d069629f537135
diff --git a/metadata/md5-cache/dev-python/raven-5.31.0 b/metadata/md5-cache/dev-python/raven-5.31.0
deleted file mode 100644
index 9f4db31aee9d..000000000000
--- a/metadata/md5-cache/dev-python/raven-5.31.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Raven is a client for Sentry
-EAPI=6
-HOMEPAGE=https://github.com/getsentry/raven-python
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/r/raven/raven-5.31.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a71e1c23145d985a7536b9c58aa082b4
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1 b/metadata/md5-cache/dev-python/reflink-0.2.1
new file mode 100644
index 000000000000..4366bda32cdb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reflink-0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-fs/btrfs-progs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=RFC-compliant FQDN validation and manipulation for Python
+EAPI=7
+HOMEPAGE=https://gitlab.com/rubdos/pyreflink
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3782007c1d30c3bf5764cbc2fb0d1f5e
diff --git a/metadata/md5-cache/dev-python/reno-2.11.2 b/metadata/md5-cache/dev-python/reno-2.11.2
index f873137d7c05..ecbda37780a2 100644
--- a/metadata/md5-cache/dev-python/reno-2.11.2
+++ b/metadata/md5-cache/dev-python/reno-2.11.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
 EAPI=6
 HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.11.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bfd5617077bc9a852ca1cc617543914f
+_md5_=37891d8bef2eb157ee41035226fc495f
diff --git a/metadata/md5-cache/dev-python/reno-2.2.1 b/metadata/md5-cache/dev-python/reno-2.2.1
deleted file mode 100644
index 17dadc844ec9..000000000000
--- a/metadata/md5-cache/dev-python/reno-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
-EAPI=6
-HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/reno/reno-2.2.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=266e38705224f620529ba92b860ef338
diff --git a/metadata/md5-cache/dev-python/reno-2.5.0 b/metadata/md5-cache/dev-python/reno-2.5.0
deleted file mode 100644
index 656284032cab..000000000000
--- a/metadata/md5-cache/dev-python/reno-2.5.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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
-EAPI=6
-HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/reno/reno-2.5.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bd29bf351adf1325ed5f53c60b4b7ca8
diff --git a/metadata/md5-cache/dev-python/reno-2.7.0 b/metadata/md5-cache/dev-python/reno-2.7.0
index 2318ec7080b0..97eb18b3c28a 100644
--- a/metadata/md5-cache/dev-python/reno-2.7.0
+++ b/metadata/md5-cache/dev-python/reno-2.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
 EAPI=6
 HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm64 x86
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.7.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a6b3c23ac018be4f3ec11ce3e893ac1d
+_md5_=6c37190a9ba4d33c338dce380232067a
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.13 b/metadata/md5-cache/dev-python/reportlab-3.5.13
new file mode 100644
index 000000000000..3a86bec49e50
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.13
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libart_lgpl sys-libs/zlib dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unzip
+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_4 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
+LICENSE=BSD
+RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 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	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a7b985ddc08c7c26d5b3c05e29e1e529
diff --git a/metadata/md5-cache/dev-python/requests-2.11.1 b/metadata/md5-cache/dev-python/requests-2.11.1
deleted file mode 100644
index e5e8e05cc78d..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/ https://pypi.org/project/requests/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.11.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ee271b816d4ad0aa4be11f61a22c21e4
diff --git a/metadata/md5-cache/dev-python/requests-2.12.5 b/metadata/md5-cache/dev-python/requests-2.12.5
deleted file mode 100644
index 0d62187219bd..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/ https://pypi.org/project/requests/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-1.4.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.12.5.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9e21bc0eb87326abf3edc01f1073377f
diff --git a/metadata/md5-cache/dev-python/requests-2.14.2 b/metadata/md5-cache/dev-python/requests-2.14.2
deleted file mode 100644
index e218a3f23ab7..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/ca-certificates >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.8.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/ https://pypi.org/project/requests/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=app-misc/ca-certificates >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ndg-httpsclient[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.14.2.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0309c5242a04ffcef8c50b02444cad6f
diff --git a/metadata/md5-cache/dev-python/requests-2.18.2-r2 b/metadata/md5-cache/dev-python/requests-2.18.2-r2
deleted file mode 100644
index 316744dc2041..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.18.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/idna-2.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ssl? ( >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/
-IUSE=socks5 +ssl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/idna-2.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ssl? ( >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.18.2.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5ce02a9af648fbee3d7a700240611ac
diff --git a/metadata/md5-cache/dev-python/requests-2.19.1-r1 b/metadata/md5-cache/dev-python/requests-2.19.1-r1
deleted file mode 100644
index 529a9b1b9bd3..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.19.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/idna-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/urllib3-1.24[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=HTTP library for human beings
-EAPI=6
-HOMEPAGE=http://python-requests.org/
-IUSE=socks5 +ssl python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/chardet-3.0.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/idna-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/urllib3-1.24[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( >=dev-python/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.19.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=187472faf0924db567bcb24be8d7c684
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 2740cd44c77f..057e9814e086 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c79e5c92eb628aa66b72df2bb1b1f46
+_md5_=d5b0c274a0a6273ae08e9394abc343a0
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2 b/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
index af6e1f6cfba8..9fbd81f0f262 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Created out of frustration, it sucks to find out your reST is invalid after uploading it.
 EAPI=5
 HOMEPAGE=https://pypi.org/project/restructuredtext_lint/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-0.12.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d17d598043653cfe09b74143fdad95e6
+_md5_=90ff3805e8f34b66ddafdd4b4631602e
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
index 486da1956752..cb0a6983c861 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Created out of frustration, it sucks to find out your reST is invalid after uploading it.
 EAPI=6
 HOMEPAGE=https://pypi.org/project/restructuredtext_lint/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-1.1.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a1bb4493ad05f607680a431957c0051e
+_md5_=e1a13fe290de76e83ace456dcbc444aa
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.1.0 b/metadata/md5-cache/dev-python/rfc3986-1.1.0
index 5da764948563..7cc67b26753c 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.1.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Validating URI References per RFC 3986
 EAPI=6
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce09c4a8f987f9f27d5bb39508832f4b
+_md5_=7440762661c9e5288737077f86cac59f
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
index 0842384a2c53..99fcedaf4298 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruamel enhancements to pathlib and pathlib2
 EAPI=6
 HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib
 IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/pathlib2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.3.tar.gz -> ruamel-std-pathlib-0.6.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd00ded8c3031cfbdfa2ed0e4f1cd14d
+_md5_=deb0c7ec3ff16a4cfe92a1224643dbbf
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
index 08a937da12b0..8ba2080b03d7 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
@@ -4,11 +4,11 @@ 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_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.35.tar.gz -> ruamel-yaml-0.15.35.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cec19ca081a0e159de44ea3c8e6e2502
+_md5_=aef235abd30d840787379d55aff640a1
diff --git a/metadata/md5-cache/dev-python/send2trash-1.3.0 b/metadata/md5-cache/dev-python/send2trash-1.3.0
index 679bae461f50..9ee108e06530 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.3.0
+++ b/metadata/md5-cache/dev-python/send2trash-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Sends files to the Trash (or Recycle Bin)
 EAPI=5
 HOMEPAGE=http://hg.hardcoded.net/send2trash https://pypi.org/project/Send2Trash/ https://github.com/hsoft/send2trash
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Send2Trash/Send2Trash-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=30672e548e059b3c4716c040b18b3f13
+_md5_=1c32dbb4060699ec8f1a681932ded7ca
diff --git a/metadata/md5-cache/dev-python/service_identity-16.0.0 b/metadata/md5-cache/dev-python/service_identity-16.0.0
index e5af21e11b1d..b17ef9d53195 100644
--- a/metadata/md5-cache/dev-python/service_identity-16.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-16.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Service identity verification for pyOpenSSL
 EAPI=5
 HOMEPAGE=https://github.com/pyca/service_identity
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-16.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d00f8f010158737250daf45b4eb3b0fb
+_md5_=3cab785338ceffe17545c81bac437ab7
diff --git a/metadata/md5-cache/dev-python/setuptools-40.6.2 b/metadata/md5-cache/dev-python/setuptools-40.6.2
deleted file mode 100644
index 0187e9830ef3..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-40.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-40.6.2.zip
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e636d85e800cf628efa1a94edc1f097e
diff --git a/metadata/md5-cache/dev-python/setuptools-40.6.3 b/metadata/md5-cache/dev-python/setuptools-40.6.3
index a255616c5a0a..20cc1ec2f7d7 100644
--- a/metadata/md5-cache/dev-python/setuptools-40.6.3
+++ b/metadata/md5-cache/dev-python/setuptools-40.6.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-40.6.3.zip
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c7914727ace54ae2048feef238372856
+_md5_=e932ea4f83c79513a5183134658df937
diff --git a/metadata/md5-cache/dev-python/setuptools-40.7.1 b/metadata/md5-cache/dev-python/setuptools-40.7.1
new file mode 100644
index 000000000000..f62b0bda57e7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-40.7.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-40.7.1.zip
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5c4ea7c77d6f0d11fa26977f0c8097a8
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
index 949913d4b532..4ab3d7b8b593 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
@@ -1,15 +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(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A setuptools_scm plugin for git archives
 EAPI=7
 HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[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/setuptools_scm[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 )
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.0.tar.gz -> setuptools_scm_git_archive-1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=12c917071c236dcd9ba6ea3276bea834
+_md5_=bce27ac2f6f1b068f96c5a64151c34b2
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index 008276b59d8f..96c375d75c16 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Simple generic functions for Python
 EAPI=5
 HOMEPAGE=https://pypi.org/project/simplegeneric/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ZPL
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=909d78389bdbdb4a798220314789b89a
+_md5_=950dd3990b5a58d14341e3890fd887f8
diff --git a/metadata/md5-cache/dev-python/sip-4.19.13 b/metadata/md5-cache/dev-python/sip-4.19.13
index 42640254e202..8d5e76483474 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_4 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f76f9fdfb2398731866188a25bb86cb
+_md5_=7db37978d49b6de1e18d2cd492561e54
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index 48e2f9f0b2d5..6b152ba7bc58 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A pure python implementation of a sliding window memory map manager
 EAPI=6
 HOMEPAGE=https://pypi.org/project/smmap2/ https://github.com/gitpython-developers/smmap
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=!dev-python/smmap[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=!dev-python/smmap[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap2/smmap2-2.0.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bcd599ecabe5d8852dadc957a861e8c2
+_md5_=ef99f99672f76a0718c3f44ffaf4c837
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.0 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
index 6b522cf86d63..8ebac0f6cca3 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Stemmer algorithms generated from Snowball algorithms
 EAPI=5
 HOMEPAGE=https://github.com/shibukawa/snowball_py https://pypi.org/project/snowballstemmer/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2619b2661e7cc479734e5b217fb46194
+_md5_=1af309b6dda50be71b1b30601cb34844
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.1 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
index 71b9333ac9e6..d24193fe5576 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
+++ b/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Stemmer algorithms generated from Snowball algorithms
 EAPI=5
 HOMEPAGE=https://github.com/shibukawa/snowball_py https://pypi.org/project/snowballstemmer/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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 ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eb8f7fa3c16980bf5954e7f446c305e7
+_md5_=460e31b034bc4d6967d183f6fd03a09e
diff --git a/metadata/md5-cache/dev-python/soya-0.14-r1 b/metadata/md5-cache/dev-python/soya-0.14-r1
deleted file mode 100644
index 1b1913986918..000000000000
--- a/metadata/md5-cache/dev-python/soya-0.14-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-games/ode-0.11.1 dev-python/editobj >=dev-python/pyopenal-0.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/freefonts media-libs/freetype:2 >=media-libs/cal3d-0.10 media-libs/freeglut >=media-libs/freetype-2.5 >=media-libs/glew-1.3.3:* >=media-libs/libsdl-1.2.8[opengl] media-libs/openal virtual/opengl dev-python/pillow[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 high-level 3D engine for Python, designed with games in mind
-EAPI=5
-HOMEPAGE=http://oomadness.nekeme.net/Soya/FrontPage
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==dev-games/ode-0.11.1 dev-python/editobj >=dev-python/pyopenal-0.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/freefonts media-libs/freetype:2 >=media-libs/cal3d-0.10 media-libs/freeglut >=media-libs/freetype-2.5 >=media-libs/glew-1.3.3:* >=media-libs/libsdl-1.2.8[opengl] media-libs/openal virtual/opengl dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/soya/Soya-0.14.tar.bz2 doc? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 ) examples? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7501c99674076f997c3ac18dfa9dc86e
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12 b/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
index 364527769981..2378eabd5933 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Sphinx extension to automatically generate an examples gallery
 EAPI=6
 HOMEPAGE=http://sphinx-gallery.readthedocs.io/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-PDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.1.12.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d36b3c21a886a0a9c4aed250ec248b21
+_md5_=97bc65471f5607d595f6471d4c97bf17
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
index 3d47e5712b4a..898d94a2782f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
 EAPI=6
 HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.0.tar.gz -> sphinxcontrib-github-alt-1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=650279f6285e47083855b5fac9452b06
+_md5_=972f965364ecb379d67670880be771c9
diff --git a/metadata/md5-cache/dev-python/stestr-2.1.0 b/metadata/md5-cache/dev-python/stestr-2.1.0
index 794fab1c317e..9a93e3549aa0 100644
--- a/metadata/md5-cache/dev-python/stestr-2.1.0
+++ b/metadata/md5-cache/dev-python/stestr-2.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A parallel Python test runner built around subunit
 EAPI=6
 HOMEPAGE=https://github.com/mtreinish/stestr
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.8.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-0.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.8.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-2.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18aa948a2253e75f04479cfb0a71cbaa
+_md5_=92d669f9c5b9dd848cdf502877e263d5
diff --git a/metadata/md5-cache/dev-python/stevedore-1.28.0 b/metadata/md5-cache/dev-python/stevedore-1.28.0
index 58a11d1b2e38..347395ca803e 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.28.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.28.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/pillow-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openstackdocstheme-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/pillow-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Manage dynamic plugins for Python applications
 EAPI=6
 HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.28.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ccbd9698be9fc54b7f45778dc8e65692
+_md5_=fec8e449196ba83a0bffc29f0dfe763d
diff --git a/metadata/md5-cache/dev-python/symengine-0.3.0 b/metadata/md5-cache/dev-python/symengine-0.3.0
index 6ff49ae8930c..12fa73c60c3f 100644
--- a/metadata/md5-cache/dev-python/symengine-0.3.0
+++ b/metadata/md5-cache/dev-python/symengine-0.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/symengine dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/symengine dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python wrappers to the symengine C++ library
 EAPI=6
 HOMEPAGE=https://github.com/sympy/symengine.py
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/symengine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/symengine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.3.0.tar.gz -> symengine.py-0.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f73e5a2894acdb847f4fe40d4452c493
+_md5_=b8dc75a32eecf740236e2fde95d5d720
diff --git a/metadata/md5-cache/dev-python/sympy-1.0-r1 b/metadata/md5-cache/dev-python/sympy-1.0-r1
index 89b64b48ba26..9fec93a9e333 100644
--- a/metadata/md5-cache/dev-python/sympy-1.0-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/docbook2X ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-text/docbook2X ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Computer Algebra System in pure Python
 EAPI=5
 HOMEPAGE=https://sympy.org
-IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.0/sympy-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4a8cec3f241fcfdab16f1523d2f816ed
+_md5_=d0e062d2c30c212c591bca9a1dd28163
diff --git a/metadata/md5-cache/dev-python/sympy-1.3 b/metadata/md5-cache/dev-python/sympy-1.3
index 7fac0b0f3c10..f6551b23e7b9 100644
--- a/metadata/md5-cache/dev-python/sympy-1.3
+++ b/metadata/md5-cache/dev-python/sympy-1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/docbook2X ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-text/docbook2X ) test? ( dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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=Computer Algebra System in pure Python
 EAPI=6
 HOMEPAGE=https://sympy.org
-IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( dev-python/pyglet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) symengine? ( dev-python/symengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.3/sympy-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f722e27c1788c71eedc530fb4384057
+_md5_=e3805b6faf7fc374574df693205a5776
diff --git a/metadata/md5-cache/dev-python/tappy-2.4 b/metadata/md5-cache/dev-python/tappy-2.4
index fcb9ced5ee81..015e39ffa323 100644
--- a/metadata/md5-cache/dev-python/tappy-2.4
+++ b/metadata/md5-cache/dev-python/tappy-2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Test Anything Protocol (TAP) tools
 EAPI=6
 HOMEPAGE=https://github.com/python-tap/tappy https://pypi.org/project/tap.py/
 IUSE=test yaml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] yaml? ( dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tap.py/tap.py-2.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7bb1ed11777e69109c81f02fa0a4696f
+_md5_=ca01fe38db4212ec4517c830c12938eb
diff --git a/metadata/md5-cache/dev-python/tempest-lib-1.0.0 b/metadata/md5-cache/dev-python/tempest-lib-1.0.0
index 8ec0ed672076..5d1f0ad14ad4 100644
--- a/metadata/md5-cache/dev-python/tempest-lib-1.0.0
+++ b/metadata/md5-cache/dev-python/tempest-lib-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-testr-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ddt-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-testr-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ddt-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Functional or integrated test suites for OpenStack projects
 EAPI=6
 HOMEPAGE=https://pypi.org/project/tempest-lib/ https://github.com/openstack/tempest-lib
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/tempest-lib/tempest-lib-1.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb381e2429486cac47ae136a0562cf20
+_md5_=506ea60d7f2e425b28c9141c74a99ab5
diff --git a/metadata/md5-cache/dev-python/terminado-0.5 b/metadata/md5-cache/dev-python/terminado-0.5
index 1b9ed47d7f93..07b29f5636e7 100644
--- a/metadata/md5-cache/dev-python/terminado-0.5
+++ b/metadata/md5-cache/dev-python/terminado-0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=5
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=114f422e5cc0c8d78093c2c8165160bf
+_md5_=ef4852d9204111645b315eb547e26d7e
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.1 b/metadata/md5-cache/dev-python/terminado-0.8.1
index 3ea75aef201a..eaf028ce9bcf 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.1
+++ b/metadata/md5-cache/dev-python/terminado-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=6
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.8.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b60a9f5a2cd483b53624b2c714885ff
+_md5_=713510365f84f4769f8d12507a010ba4
diff --git a/metadata/md5-cache/dev-python/theano-0.9.0 b/metadata/md5-cache/dev-python/theano-0.9.0
index 7d00d44ddbe4..15a78795acc1 100644
--- a/metadata/md5-cache/dev-python/theano-0.9.0
+++ b/metadata/md5-cache/dev-python/theano-0.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose-parameterized[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose-parameterized[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyflakes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Define and optimize multi-dimensional arrays mathematical expressions
 EAPI=6
 HOMEPAGE=https://github.com/Theano/Theano
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.9.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7e5f8c6cb74cc2b24e68f81a652dcade
+_md5_=dc5d0930d5b4346ead1576b48fa3852a
diff --git a/metadata/md5-cache/dev-python/tmdb3-0.6.17 b/metadata/md5-cache/dev-python/tmdb3-0.6.17
deleted file mode 100644
index 0befc33ddcbe..000000000000
--- a/metadata/md5-cache/dev-python/tmdb3-0.6.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=TheMovieDB.org APIv3 interface
-EAPI=5
-HOMEPAGE=https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3/
-IUSE=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_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tmdb3/tmdb3-0.6.17.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3c28e67fcfcf1c60b42a203fc6054bc2
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index 4959f1256b61..d387ed3276f9 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=doc? ( dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A configuration system for Python applications
 EAPI=6
 HOMEPAGE=https://github.com/ipython/traitlets
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=85aa6712e949ad3aca36b9a4a7526552
+_md5_=e714e0375df810d01d188c716b449afb
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.22 b/metadata/md5-cache/dev-python/ttystatus-0.22
deleted file mode 100644
index 8fd727160846..000000000000
--- a/metadata/md5-cache/dev-python/ttystatus-0.22
+++ /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(-)] python_targets_python2_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=Terminal progress bar and status output for command line
-EAPI=5
-HOMEPAGE=http://liw.fi/ttystatus/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.22.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44f938923dc938e3e43a190121a7dfa4
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.23 b/metadata/md5-cache/dev-python/ttystatus-0.23
deleted file mode 100644
index e224331e9766..000000000000
--- a/metadata/md5-cache/dev-python/ttystatus-0.23
+++ /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(-)] python_targets_python2_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=Terminal progress bar and status output for command line
-EAPI=5
-HOMEPAGE=http://liw.fi/ttystatus/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.23.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b784424b0dbf2063e9998fa254b8bd2d
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.32 b/metadata/md5-cache/dev-python/ttystatus-0.32
deleted file mode 100644
index 9628d8610284..000000000000
--- a/metadata/md5-cache/dev-python/ttystatus-0.32
+++ /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(-)] python_targets_python2_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=Terminal progress bar and status output for command line
-EAPI=5
-HOMEPAGE=http://liw.fi/ttystatus/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/ttystatus-0.32.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=86527a0626d764378741eb286b229cd7
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.4.1 b/metadata/md5-cache/dev-python/u-msgpack-2.4.1
index bb75c359ff45..d0fbb5d8887d 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.4.1
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A portable, lightweight MessagePack serializer and deserializer
 EAPI=6
 HOMEPAGE=https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 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-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.4.1.tar.gz -> u-msgpack-2.4.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3fb0b7d10b051568aa3dbc5ce560507
+_md5_=5a97e37c09bf507f7e4afdd72c6109d2
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
index 4afa1cfe0012..f63a4eb5edec 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Drop-in replacement for python stdlib csv module supporting unicode
 EAPI=5
 HOMEPAGE=https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 ~ppc x86
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2d4f96bf808da0334e8dc9019d8159b
+_md5_=7007dbcbd6584f5ec92160dc4650d737
diff --git a/metadata/md5-cache/dev-python/versioneer-0.16 b/metadata/md5-cache/dev-python/versioneer-0.16
index 202206a19794..bff5a88a6dc2 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.16
+++ b/metadata/md5-cache/dev-python/versioneer-0.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Easy VCS-based management of project version strings
 EAPI=5
 HOMEPAGE=https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 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-linux ~x86-linux
 LICENSE=public-domain
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc6f7249812df9b747ac33ba548d27a9
+_md5_=3e33b62cd4d399c6ce0e4aaa7ce5389b
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.10.5 b/metadata/md5-cache/dev-python/voluptuous-0.10.5
index 7f54e9ac12a4..b1d7490d4a84 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.10.5
+++ b/metadata/md5-cache/dev-python/voluptuous-0.10.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A Python data validation library.
 EAPI=6
 HOMEPAGE=https://github.com/alecthomas/voluptuous
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.10.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=17a3191a5dbf6f34c7178862ef9d9a01
+_md5_=8124a9747de59e9299ab8b205638adec
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.11.1 b/metadata/md5-cache/dev-python/voluptuous-0.11.1
index 1f4aa125ec44..e167feab6860 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.11.1
+++ b/metadata/md5-cache/dev-python/voluptuous-0.11.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A Python data validation library.
 EAPI=6
 HOMEPAGE=https://github.com/alecthomas/voluptuous
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.11.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3f06d66b23476bf68122dbf6eade5d8
+_md5_=3f45077cc1d1751a8b39cff8048e64e6
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0 b/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
index a9457d8930e0..82a3c2a34914 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/notebook-4.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/notebook-4.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=IPython HTML widgets for Jupyter
 EAPI=6
 HOMEPAGE=http://ipython.org
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/notebook-4.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/notebook-4.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.0.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ccc8c599e9115c2ed1722aad22fd5eaf
+_md5_=e93bcd9cfb7ba57d54ccd6ccea1af579
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.11 b/metadata/md5-cache/dev-python/wrapt-1.10.11
index 992434afbf5b..d821ce73eafe 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.11
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Module for decorators, wrappers and monkey patching
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
-IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.11.tar.gz -> wrapt-1.10.11.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5821f770b0062ad7d8a420a6fc89f050
+_md5_=e5a01f87197fcef9e8c57ec64621f063
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index c638017f5a52..c631f3a65f6e 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
@@ -4,7 +4,7 @@ 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_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86
+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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2c4d7d4536b85ec4feea7dbda6e2de8
+_md5_=4fdd9b7cdd0e44ae9ada3aad5f913151
diff --git a/metadata/md5-cache/dev-python/xcffib-0.5.1 b/metadata/md5-cache/dev-python/xcffib-0.5.1
index e02790278f24..8832301be484 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.5.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libxcb test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-apps/xeyes ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-apps/xeyes ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=6
 HOMEPAGE=https://github.com/tych0/xcffib
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.5.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9ad5e176c2a0f5930ee032effb7fd85
+_md5_=9f8f1674acbd7f43fd60606862170699
diff --git a/metadata/md5-cache/dev-python/xcffib-0.6.0 b/metadata/md5-cache/dev-python/xcffib-0.6.0
index cacb7ca2704a..e58d42eb83e5 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.6.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libxcb test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-apps/xeyes ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-apps/xeyes ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=6
 HOMEPAGE=https://github.com/tych0/xcffib
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.6.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe575d10a0c72d90f6d040776c2f771f
+_md5_=4066f682efd9b4dd846c12542cf1ac4d
diff --git a/metadata/md5-cache/dev-python/xlwt-1.2.0 b/metadata/md5-cache/dev-python/xlwt-1.2.0
index c5ac9b9ec85c..0ed8b4989be0 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.2.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.3.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pkginfo[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/sphinx-1.3.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pkginfo[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library to create spreadsheet files compatible with Excel
 EAPI=6
 HOMEPAGE=https://pypi.org/project/xlwt/
-IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.2.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f6321eead2cb40dbafe777d1346945f
+_md5_=ed08ad939f805c7d6c94559170229245
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 08dec3216698..58934b57a91c 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/asciidoctor-diagram-1.5.13 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.13
new file mode 100644
index 000000000000..ec0c5eeefc54
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v1.5.13.tar.gz -> asciidoctor-diagram-1.5.13.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=981a188e76ac7dc78ce67f15cff10170
diff --git a/metadata/md5-cache/dev-ruby/bson-4.4.2 b/metadata/md5-cache/dev-ruby/bson-4.4.2
new file mode 100644
index 000000000000..d59eb32975b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bson-4.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=APSL-2
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=4
+SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.4.2.tar.gz -> bson-4.4.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5ddfba6f0b8c9c325de21459e939d5ff
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.13.2 b/metadata/md5-cache/dev-ruby/capybara-3.13.2
new file mode 100644
index 000000000000..01bb32aac5b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.13.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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby23] dev-ruby/sinatra:2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby23] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby23] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.13.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=31a92d1c8f1ddb56423e071f4d324fdc
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.1 b/metadata/md5-cache/dev-ruby/dbf-4.1.1
new file mode 100644
index 000000000000..00e4e03aa984
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.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/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 small fast library for reading dBase, xBase, Clipper and FoxPro database files
+EAPI=6
+HOMEPAGE=https://github.com/infused/dbf
+IUSE=elibc_FreeBSD ruby_targets_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=0
+SRC_URI=mirror://rubygems/dbf-4.1.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8fad42f5801a3d3406c865b65d1b721c
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index 78411ba0261f..566e3538b816 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=5
 HOMEPAGE=https://rubygems.org/gems/delayer
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef2d412ab99e76818cd1ac76fd3027ab
+_md5_=78a84c675cecbe39b1c45a9dd079a2da
diff --git a/metadata/md5-cache/dev-ruby/facter-3.12.3 b/metadata/md5-cache/dev-ruby/facter-3.12.3
index ae13be7425fa..7eccbbe6a28c 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.12.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.12.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa48c865797b6838b0dc542dd249253e
+_md5_=9b39ff4cf1c5a5ef0418581702f2c899
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
index 1deed0e17cbb..57921e1c7fdd 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Forwardable with hash, and instance variable extensions
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/forwardable-extended https://github.com/envygeeks/forwardable-extended
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=06884a515797b487c49f7a713e997b8d
+_md5_=2ed75e527dd40416b1f73e38a1ec4229
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index 79c3b4604307..377531b2b566 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Hashie is a small collection of tools that make hashes more powerful
 EAPI=5
 HOMEPAGE=http://intridea.com/posts/hashie-the-hash-toolkit
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8114a4109291e4293649e2e0ff692702
+_md5_=f3dfbc74808eba62fb47af210b0cdcbf
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index e92a37688265..24183632aaeb 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) 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] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Removes leading whitespace from Ruby heredocs
 EAPI=5
 HOMEPAGE=https://github.com/adrianomitre/heredoc_unindent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8804c73d575f22a206088bab6acf42dd
+_md5_=d51df0c520edc0c81732b7412b5e1b0d
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index 0cdeaed07ed5..b6c46e480128 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Manage class instances with dictionary
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/instance_storage/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/instance_storage-1.0.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=05ac1889c0ad8169853f62f881518296
+_md5_=aa502886217447ed0c1d81e703b3a64c
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.1.0 b/metadata/md5-cache/dev-ruby/maxitest-3.1.0
index 07484fa3b44f..c0314c586f58 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.1.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Minitest + all the features you always wanted
 EAPI=6
 HOMEPAGE=https://github.com/grosser/maxitest
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.1.0.tar.gz -> maxitest-3.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bc62c7dc762278e8d291f59a7912d15a
+_md5_=a8da096063fca5af7cf60354c369c01a
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index c9df31d82c12..8e997814fac7 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 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
+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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=74c79392aa16ab4568ba2f9fdaca06a0
+_md5_=57ef78a11e13f5080fad36f7100add8b
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.2 b/metadata/md5-cache/dev-ruby/mustermann-1.0.2
index 181fbb4dd391..27f80117a250 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A library implementing patterns that behave like regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/sinatra/mustermann
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/mustermann-1.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0adadb00a41733b5256c4d522f72ed81
+_md5_=0c0654cd77255f547958e7bd1cda53f2
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.3 b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
index 931cafad54a0..7bfc900f9d57 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A library implementing patterns that behave like regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/sinatra/mustermann
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/mustermann-1.0.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6e83197280d30f0d08889a353bbca674
+_md5_=0d54e8de77f0168eca34b1fba814104f
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
index e32bee336c1c..e0d8d7b01c49 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.10.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=241fe5f1567b324874a74ac5b6d7c41c
+_md5_=f45a271cfdf0261bb4fde423753d9234
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
index 4e096d4edd65..d17c17edf044 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.5
 SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dfee59ae8f7636d0f66d0aa70c78ed2b
+_md5_=b63d34e84b5c787ce6e0e6ac477ec728
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index 98d3d8b2e2c5..c72518fa9335 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Nagios-rb is a compact framework for writing Nagios plugins
 EAPI=5
 HOMEPAGE=https://github.com/jcsalterego/nagios-rb
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios-0.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cddca0a2470b61c562bab01f3de3ff82
+_md5_=68243c2bd32a44760d05d03a77026770
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 908178de0159..95d94444a5da 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 simple parser for Nagios status files
 EAPI=5
 HOMEPAGE=https://github.com/jbbarth/nagios_analyzer
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios_analyzer-0.0.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8c4a5f1d18769bc9d5191c84e87904dc
+_md5_=796565d7a47d3a51ae49c4bfe8b897a5
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 09ee2df636ea..4b3d65ecc90d 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Numerical N-dimensional Array class
 EAPI=5
 HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=amd64 hppa ~mips ppc ~ppc64 x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=95ea90143486ff8a6935f6b6a38b117e
+_md5_=f1ecca12892614ff4c5a7dd27ca526a8
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index 1792608ddd60..7768a712fa39 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/hoe[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 implementation of RFC 2617 - Digest Access Authentication
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1dcd455901b7538b5d9c353c2ae9719b
+_md5_=9e962d872daaff473c45a486b5fd3654
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index 691077ae14fa..b6a6520a8439 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/hoe[ruby_targets_ruby25] test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 HTTP/1.1 pipelining implementation atop Net::HTTP
 EAPI=5
 HOMEPAGE=http://docs.seattlerb.org/net-http-pipeline/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/net-http-pipeline-1.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a8aa825ac476b5b5704e96b19d0292d3
+_md5_=a790380d6555271bd1b951689b87616f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index 570a52fde8f5..d179925e405a 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/mocha:1.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/mocha:1.0[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 simple library to assist in enabling tunneled Net::SSH connections
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh-gateway
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=72c20c3a71e26ee12160bc9494c6e7f4
+_md5_=946733066982b48e357ed00237a85771
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 73dd27db3f0b..0513137b6f01 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=This library reads and writes .netrc files
 EAPI=5
 HOMEPAGE=https://github.com/geemus/netrc
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.11.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a21c090f2013064d41b0f2b23ca7cbc3
+_md5_=ae60f1ce88978a757a6fef3aa9f50658
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
index 2f28607063cf..78014bdbb237 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=network_interface layer from metasploit pcaprub
 EAPI=6
 HOMEPAGE=https://github.com/rapid7/network_interface
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/network_interface-0.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=97a7606327ef0082157eeb719bb04e71
+_md5_=ca6619f284c761c191f1d078df6a5bd0
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.2.0 b/metadata/md5-cache/dev-ruby/nio4r-2.2.0
deleted file mode 100644
index 90fcec4ee60d..000000000000
--- a/metadata/md5-cache/dev-ruby/nio4r-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A high performance selector API for monitoring IO objects
-EAPI=6
-HOMEPAGE=https://github.com/socketry/nio4r
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=mirror://rubygems/nio4r-2.2.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3c1a244a243f7a55b38624dce33c929e
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.3.0 b/metadata/md5-cache/dev-ruby/nio4r-2.3.0
deleted file mode 100644
index bb92fbe57737..000000000000
--- a/metadata/md5-cache/dev-ruby/nio4r-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A high performance selector API for monitoring IO objects
-EAPI=6
-HOMEPAGE=https://github.com/socketry/nio4r
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=2
-SRC_URI=mirror://rubygems/nio4r-2.3.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ed25b4b4b6b6d3f92821f868c210850
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.3.1 b/metadata/md5-cache/dev-ruby/nio4r-2.3.1
index 3c774aac7860..d32912ee22d8 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.3.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-retry[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 high performance selector API for monitoring IO objects
 EAPI=6
 HOMEPAGE=https://github.com/socketry/nio4r
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/nio4r-2.3.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ed25b4b4b6b6d3f92821f868c210850
+_md5_=87224215c49310de63a6b20c4c764665
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13
deleted file mode 100644
index 8227a0e7c1c0..000000000000
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A Nokogiri interface to the Gumbo HTML5 parser
-EAPI=6
-HOMEPAGE=https://github.com/rubys/nokogumbo
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/nokogumbo-1.4.13.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0b2b4337aac3dbfa22c4bba75e915bac
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.5.0 b/metadata/md5-cache/dev-ruby/nokogumbo-1.5.0
index c32d191f8082..444fef4202c2 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.5.0
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 Nokogiri interface to the Gumbo HTML5 parser
 EAPI=6
 HOMEPAGE=https://github.com/rubys/nokogumbo
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.5.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=849207ed4c9328c9790306e7a345454b
+_md5_=c804efce482fc9d0e4eeff84a97c0786
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index 8a6cde535387..999e09cbb2f5 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 function to notify on cross platform
 EAPI=5
 HOMEPAGE=https://github.com/jugyo/notify
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=x11-libs/libnotify ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=x11-libs/libnotify ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/notify-0.5.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a873749d26b2590f1ec3f9bead3de40b
+_md5_=d2bbbe86ee83908254c8eb0b0bfe799a
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index bc39f009a143..46816f46fccc 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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/NTLM HTTP provides NTLM authentication over http
 EAPI=5
 HOMEPAGE=http://www.mindflowsolutions.net/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0df3a4fe3d6c902b160315d7e7702a70
+_md5_=dfb60d272928708d11e6c1a96b1189cf
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 98bde06f805b..83df4e0272b4 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Open3::popen3 with exit status
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/open4
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=60f3ae53a728d566c887729b9e91c252
+_md5_=2b40810b55bfcf218baab0fc3fb3ec44
diff --git a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4 b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
index adaa447bc586..db11d229952c 100644
--- a/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
+++ b/metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Communicate with OpenVAS manager through OMP
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/openvas-omp
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 PDEPEND=net-analyzer/openvas
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/openvas-omp-0.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=263057fbb7f9575417383026a11bb4b3
+_md5_=1e10a0e2144f6ef9775d78736f0e2b04
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 33dd6f6662eb..b210d36194bb 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Robust options validation for Ruby methods
 EAPI=5
 HOMEPAGE=https://github.com/durran/optionable
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/optionable-0.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5bf38295578b0f968887bc54ff50c46b
+_md5_=56a96bd752c1974bbd625ae1eff4a026
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index fedae85d8f94..6b89cea14f53 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/tilt[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/tilt[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/tilt[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 routines for parsing org-mode files
 EAPI=5
 HOMEPAGE=https://github.com/wallyqs/org-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c4c3f86cae43868b154c2d814362d5ba
+_md5_=a695cb39432f042d8de37edbbef88418
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index 63d8b85c71ae..4188c55ba607 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_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby23] ) dev-ruby/bundler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby24] ) dev-ruby/bundler[ruby_targets_ruby24] ) !dev-ruby/packetfu:0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) 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_ruby23? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby23] ) dev-ruby/bundler[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A mid-level packet manipulation library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/packetfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/network_interface:0[ruby_targets_ruby23] dev-ruby/pcaprub:0.12[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/packetfu-1.1.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aaa13ca1f392e07d689ee40cb80728fc
+_md5_=4d33af41e5bcbecc0291486b5951e0bd
diff --git a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2 b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
index 309a7ec668c3..9f2697c29b42 100644
--- a/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
+++ b/metadata/md5-cache/dev-ruby/patch_finder-1.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Generic Patch Finder
 EAPI=6
 HOMEPAGE=https://github.com/wchen-r7/patch-finder
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/patch_finder-1.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=93dc8b5a92d05430ef2b29f8737f7f5d
+_md5_=e8bc898b1f7b142111ae66c0f76bd4d1
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.0.3 b/metadata/md5-cache/dev-ruby/path_expander-1.0.3
index ca2eaf23ec6d..45623684c134 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.0.3
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/path_expander-1.0.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d831a15a4ab1bc7c2d705a17d51219b
+_md5_=ccf09241a6df65e33a2d45612efbb9b2
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.16.2 b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
index feacc4c1cf48..7dbe82484d47 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.16.2
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby24] <dev-ruby/forwardable-extended-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby25] <dev-ruby/forwardable-extended-3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby24] <dev-ruby/forwardable-extended-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby25] <dev-ruby/forwardable-extended-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby26] <dev-ruby/forwardable-extended-3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/safe_yaml[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/safe_yaml[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/safe_yaml[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/safe_yaml[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Like Pathname but a little less insane
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/pathutil https://github.com/envygeeks/pathutils
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby24] <dev-ruby/forwardable-extended-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby25] <dev-ruby/forwardable-extended-3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby23] <dev-ruby/forwardable-extended-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby24] <dev-ruby/forwardable-extended-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby25] <dev-ruby/forwardable-extended-3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/forwardable-extended-2.6[ruby_targets_ruby26] <dev-ruby/forwardable-extended-3[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/pathutil/archive/v0.16.2.tar.gz -> pathutil-0.16.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c0702cc9192f19f6c058c5fa29c359c5
+_md5_=47cbe396fd9a8ac2b535fb0bef1aabd9
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
index fa3ecad86b86..55dd19a31deb 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=net-libs/libpcap ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Libpcap bindings for ruby compat
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=net-libs/libpcap ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0.13
 SRC_URI=mirror://rubygems/pcaprub-0.13.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4ef2c1ddcfa448117d05acb012788c96
+_md5_=badd58764f0200fd72e9da6b8af36329
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0
deleted file mode 100644
index 50402ae91cdb..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/afm-0.2*[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby24] =dev-ruby/afm-0.2*[ruby_targets_ruby24] =dev-ruby/ascii85-1*[ruby_targets_ruby24] =dev-ruby/hashery-2*[ruby_targets_ruby24] dev-ruby/ttfunk:*[ruby_targets_ruby24] dev-ruby/ruby-rc4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby25] =dev-ruby/afm-0.2*[ruby_targets_ruby25] =dev-ruby/ascii85-1*[ruby_targets_ruby25] =dev-ruby/hashery-2*[ruby_targets_ruby25] dev-ruby/ttfunk:*[ruby_targets_ruby25] dev-ruby/ruby-rc4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=PDF parser conforming as much as possible to the PDF specification from Adobe
-EAPI=6
-HOMEPAGE=https://github.com/yob/pdf-reader/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/afm-0.2*[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby24] =dev-ruby/afm-0.2*[ruby_targets_ruby24] =dev-ruby/ascii85-1*[ruby_targets_ruby24] =dev-ruby/hashery-2*[ruby_targets_ruby24] dev-ruby/ttfunk:*[ruby_targets_ruby24] dev-ruby/ruby-rc4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby25] =dev-ruby/afm-0.2*[ruby_targets_ruby25] =dev-ruby/ascii85-1*[ruby_targets_ruby25] =dev-ruby/hashery-2*[ruby_targets_ruby25] dev-ruby/ttfunk:*[ruby_targets_ruby25] dev-ruby/ruby-rc4[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=2
-SRC_URI=https://github.com/yob/pdf-reader/archive/v2.1.0.tar.gz -> pdf-reader-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fdf75ba57adc6a7ec37598342d0c4d5f
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0-r1
deleted file mode 100644
index bca757b73da3..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/afm-0.2*[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby24] =dev-ruby/afm-0.2*[ruby_targets_ruby24] =dev-ruby/ascii85-1*[ruby_targets_ruby24] =dev-ruby/hashery-2*[ruby_targets_ruby24] dev-ruby/ttfunk:*[ruby_targets_ruby24] dev-ruby/ruby-rc4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby25] =dev-ruby/afm-0.2*[ruby_targets_ruby25] =dev-ruby/ascii85-1*[ruby_targets_ruby25] =dev-ruby/hashery-2*[ruby_targets_ruby25] dev-ruby/ttfunk:*[ruby_targets_ruby25] dev-ruby/ruby-rc4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=PDF parser conforming as much as possible to the PDF specification from Adobe
-EAPI=6
-HOMEPAGE=https://github.com/yob/pdf-reader/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!!<dev-ruby/pdf-reader-1.4.1-r2 ruby_targets_ruby23? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby23] =dev-ruby/afm-0.2*[ruby_targets_ruby23] =dev-ruby/ascii85-1*[ruby_targets_ruby23] =dev-ruby/hashery-2*[ruby_targets_ruby23] dev-ruby/ttfunk:*[ruby_targets_ruby23] dev-ruby/ruby-rc4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby24] =dev-ruby/afm-0.2*[ruby_targets_ruby24] =dev-ruby/ascii85-1*[ruby_targets_ruby24] =dev-ruby/hashery-2*[ruby_targets_ruby24] dev-ruby/ttfunk:*[ruby_targets_ruby24] dev-ruby/ruby-rc4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/afm-0.2.1[ruby_targets_ruby25] =dev-ruby/afm-0.2*[ruby_targets_ruby25] =dev-ruby/ascii85-1*[ruby_targets_ruby25] =dev-ruby/hashery-2*[ruby_targets_ruby25] dev-ruby/ttfunk:*[ruby_targets_ruby25] dev-ruby/ruby-rc4[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=2
-SRC_URI=https://github.com/yob/pdf-reader/archive/v2.1.0.tar.gz -> pdf-reader-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5b20a088320470d4d88a360225b7999a
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 15f323b21194..f605b583fc0d 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Library performing operations with permutations of sequences (strings, arrays)
 EAPI=5
 HOMEPAGE=https://flori.github.com/permutation
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=|| ( Ruby-BSD BSD-2 )
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/permutation-0.1.8.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=492e84fc497c1af2b0d2ba74853d2eb5
+_md5_=8a03fe7e390718ccad3ebd137f736e22
diff --git a/metadata/md5-cache/dev-ruby/pg-1.1.4 b/metadata/md5-cache/dev-ruby/pg-1.1.4
new file mode 100644
index 000000000000..9a7fac30cf77
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pg-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 library providing an API to PostgreSQL
+EAPI=6
+HOMEPAGE=https://bitbucket.org/ged/ruby-pg/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~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=|| ( GPL-2 Ruby )
+RDEPEND=dev-db/postgresql:* ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/pg-1.1.4.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=171da4702448a39a5c3365fb6a667de4
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
index 133175af95d0..ed58dacd5fc6 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/bundler[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/bundler[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/bundler[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/bundler[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 library to parse PostgreSQL arrays into a array of strings
 EAPI=5
 HOMEPAGE=https://github.com/dockyard/pg_array_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.0.9
 SRC_URI=mirror://rubygems/pg_array_parser-0.0.9.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b838919ac07d4cc66acadb91d370a061
+_md5_=c65ed4b1f6fd2f2cbde6d61f6f226b3f
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index 3ad463e1c9a9..e59ccb12d2ff 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Polyglot provides support for fully-custom DSLs
 EAPI=5
 HOMEPAGE=http://polyglot.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/polyglot-0.3.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=959cc55006d11d14522b19bf0befeebc
+_md5_=44b13deee6d7f3e7e0e37a6a2a21318d
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
index ce65e68c6a49..1aea15961382 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT LGPL-2.1
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c3f885ae7aa3b4ede8149f95e105b0d1
+_md5_=08ead8b62b0a69aba23ad60244f63b94
diff --git a/metadata/md5-cache/dev-ruby/psych-3.1.0 b/metadata/md5-cache/dev-ruby/psych-3.1.0
index 00a672f7e461..4afff38281be 100644
--- a/metadata/md5-cache/dev-ruby/psych-3.1.0
+++ b/metadata/md5-cache/dev-ruby/psych-3.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libyaml-0.2.1 ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=>=dev-libs/libyaml-0.2.1 ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 libyaml wrapper for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/tenderlove/psych
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/psych/archive/v3.1.0.tar.gz -> psych-3.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=08cb7823bc447c1714ebe63b890f807f
+_md5_=6bd74f4f35498347005e3b4ebd7e48db
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4 b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
index 0fb9129dc99d..f1d5108a548e 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
@@ -6,5 +6,5 @@ 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	ee2f5086cd7e7b747b061f58db14d89e
+_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 de2bc203572d..4b1bde308990 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
@@ -6,5 +6,5 @@ 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	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=2ed8ebe8b42f746540aa9d45f152ed2c
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.1.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.1.0
index db7bc608620e..483786a8e8c0 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.1.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.1.0
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.1.0-1stretch_all.deb
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=850681f787439fccf0bd711f5561eb3c
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.2.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.2.0
new file mode 100644
index 000000000000..05a260e41785
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Library needed to connect puppet to puppetdb
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.2.0-1stretch_all.deb
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=0f5d7f5a7bee83a7e8e5e29a8a511078
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index bf5098337be9..d6fa0f8df238 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/tenderlove/racc
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.14.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0ebc434270692f61ff8283c0fc79b5b8
+_md5_=42d511b250bf8fb9339cdf25425b5457
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.3.2 b/metadata/md5-cache/dev-ruby/rack-attack-5.3.2
deleted file mode 100644
index 50ce855b53ad..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A DSL for blocking & throttling abusive clients
-EAPI=6
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=5
-SRC_URI=mirror://rubygems/rack-attack-5.3.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc65027f454ad60625b8bb64364c69fe
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-5.4.0
deleted file mode 100644
index d019b62a289c..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-5.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A DSL for blocking & throttling abusive clients
-EAPI=6
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=5
-SRC_URI=mirror://rubygems/rack-attack-5.4.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc65027f454ad60625b8bb64364c69fe
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.8.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.8.0
index f06247fe1c02..42fc090024e0 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/maxitest[ruby_targets_ruby25] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby25] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) 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_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/maxitest[ruby_targets_ruby25] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby25] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/maxitest[ruby_targets_ruby26] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby26] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Enable HTTP caching for Rack-based applications that produce freshness info
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.8.0.tar.gz -> rack-cache-1.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eb217bc155f3cdf0ea42fa587b6d1abf
+_md5_=8fb810530691d3883b692c6135646eca
diff --git a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2 b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
index 2cdc7bc3f2b6..fc676bfadce0 100644
--- a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 stackable dynamic tree based Rack router
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-mount
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.8
 SRC_URI=https://github.com/josh/rack-mount/tarball/v0.8.3 -> rack-mount-0.8.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ac807f7fabc758e76f4db329196c6cc
+_md5_=25dd8f5a06d48ca6b0e1b150f33ffb55
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 4a4e2eb625ff..53dae9085c90 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby25] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby25] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby26] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 more HTTPish API around the ruby-openid library
 EAPI=5
 HOMEPAGE=https://github.com/grosser/rack-openid
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby25] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby23] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby24] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby25] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby26] >=dev-ruby/rack-1.1.0:*[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4a4e0b0f7000130be4d4a994201f797d
+_md5_=ad68079ff86500451c3c5a43614851b6
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index f74d7fab6736..a7bc6831da50 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rack-test[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Force SSL/TLS in your app
 EAPI=5
 HOMEPAGE=https://github.com/josh/rack-ssl/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=827d1c1885d73e61de4bb7797567e651
+_md5_=2bdc413ff8d4656adc0a434902580d1c
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.3 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.3
index c58fd2b281d3..2f6ac7e60237 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.3
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby25] test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-13[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/open4-1.0[ruby_targets_ruby24] >=dev-ruby/rake-0.8[ruby_targets_ruby24] <dev-ruby/rake-13[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/open4-1.0[ruby_targets_ruby25] >=dev-ruby/rake-0.8[ruby_targets_ruby25] <dev-ruby/rake-13[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-13[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/open4-1.0[ruby_targets_ruby24] >=dev-ruby/rake-0.8[ruby_targets_ruby24] <dev-ruby/rake-13[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/open4-1.0[ruby_targets_ruby25] >=dev-ruby/rake-0.8[ruby_targets_ruby25] <dev-ruby/rake-13[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/open4-1.0[ruby_targets_ruby26] >=dev-ruby/rake-0.8[ruby_targets_ruby26] <dev-ruby/rake-13[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Extends Rake with remote task goodness
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/rake-remote_task
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-13[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/open4-1.0[ruby_targets_ruby24] >=dev-ruby/rake-0.8[ruby_targets_ruby24] <dev-ruby/rake-13[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/open4-1.0[ruby_targets_ruby25] >=dev-ruby/rake-0.8[ruby_targets_ruby25] <dev-ruby/rake-13[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/open4-1.0[ruby_targets_ruby23] >=dev-ruby/rake-0.8[ruby_targets_ruby23] <dev-ruby/rake-13[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/open4-1.0[ruby_targets_ruby24] >=dev-ruby/rake-0.8[ruby_targets_ruby24] <dev-ruby/rake-13[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/open4-1.0[ruby_targets_ruby25] >=dev-ruby/rake-0.8[ruby_targets_ruby25] <dev-ruby/rake-13[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/open4-1.0[ruby_targets_ruby26] >=dev-ruby/rake-0.8[ruby_targets_ruby26] <dev-ruby/rake-13[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.4.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=216ec6946f4966ec8610f379e7ec0639
+_md5_=998dff341a0ed055c2da93bd49891896
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
index 4a92032f62e3..750c11e08d2f 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Rash is an extension to Hashie
 EAPI=5
 HOMEPAGE=https://github.com/tcocca/rash
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash-0.4.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d8b125cf56baf0835b8bae37e7d2689a
+_md5_=387a19fe9e0bc906e260fcf45980bc71
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.7 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.7
index 1503f0677012..7476faef3fe9 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.7
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3.5*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Rash alt version for Hashie's own Rash
 EAPI=6
 HOMEPAGE=https://github.com/shishi/rash_alt
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3.5*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3.5*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby23] =dev-ruby/hashie-3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby24] =dev-ruby/hashie-3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hashie-3.5.6:3[ruby_targets_ruby25] =dev-ruby/hashie-3*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash_alt-0.4.7.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3a2213057ec8921f969a8c780b3605b0
+_md5_=4fc95fcd6a6508713f244a4078ce5caf
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
index c742bc427848..32d387a49ae7 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/narray[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/narray[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 interface to GNU Scientific Library
 EAPI=5
 HOMEPAGE=https://github.com/SciRuby/rb-gsl
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=>=sci-libs/gsl-2.3[deprecated] ruby_targets_ruby23? ( dev-ruby/narray[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/narray[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/narray[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/narray[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/gsl-2.1.0.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a5af5a542216ac18bcc8e4aa89877dd5
+_md5_=e9ce1b26ab9ba2bb019930d3a7856463
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
index 759e4f4ccca6..3605f1f1bf0d 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] >=dev-ruby/minitest-5.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] >=dev-ruby/minitest-5.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] >=dev-ruby/minitest-5.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] >=dev-ruby/minitest-5.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] >=dev-ruby/minitest-5.2[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 the GNU readline C library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rb-readline
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1bd130b436fe482ee8f8f400fbf4ae18
+_md5_=cec0e85cc81b4656fd487a54d985a652
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0 b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
index 357c4b90022b..5fa53b6f8cd1 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
+++ b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-ruby/minitest dev-ruby/rake ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( dev-ruby/minitest dev-ruby/rake ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 the GNU readline C library forked by r7
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rb-readline-r7
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-r7-0.5.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ba7b26cc920a68e5ccca08899f9aa8d5
+_md5_=d310e303e3bc73f7db18fca70132faf6
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-6.0.1 b/metadata/md5-cache/dev-ruby/rbnacl-6.0.1
new file mode 100644
index 000000000000..ce3cf3ab8e5f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-6.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) test? ( ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 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_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6
+SRC_URI=mirror://rubygems/rbnacl-6.0.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d6792ee11eb2e24eb8cda335baf3c600
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.3 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.3
deleted file mode 100644
index 397686211b06..000000000000
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby on Rails RBPDF plugin
-EAPI=6
-HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rbpdf-1.19.3.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b11774766c6871d32110f58c5d5104b2
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.4 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.4
deleted file mode 100644
index b801bcf4612b..000000000000
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby on Rails RBPDF plugin
-EAPI=6
-HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rbpdf-1.19.4.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4417706b79c8748653cc3bff37a30740
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.5 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.5
deleted file mode 100644
index 8d0868e005b4..000000000000
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/actionview:*[ruby_targets_ruby25] dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Ruby on Rails RBPDF plugin
-EAPI=6
-HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/actionview:*[ruby_targets_ruby23] dev-ruby/htmlentities[ruby_targets_ruby23] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/actionview:*[ruby_targets_ruby24] dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/actionview:*[ruby_targets_ruby25] dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rbpdf-1.19.5.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7e5fe9af83921138871c27a92073b6cc
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index 9e13459eeb57..f5b7e86659b9 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 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 ~x64-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.2.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=084718678f81535506aba7f02de0f353
+_md5_=29e39ef7bea6008e0eeb54b774a7ec5a
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index fe3016657b1e..57319be46874 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 multipurpose documentation format for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/uwabami/rdtool
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=emacs elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=Ruby GPL-2
-RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cd42762119eee0bd7a49d286ef4507f9
+_md5_=f1e0b9d0df90968a15b4ce9f8eb3272b
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0 b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
index 97f87db4c4aa..791d904fd0fb 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 wrapper for Upskirt
 EAPI=5
 HOMEPAGE=https://github.com/vmg/redcarpet
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.4.0.tar.gz -> redcarpet-3.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=845a864cce12c0aa4b17e6c540f35c70
+_md5_=84d2643e15c3034cd0c50c4f6f4b9dfc
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0 b/metadata/md5-cache/dev-ruby/ref-2.0.0
index 65e3a08b0705..f62fa9e6b7d8 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Implements weak, soft, and strong references in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/ref
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c71626a3901071ea67e90213922cfe42
+_md5_=8abc64fc6ab115b6d9be2bbf5371331e
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.4.1 b/metadata/md5-cache/dev-ruby/request_store-1.4.1
index 6284cb3724e0..66d261afc02a 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.4.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Per-request global storage for Rack
 EAPI=6
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.4.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=081c870da4e2b7dd51ff87f6979c0324
+_md5_=00b4c705bee2688e5857e7f326acc1b3
diff --git a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.4 b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.4
deleted file mode 100644
index 58bfaa93ab82..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/metasm:*[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-bin_tools-0.1.4.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=beb8918df1b9f9b27aaade5680f8451b
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.12 b/metadata/md5-cache/dev-ruby/rex-core-0.1.12
deleted file mode 100644
index 66205e90c4ff..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Core libraries required for the Ruby Exploitation(Rex) Suite
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/rex-core
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-core-0.1.12.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f03423d06062a8f37e7d17efdaa68924
diff --git a/metadata/md5-cache/dev-ruby/rex-core-0.1.13 b/metadata/md5-cache/dev-ruby/rex-core-0.1.13
index 0c16a6e8a53e..527511bae537 100644
--- a/metadata/md5-cache/dev-ruby/rex-core-0.1.13
+++ b/metadata/md5-cache/dev-ruby/rex-core-0.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Core libraries required for the Ruby Exploitation(Rex) Suite
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-core
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-core-0.1.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9f52292722154581316976cc517e6368
+_md5_=e33963620a6cd6c51798e403c784baf6
diff --git a/metadata/md5-cache/dev-ruby/rex-java-0.1.5 b/metadata/md5-cache/dev-ruby/rex-java-0.1.5
index ea5f39b8d82f..f5a590d3534e 100644
--- a/metadata/md5-cache/dev-ruby/rex-java-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-java-0.1.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 parsing Java serialized streams
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-java
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-java-0.1.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a3374db1cb1f75929001715c77709ea9
+_md5_=c69afadcb8c273690a20c15d498379c5
diff --git a/metadata/md5-cache/dev-ruby/rex-mime-0.1.5 b/metadata/md5-cache/dev-ruby/rex-mime-0.1.5
index 1e7f9c60cf02..86e1e2b1cee9 100644
--- a/metadata/md5-cache/dev-ruby/rex-mime-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-mime-0.1.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=library is for creating and/or parsing MIME messages
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-mime
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-mime-0.1.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=efd711c788fd8dba3b7834524c19e7a8
+_md5_=65e9ea84e105c7f8a71f48af237822c7
diff --git a/metadata/md5-cache/dev-ruby/rex-nop-0.1.1 b/metadata/md5-cache/dev-ruby/rex-nop-0.1.1
index 465796f5ecd2..381031062520 100644
--- a/metadata/md5-cache/dev-ruby/rex-nop-0.1.1
+++ b/metadata/md5-cache/dev-ruby/rex-nop-0.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Rex library for dynamic generation of x86 multi-byte NOPs
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-nop
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-arch[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-nop-0.1.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=64efa6333b9026233be7ed52157e9436
+_md5_=1e924a43412186569ab50b650799e40c
diff --git a/metadata/md5-cache/dev-ruby/rex-ole-0.1.6 b/metadata/md5-cache/dev-ruby/rex-ole-0.1.6
index 715f0cec7892..53f039c0ac66 100644
--- a/metadata/md5-cache/dev-ruby/rex-ole-0.1.6
+++ b/metadata/md5-cache/dev-ruby/rex-ole-0.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 gem for reading/writing OLE files and streams
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-ole
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-ole-0.1.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3dfb1dc72440a565482691bad908389b
+_md5_=55433d2a5c94d7b558749f5a3e0918d7
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.79 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.79
index 86bbf4e638f5..c6531ad6e0b9 100644
--- a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.79
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.79
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-random_identifier[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-random_identifier[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-random_identifier[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 generating/manipulating Powershell scripts
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-powershell
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-powershell-0.1.79.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=be69a4b0e18a15cd9f35659e89628d58
+_md5_=8cecf3211f47b3845f85ba90cb8c3b3b
diff --git a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.4 b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.4
index f5a33454d66d..83ff59400f78 100644
--- a/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 generating Random identifier strings
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-random_identifier
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-random_identifier-0.1.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ea24949ffd24a7b29d7da05c0cb01cd2
+_md5_=e60d43e9d249d545fbb7067292137d80
diff --git a/metadata/md5-cache/dev-ruby/rex-registry-0.1.3 b/metadata/md5-cache/dev-ruby/rex-registry-0.1.3
index 4da40b4b6725..f3a3e98a8c08 100644
--- a/metadata/md5-cache/dev-ruby/rex-registry-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-registry-0.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Rex library for parsing offline registry files from a Windows machine
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-registry
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-registry-0.1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c3860491348f2b3d9a3f05b9da34ba93
+_md5_=044471f58eaa415cbe657311440c6612
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.14 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.14
deleted file mode 100644
index 71c6742bda19..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Ruby Exploitation (Rex) Socket Abstraction Library
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/rex-socket
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-socket-0.1.14.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dc2aae7cdcfebe432f0d92873a8e6f82
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.15 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.15
index ec836515be3a..ffa50a9e2f5c 100644
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.15
+++ b/metadata/md5-cache/dev-ruby/rex-socket-0.1.15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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) Socket Abstraction Library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-socket
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-socket-0.1.15.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dc2aae7cdcfebe432f0d92873a8e6f82
+_md5_=fe308f06be72ec5a89af63c9f48a84f6
diff --git a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.5 b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.5
index 5889eeb11cb0..7e2b4d173594 100644
--- a/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.5
+++ b/metadata/md5-cache/dev-ruby/rex-sslscan-0.1.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-socket[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-socket[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-socket[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 implmenetation of the SSLScan tool
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-sslscan
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 PDEPEND=dev-libs/openssl
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-socket[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-socket[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-socket[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-sslscan-0.1.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9fb970327ff64ce546bd66b374164eca
+_md5_=82d8c1f344b934bed69d1df76550b315
diff --git a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.2 b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.2
index dba89ec81270..3de8c01146e5 100644
--- a/metadata/md5-cache/dev-ruby/rex-struct2-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rex-struct2-0.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 generating/manipulating C-Style structs
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-struct2
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-struct2-0.1.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bb2baf47cb8a915a29cb3208839dc667
+_md5_=70ba1b94e94c2663cecc093de3369723
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.12 b/metadata/md5-cache/dev-ruby/rex-text-0.2.12
deleted file mode 100644
index 88a27ff649be..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Rex library for text generation and manipulation
-EAPI=5
-HOMEPAGE=https://github.com/rapid7/rex-text
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-text-0.2.12.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d24e22abca3a2a57b10cb5b30f36cdd5
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.16 b/metadata/md5-cache/dev-ruby/rex-text-0.2.16
deleted file mode 100644
index 54577c305b67..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-text-0.2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Rex library for text generation and manipulation
-EAPI=5
-HOMEPAGE=https://github.com/rapid7/rex-text
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-text-0.2.16.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3c2f738eba386590ff1b068099a5b6e9
diff --git a/metadata/md5-cache/dev-ruby/rex-zip-0.1.3 b/metadata/md5-cache/dev-ruby/rex-zip-0.1.3
index 35316949ad71..94e96756ad2a 100644
--- a/metadata/md5-cache/dev-ruby/rex-zip-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-zip-0.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 working with zip and related files
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/rex-zip
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-zip-0.1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b277e18ad60af4215bbfd6c3ed843772
+_md5_=73531824f7ef1dc2d80ba069e90c0b20
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.4 b/metadata/md5-cache/dev-ruby/rinku-2.0.4
index 37d7992841e7..d613a274815e 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.4
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 that does autolinking
 EAPI=6
 HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-2.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=047eb76b166098063d3dc0bfd522467b
+_md5_=07c13fc4edafd69d698865b47aa32173
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index 171443cebc3f..f9cf6302ffe9 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/racc[ruby_targets_ruby25] ) ) test? ( app-text/itex2mml ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/racc[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/racc[ruby_targets_ruby26] ) ) test? ( app-text/itex2mml ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Converts expressions from WebTeX into MathML
 EAPI=5
 HOMEPAGE=http://masanjin.net/ritex/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/racc[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/racc[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/racc[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/racc[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/ritex-1.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b9dddfe7396291228347e5576d146914
+_md5_=9dd2ee2a84b9b1ec1c5e3a53d599c490
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 9e333fe1eaa7..968212e43698 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/hoe[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=RKelly Remix is a fork of the RKelly JavaScript parser
 EAPI=5
 HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.7.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fdbb1d851008f7b36f21d64cec5d2017
+_md5_=f19873d333173e2c4a07b35bf8c6e781
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index ce6a24477feb..52f7eb6c8426 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 simple Ruby library to parse robots.txt
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/robots
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/robots-0.10.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c89db391981095634bf81f5c9d08b417
+_md5_=75be685d78f24ef167fc21a73b5359d8
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1 b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
index e48bf245d24f..1059327cfe93 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.10.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ca16f53eddd63b7d8163bc79129c41bc
+_md5_=bf9a75803bf49f378a45a36a6d6571b8
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
index e7647c4f1bae..47ca51956cbc 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DEPEND=test? ( ~net-analyzer/rrdtool-1.7.0[graph] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
+IUSE=graph test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=~alpha ~amd64 ~arm ~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.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=~net-analyzer/rrdtool-1.7.0[graph=] ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e92380941eff4cbaa943b18773358a8b
+_md5_=e21a4fda83da7ebc44f2a6d2b90c767f
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.6 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.6
deleted file mode 100644
index 59e253996b69..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Retry intermittently failing rspec examples
-EAPI=6
-HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 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_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/rspec-retry-0.5.6.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c66e1abd27d7738579005c2bb1db89ec
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.7 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.7
deleted file mode 100644
index 713977a65762..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Retry intermittently failing rspec examples
-EAPI=6
-HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 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_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rspec-retry-0.5.7.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e39939a279e518ad40777a614ecd8f15
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.0 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.0
deleted file mode 100644
index fd9bd08a17c9..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Retry intermittently failing rspec examples
-EAPI=6
-HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 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_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rspec-retry-0.6.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7ec48a1a14e898c9bf1b259c1ded1013
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.1 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.1
index c7b6d3a56b6b..e42293cecfc7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.1
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Retry intermittently failing rspec examples
 EAPI=6
 HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 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_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-0.6.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7ec48a1a14e898c9bf1b259c1ded1013
+_md5_=bfbfe8c6f81a8159a07bddae463b1148
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
index 533babe727ef..aac13dc78fcc 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=Generates readable ruby from ParseTree
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.4.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ca9dc3ad5b6ff1d8d5f8069606882c2d
+_md5_=f9e4488477f3aa58c48a09092603e43d
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.2.2 b/metadata/md5-cache/dev-ruby/rubyzip-1.2.2
index f43a2a29883c..6100f13fda93 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.2.2
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=6
 HOMEPAGE=https://github.com/rubyzip/rubyzip
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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=Ruby
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.2.2.tar.gz -> rubyzip-1.2.2-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f1d79362a3e193be59b778d70db6e927
+_md5_=746c3ccd9489a9500711c79a1e7ddee7
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r4
index bb015c03619b..95ed7a8d3f7e 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r4
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/hashie[ruby_targets_ruby23] dev-ruby/heredoc_unindent[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hashie[ruby_targets_ruby24] dev-ruby/heredoc_unindent[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/hashie[ruby_targets_ruby25] dev-ruby/heredoc_unindent[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/hashie[ruby_targets_ruby23] dev-ruby/heredoc_unindent[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/hashie[ruby_targets_ruby24] dev-ruby/heredoc_unindent[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/hashie[ruby_targets_ruby25] dev-ruby/heredoc_unindent[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/hashie[ruby_targets_ruby26] dev-ruby/heredoc_unindent[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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 YAML safely, alternative implementation of YAML.load
 EAPI=6
 HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7dbf0af171dbd2efee9e602395b76194
+_md5_=2d9810ce59e295959337a9fb98a2855f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
new file mode 100644
index 000000000000..56ba6621fb4f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Making tests easy on the fingers and eyes
+EAPI=6
+HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=3
+SRC_URI=mirror://rubygems/shoulda-matchers-3.1.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=02da39674750d0dc66c58f62ef808890
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.1.9 b/metadata/md5-cache/dev-ruby/spreadsheet-1.1.9
new file mode 100644
index 000000000000..24642cf16ec0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.1.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) 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_ruby23? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.1.9.tar.gz -> spreadsheet-1.1.9.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f12c9fa3c42d427da04c0c1fb6c225c9
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.18.1 b/metadata/md5-cache/dev-ruby/sshkit-1.18.1
new file mode 100644
index 000000000000..acba6b3ab21c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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=SSHKit makes it easy to write structured, testable SSH commands in Ruby
+EAPI=6
+HOMEPAGE=https://github.com/capistrano/sshkit
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/sshkit-1.18.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0f0599abd59a7b83fe039082325e1115
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 51000212d28b..d078b596680e 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.16 b/metadata/md5-cache/dev-tcltk/tcllib-1.16
deleted file mode 100644
index 27d1360c7f8d..000000000000
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tcl:0= dev-tcltk/tdom test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tcl Standard Library
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/software/tcllib/
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
-SLOT=0
-SRC_URI=mirror://sourceforge//project/tcllib/tcllib/1.16/Tcllib-1.16.tar.bz2 https://dev.gentoo.org/~mgorny/dist/tcllib-1.16-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=e00610cbfb081b9c9c94563c75c0571d
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.19 b/metadata/md5-cache/dev-tcltk/tcllib-1.19
index 8f64cff6b091..cf0dc2324585 100644
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.19
+++ b/metadata/md5-cache/dev-tcltk/tcllib-1.19
@@ -4,10 +4,10 @@ DESCRIPTION=Tcl Standard Library
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/software/tcllib/
 IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/tcllib/1.19/tcllib-1.19.tar.xz
 _eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1fbe5cfadbc04d5a415baaf191c7e6c2
+_md5_=eb9f1f2e0081d4fca5e9896c3dd28ed3
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 6c6fc4bb93e4..0ece7ec21c6f 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/html2latex-1.1-r1 b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
index 23d2ed9bf85a..918111497998 100644
--- a/metadata/md5-cache/dev-tex/html2latex-1.1-r1
+++ b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/html2latex/html2latex-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4f942fb108210072dad7726b2d85af1d
diff --git a/metadata/md5-cache/dev-tex/revtex-4 b/metadata/md5-cache/dev-tex/revtex-4
deleted file mode 100644
index 3a5212d71cd4..000000000000
--- a/metadata/md5-cache/dev-tex/revtex-4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP
-EAPI=5
-HOMEPAGE=https://journals.aps.org/revtex
-KEYWORDS=~amd64 ~x86
-LICENSE=LPPL-1.3c
-RDEPEND=>=dev-texlive/texlive-latex-2012 virtual/latex-base
-SLOT=4
-SRC_URI=http://publish.aps.org/files/revtex/4/revtex4.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef82b05c846b4b0c36c8bb535162f931
diff --git a/metadata/md5-cache/dev-tex/revtex-4.1_p2-r1 b/metadata/md5-cache/dev-tex/revtex-4.1_p2-r1
deleted file mode 100644
index 20ece1a243c7..000000000000
--- a/metadata/md5-cache/dev-tex/revtex-4.1_p2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP
-EAPI=2
-HOMEPAGE=https://journals.aps.org/revtex
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=LPPL-1.3c
-RDEPEND=>=dev-texlive/texlive-latex-2012 virtual/latex-base
-SLOT=0
-SRC_URI=http://authors.aps.org/revtex4/revtex4-1.zip -> revtex-4.1_p2.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8c3c9f72decf7a61f2bb6a869559b849
diff --git a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1 b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
index 8db8325cf0ee..e9a0bbc73d16 100644
--- a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
+++ b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INFINOID/App-SVN-Bisect-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=556e485c6136172f61e6ff9aac11077a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9dc4d3326206..65983a2d2abc 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/autodia-2.140.0-r1 b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
index a10b167065dc..7c2a9752447b 100644
--- a/metadata/md5-cache/dev-util/autodia-2.140.0-r1
+++ b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz mirror://gentoo/Autodia-2.14-dbi.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a0426f7d162028958aa6ff6cb6f768a
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.23.0 b/metadata/md5-cache/dev-util/cargo-tree-0.23.0
new file mode 100644
index 000000000000..cb98f45630e0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.23.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.30 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/openssl:0= sys-libs/zlib
+DESCRIPTION=Cargo subcommand that visualizes crate dependency graph in a tree-like format
+EAPI=7
+HOMEPAGE=https://github.com/sfackler/cargo-tree
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=dev-libs/openssl:0= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/sfackler/cargo-tree/archive/v0.23.0.tar.gz -> cargo-tree-0.23.0.tar.gz https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.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.8/download -> arrayvec-0.4.8.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.12/download -> backtrace-0.3.12.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/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/cargo/0.32.0/download -> cargo-0.32.0.crate https://crates.io/api/v1/crates/cc/1.0.26/download -> cc-1.0.26.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/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.3/download -> core-foundation-0.6.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.20.0/download -> crates-io-0.20.0.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.1.2/download -> crc32fast-1.1.2.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.1/download -> crossbeam-epoch-0.6.1.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/crossbeam-utils/0.6.3/download -> crossbeam-utils-0.6.3.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.19/download -> curl-0.4.19.crate https://crates.io/api/v1/crates/curl-sys/0.4.15/download -> curl-sys-0.4.15.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/env_logger/0.6.0/download -> env_logger-0.6.0.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.6/download -> flate2-1.0.6.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/fwdansi/1.0.1/download -> fwdansi-1.0.1.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.2/download -> git2-curl-0.8.2.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/heck/0.3.0/download -> heck-0.3.0.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.2.0/download -> humantime-1.2.0.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.12/download -> jobserver-0.1.12.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.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.11/download -> libgit2-sys-0.7.11.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.1/download -> libnghttp2-sys-0.1.1.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.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.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.2/download -> memchr-2.1.2.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.11/download -> miniz-sys-0.1.11.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.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.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num_cpus/1.9.0/download -> num_cpus-1.9.0.crate https://crates.io/api/v1/crates/opener/0.3.2/download -> opener-0.3.2.crate https://crates.io/api/v1/crates/openssl/0.10.15/download -> openssl-0.10.15.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-sys/0.9.39/download -> openssl-sys-0.9.39.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.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/petgraph/0.4.13/download -> petgraph-0.4.13.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.24/download -> proc-macro2-0.4.24.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.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.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.2.2/download -> rand_core-0.2.2.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_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/redox_syscall/0.1.44/download -> redox_syscall-0.1.44.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.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/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.4/download -> rustfix-0.4.4.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.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.82/download -> serde-1.0.82.crate https://crates.io/api/v1/crates/serde_derive/1.0.82/download -> serde_derive-1.0.82.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.33/download -> serde_json-1.0.33.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.7/download -> smallvec-0.6.7.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/structopt/0.2.14/download -> structopt-0.2.14.crate https://crates.io/api/v1/crates/structopt-derive/0.2.14/download -> structopt-derive-0.2.14.crate https://crates.io/api/v1/crates/syn/0.15.22/download -> syn-0.15.22.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tar/0.4.20/download -> tar-0.4.20.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.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.10/download -> toml-0.4.10.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-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-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/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.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/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.5/download -> version_check-0.1.5.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.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/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-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
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=b7d0c2e230fe23e75494f61a9f76f690
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.24.0 b/metadata/md5-cache/dev-util/cargo-tree-0.24.0
new file mode 100644
index 000000000000..0530f0c6ef63
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.24.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.32 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/openssl:0= sys-libs/zlib
+DESCRIPTION=Cargo subcommand that visualizes crate dependency graph in a tree-like format
+EAPI=7
+HOMEPAGE=https://github.com/sfackler/cargo-tree
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=dev-libs/openssl:0= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/sfackler/cargo-tree/archive/v0.24.0.tar.gz -> cargo-tree-0.24.0.tar.gz https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.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/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/backtrace/0.3.13/download -> backtrace-0.3.13.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.28/download -> backtrace-sys-0.1.28.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/cargo/0.33.0/download -> cargo-0.33.0.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/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.3/download -> core-foundation-0.6.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.21.0/download -> crates-io-0.21.0.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.1.2/download -> crc32fast-1.1.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.8/download -> crossbeam-channel-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.5/download -> crossbeam-utils-0.6.5.crate https://crates.io/api/v1/crates/crypto-hash/0.3.3/download -> crypto-hash-0.3.3.crate https://crates.io/api/v1/crates/curl/0.4.19/download -> curl-0.4.19.crate https://crates.io/api/v1/crates/curl-sys/0.4.16/download -> curl-sys-0.4.16.crate https://crates.io/api/v1/crates/env_logger/0.6.0/download -> env_logger-0.6.0.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/flate2/1.0.6/download -> flate2-1.0.6.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-cprng/0.1.0/download -> fuchsia-cprng-0.1.0.crate https://crates.io/api/v1/crates/fwdansi/1.0.1/download -> fwdansi-1.0.1.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.2/download -> git2-curl-0.8.2.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/heck/0.3.1/download -> heck-0.3.1.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.4/download -> home-0.3.4.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.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.6/download -> ignore-0.4.6.crate https://crates.io/api/v1/crates/im-rc/12.3.0/download -> im-rc-12.3.0.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.12/download -> jobserver-0.1.12.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.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.48/download -> libc-0.2.48.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.11/download -> libgit2-sys-0.7.11.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.1/download -> libnghttp2-sys-0.1.1.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.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.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.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/miniz-sys/0.1.11/download -> miniz-sys-0.1.11.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.1/download -> miniz_oxide-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.1/download -> miniz_oxide_c_api-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.9.0/download -> num_cpus-1.9.0.crate https://crates.io/api/v1/crates/opener/0.3.2/download -> opener-0.3.2.crate https://crates.io/api/v1/crates/openssl/0.10.16/download -> openssl-0.10.16.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-sys/0.9.40/download -> openssl-sys-0.9.40.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.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/petgraph/0.4.13/download -> petgraph-0.4.13.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.26/download -> proc-macro2-0.4.26.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/rand/0.6.5/download -> rand-0.6.5.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.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_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_jitter/0.1.1/download -> rand_jitter-0.1.1.crate https://crates.io/api/v1/crates/rand_os/0.1.2/download -> rand_os-0.1.2.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.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.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/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.13/download -> rustc-demangle-0.1.13.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.4/download -> rustfix-0.4.4.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.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.85/download -> serde-1.0.85.crate https://crates.io/api/v1/crates/serde_derive/1.0.85/download -> serde_derive-1.0.85.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.37/download -> serde_json-1.0.37.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.8/download -> smallvec-0.6.8.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/structopt/0.2.14/download -> structopt-0.2.14.crate https://crates.io/api/v1/crates/structopt-derive/0.2.14/download -> structopt-derive-0.2.14.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tar/0.4.20/download -> tar-0.4.20.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.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.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/typenum/1.10.0/download -> typenum-1.10.0.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-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.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/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.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/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/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/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-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_=d430f7cc1dc242210d2ce396640a4057
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.7 b/metadata/md5-cache/dev-util/catfish-1.4.7
new file mode 100644
index 000000000000..f1aa45c9bdc8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catfish-1.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/python-distutils-extra[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
+EAPI=6
+HOMEPAGE=https://docs.xfce.org/apps/catfish/start
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] virtual/freedesktop-icon-theme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.7.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=69a9609e0bbf38c344e7a5ea0f3e5ba7
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.7.1 b/metadata/md5-cache/dev-util/cbindgen-0.7.1
new file mode 100644
index 000000000000..eba16e5c8a07
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cbindgen-0.7.1
@@ -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.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/cbindgen/0.7.1/download -> cbindgen-0.7.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.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/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/libc/0.2.41/download -> libc-0.2.41.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/proc-macro2/0.4.4/download -> proc-macro2-0.4.4.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/quote/0.6.3/download -> quote-0.6.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/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/serde/1.0.64/download -> serde-1.0.64.crate https://crates.io/api/v1/crates/serde_derive/1.0.58/download -> serde_derive-1.0.58.crate https://crates.io/api/v1/crates/serde_json/1.0.19/download -> serde_json-1.0.19.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.13.11/download -> syn-0.13.11.crate https://crates.io/api/v1/crates/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/tempfile/3.0.3/download -> tempfile-3.0.3.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.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.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.4/download -> winapi-0.3.4.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_=e24933708dfd11b6ee90eb59a5056efc
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.16 b/metadata/md5-cache/dev-util/cmdtest-0.16
deleted file mode 100644
index a0779cd1cd68..000000000000
--- a/metadata/md5-cache/dev-util/cmdtest-0.16
+++ /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(-)] dev-python/cliapp dev-python/ttystatus python_targets_python2_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=black box tests Unix command line tools
-EAPI=5
-HOMEPAGE=http://liw.fi/cmdtest/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.16.orig.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b5c838747ac9bfa6f8cba6d9d81bd4f9
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.18 b/metadata/md5-cache/dev-util/cmdtest-0.18
deleted file mode 100644
index c27d30875741..000000000000
--- a/metadata/md5-cache/dev-util/cmdtest-0.18
+++ /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(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=black box tests Unix command line tools
-EAPI=5
-HOMEPAGE=http://liw.fi/cmdtest/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.18.orig.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a80b0e627f2e64f92ffda72f2e983d87
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.27 b/metadata/md5-cache/dev-util/cmdtest-0.27
deleted file mode 100644
index cfbb47d6b91a..000000000000
--- a/metadata/md5-cache/dev-util/cmdtest-0.27
+++ /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(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ttystatus[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=black box tests Unix command line tools
-EAPI=6
-HOMEPAGE=http://liw.fi/cmdtest/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_0.27.orig.tar.xz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fd05c7c5926c5a8ebfa4f1b559072202
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.3 b/metadata/md5-cache/dev-util/cmocka-1.1.3
index 8bdd52144f5c..4fdbddd9fdd3 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.3
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.3
@@ -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_ppc_32 abi_ppc_64 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.3.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f737ef6bd0846a7c34f63b6c00bebc2
+_md5_=6bf33e05ebe1cec9ca079af3334c2ade
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p3 b/metadata/md5-cache/dev-util/cunit-2.1_p3
index 142e6d3888db..68810050e3e4 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p3
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p3
@@ -4,10 +4,10 @@ DESCRIPTION=C Unit Test Framework
 EAPI=6
 HOMEPAGE=http://cunit.sourceforge.net
 IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2
 RDEPEND=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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d0f34b207fa5fa56295fe58db6fbf1c
+_md5_=62e13c9f8a3b2f08d32027af1d2b9b47
diff --git a/metadata/md5-cache/dev-util/egypt-1.10 b/metadata/md5-cache/dev-util/egypt-1.10
index 0731bbf8f6e7..7570dcb26aa5 100644
--- a/metadata/md5-cache/dev-util/egypt-1.10
+++ b/metadata/md5-cache/dev-util/egypt-1.10
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.gson.org/egypt/download/egypt-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3af27e2197b3947c438cb8ff7ce0ea01
diff --git a/metadata/md5-cache/dev-util/goland-2018.1.3 b/metadata/md5-cache/dev-util/goland-2018.1.3
deleted file mode 100644
index 826015c7d3d3..000000000000
--- a/metadata/md5-cache/dev-util/goland-2018.1.3
+++ /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.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f72eda1cd7399299df19a090f81bafa
diff --git a/metadata/md5-cache/dev-util/goland-2018.1.4 b/metadata/md5-cache/dev-util/goland-2018.1.4
deleted file mode 100644
index 585cfc6df59b..000000000000
--- a/metadata/md5-cache/dev-util/goland-2018.1.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.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f72eda1cd7399299df19a090f81bafa
diff --git a/metadata/md5-cache/dev-util/goland-2018.1.5 b/metadata/md5-cache/dev-util/goland-2018.1.5
deleted file mode 100644
index 942b9f66f115..000000000000
--- a/metadata/md5-cache/dev-util/goland-2018.1.5
+++ /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.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f72eda1cd7399299df19a090f81bafa
diff --git a/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52 b/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52
deleted file mode 100644
index b38aaee82874..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=5
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=-custom-jdk
-KEYWORDS=~amd64 ~x86
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2017.2.2.tar.gz -> ideaIC-172.3757.52.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=87c7079d92947de173a9d6007422b758
diff --git a/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52-r1 b/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52-r1
new file mode 100644
index 000000000000..46d2f76361d3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2017.2.2.172.3757.52-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=5
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 custom-jdk? ( GPL-2 )
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2017.2.2.tar.gz -> ideaIC-172.3757.52.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c7fe0cea6ec9237ea99c3ce3327a5722
diff --git a/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61 b/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61
deleted file mode 100644
index 3ae0fc613038..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=5
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=-custom-jdk
-KEYWORDS=~amd64 ~x86
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2018.3.1.tar.gz -> ideaIC-183.4588.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=04198ef145653980470e1ce1386d1494
diff --git a/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61-r1 b/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61-r1
new file mode 100644
index 000000000000..e70e10806c9e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2018.3.1.183.4588.61-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=5
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 custom-jdk? ( GPL-2 )
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2018.3.1.tar.gz -> ideaIC-183.4588.61.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c7fe0cea6ec9237ea99c3ce3327a5722
diff --git a/metadata/md5-cache/dev-util/idea-community-2018.3.3.183.5153.38 b/metadata/md5-cache/dev-util/idea-community-2018.3.3.183.5153.38
new file mode 100644
index 000000000000..8e4af9873696
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2018.3.3.183.5153.38
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 custom-jdk? ( GPL-2 )
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:*
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2018.3.3.tar.gz -> ideaIC-183.5153.38.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8
+_md5_=57386853348d3cebae5c9de374fea5a7
diff --git a/metadata/md5-cache/dev-util/meson-0.46.1 b/metadata/md5-cache/dev-util/meson-0.46.1
deleted file mode 100644
index 58b4c8b3f4f3..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.46.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) 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=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.46.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f297964017d42a983a07cba924cc5cc
diff --git a/metadata/md5-cache/dev-util/meson-0.47.1 b/metadata/md5-cache/dev-util/meson-0.47.1
deleted file mode 100644
index 580acaebe7d3..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.47.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ) 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=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.47.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24e3a54e986172be4d95516c65d5da5a
diff --git a/metadata/md5-cache/dev-util/meson-0.48.0-r2 b/metadata/md5-cache/dev-util/meson-0.48.0-r2
deleted file mode 100644
index 8635a059f890..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.48.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-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 ~amd64-fbsd ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.48.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c276ec3b4a662ee12795d9562807920
diff --git a/metadata/md5-cache/dev-util/meson-0.48.1 b/metadata/md5-cache/dev-util/meson-0.48.1
deleted file mode 100644
index efcfa7fe7667..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.48.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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=Open source build system
-EAPI=6
-HOMEPAGE=http://mesonbuild.com/
-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 ~amd64-fbsd ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.48.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7e946daf0fa08a370d1839b8df4cbd71
diff --git a/metadata/md5-cache/dev-util/meson-0.49.1 b/metadata/md5-cache/dev-util/meson-0.49.1
new file mode 100644
index 000000000000..069e23e81d26
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.49.1
@@ -0,0 +1,15 @@
+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(-)] test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git virtual/pkgconfig ) 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=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=test 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 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.49.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=85df8e85413508c2ee4462e73b46514c
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 733921a9d011..dece406f9b78 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3d727a7a275882dc9f5c69d23b6c24e
+_md5_=85df8e85413508c2ee4462e73b46514c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
index be5b84cc2929..f30720de1906 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-6.5.19 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fc7295952ea8ba925d85ff40cb406931
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
index e98edf040b97..e560d5be0dea 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-7.5.18 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=233b873990951382de1ad4c91f676b5a
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
index eee74e6479cd..416c5656e114 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.44 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dd5ff1d1a3f46ecf7d2500f4957064ea
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
index c53218db4867..d6be7466b0d8 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=83ec1bd3dd5c1985da3918ce52fc0dc2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
index a36cc6ef8913..43f772b1b6f4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.0.176 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=cc9764c2a8eb75964c44f059cfa00ec2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
index c58ad610f5f4..73433f21874a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod2/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f36aad04c20ab126f5f630e8801499b9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
index d48c116801d5..77f2632e7a3a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ebf1ad155c983ccabb011b7cd850295
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
index 2780b9737098..d886bd2bd9f5 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/10.0.130
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux -> cuda_10.0.130_410.48_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a3210cc0d2756c7a7e3ffcc26183f3e1
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
index 6e563fccc5f7..8ca1d5322e7c 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) amd64? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
 SLOT=0/6.5.14
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_32.run )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0129c6f12a00f6593a86b70ddc66699d
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
index 999ded4d67f0..5845c32cdd00 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 ) amd64? ( >=x11-drivers/nvidia-drivers-343.22[uvm] ) x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
 SLOT=0/6.5.19
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=da12f64f224219ce4744aca7d66d4b85
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
index f797d9e7d01b..74b6a2615a8d 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-5[cxx] >=x11-drivers/nvidia-drivers-352.39[uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/7.5.18
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=705384d1f2d943f4f4d4d6ef757f511c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
index b92be512d664..1e7774507783 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-drivers-367.44[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/8.0.44
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=500ff3f5322bee83ddaa8d11781f3548
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
index 78a080240e7e..b3c53950f47f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-drivers-375.26[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/8.0.61
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=703d947dc1b4d81cc6e47bb2536ec074
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
index 6dcfa7c0c344..e8b2c2fcc840 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-384.81[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/9.0.176
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=82040173f5fa3d1dc0f0ce6d78472388
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
index 5b6c5219dbbf..bcf22847f194 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-387.26[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/9.1.85
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7bc6974df7767af036c0c79301e865ca
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
index 0d2443aab414..b3bb4a2d10d4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugger? ( sys-libs/libtermcap-compat sys-libs/ncurses:5/5[tinfo] ) eclipse? ( >=virtual/jre-1.6 ) profiler? ( >=virtual/jre-1.6 )
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dc97ac8fcc42be993bb3b418c9f4a306
diff --git a/metadata/md5-cache/dev-util/objconv-2.32_pre20131127 b/metadata/md5-cache/dev-util/objconv-2.32_pre20131127
index 71fb9651d9fe..8fe0a8139212 100644
--- a/metadata/md5-cache/dev-util/objconv-2.32_pre20131127
+++ b/metadata/md5-cache/dev-util/objconv-2.32_pre20131127
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.32_pre20131127.zip
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=f5fe1988ea0adbdb8b803e1eb78aafe8
diff --git a/metadata/md5-cache/dev-util/objconv-2.42 b/metadata/md5-cache/dev-util/objconv-2.42
index 5d2175bc565a..552c6ff6c71e 100644
--- a/metadata/md5-cache/dev-util/objconv-2.42
+++ b/metadata/md5-cache/dev-util/objconv-2.42
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.42.zip
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=c0e490c690dae33abba236ceab00cd44
diff --git a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1 b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
index 665f8a7d40cd..302f899222f9 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
+++ b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=058d0191e54f3bd1020ef8aa4e16e8ef
diff --git a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r2 b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r2
index 73b5e8be66db..76638ee1d32c 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r2
+++ b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8637fb8984e49adf8faa2e352daa2aa
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.3.4 b/metadata/md5-cache/dev-util/pycharm-community-2018.3.4
new file mode 100644
index 000000000000..62b4b03d2e86
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 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	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=957aff7fa620c0baaffd152bfb9ae109
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4 b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4
new file mode 100644
index 000000000000..0d04ba137940
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 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	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e39fff5ac924ee8bc1c5e9d57e5efb4b
diff --git a/metadata/md5-cache/dev-util/re2c-1.1.1 b/metadata/md5-cache/dev-util/re2c-1.1.1
index 83ceabf4e19a..74c06c9736f2 100644
--- a/metadata/md5-cache/dev-util/re2c-1.1.1
+++ b/metadata/md5-cache/dev-util/re2c-1.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=6
 HOMEPAGE=http://re2c.org/
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~m68k ~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=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.1.1/re2c-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1bdb2b931370b6fdcde1a2541c0fc269
+_md5_=af80bcd7a354ca901a10f62d2f286ca1
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.2 b/metadata/md5-cache/dev-util/rebar-2.6.2
deleted file mode 100644
index 6f794eddb10a..000000000000
--- a/metadata/md5-cache/dev-util/rebar-2.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/erlang
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=5
-HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rebar/rebar/archive/2.6.2.tar.gz -> rebar-2.6.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b27666cbe1f75d97f60a6d27613c5ca8
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.3 b/metadata/md5-cache/dev-util/rebar-2.6.3
deleted file mode 100644
index 52121581a90b..000000000000
--- a/metadata/md5-cache/dev-util/rebar-2.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/erlang
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=5
-HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rebar/rebar/archive/2.6.3.tar.gz -> rebar-2.6.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=641033af55a3d240c64ba4d3e9b1d543
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.4 b/metadata/md5-cache/dev-util/rebar-2.6.4
index 0820942f6a3a..f3bd9518120d 100644
--- a/metadata/md5-cache/dev-util/rebar-2.6.4
+++ b/metadata/md5-cache/dev-util/rebar-2.6.4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/erlang
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=5
 HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rebar/rebar/archive/2.6.4.tar.gz -> rebar-2.6.4.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=498ea006289f6acc3368313a30910c5c
+_md5_=68c3d14ee4788e7f1107fed29e307b56
diff --git a/metadata/md5-cache/dev-util/scanmem-0.15.3 b/metadata/md5-cache/dev-util/scanmem-0.15.3
deleted file mode 100644
index 335b87e4237e..000000000000
--- a/metadata/md5-cache/dev-util/scanmem-0.15.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline:= >=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=Locate and modify variables in executing processes
-EAPI=5
-HOMEPAGE=https://github.com/scanmem/scanmem
-IUSE=gui python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/readline:= gui? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3 sys-auth/polkit )
-REQUIRED_USE=gui? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/scanmem/scanmem/archive/v0.15.3.tar.gz -> scanmem-0.15.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbd53e0a75cca7c43f8fe97645f5e466
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.8-r2 b/metadata/md5-cache/dev-util/sccache-0.2.8-r2
new file mode 100644
index 000000000000..12bb160330e8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sccache-0.2.8-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/cargo
+DEFINED_PHASES=compile configure install postinst test unpack
+DEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= )
+DESCRIPTION=ccache/distcc like tool with support for rust and cloud storage
+EAPI=7
+HOMEPAGE=https://github.com/mozilla/sccache/
+IUSE=azure dist-client dist-server gcs memcached redis s3 debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-client? ( sys-devel/icecream ) dist-server? ( sys-apps/bubblewrap )
+SLOT=0
+SRC_URI=https://github.com/mozilla/sccache/archive/0.2.8.tar.gz -> sccache-0.2.8.tar.gz https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.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/ar/0.6.1/download -> ar-0.6.1.crate https://crates.io/api/v1/crates/arc-swap/0.3.6/download -> arc-swap-0.3.6.crate https://crates.io/api/v1/crates/arraydeque/0.4.3/download -> arraydeque-0.4.3.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/ascii/0.9.1/download -> ascii-0.9.1.crate https://crates.io/api/v1/crates/assert_cmd/0.9.1/download -> assert_cmd-0.9.1.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/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.0.1/download -> bincode-1.0.1.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/buf_redux/0.6.3/download -> buf_redux-0.6.3.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/bytes/0.4.11/download -> bytes-0.4.11.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.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.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.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/combine/3.6.3/download -> combine-3.6.3.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.6.2/download -> crossbeam-deque-0.6.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.1/download -> crossbeam-epoch-0.6.1.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/crossbeam-utils/0.6.1/download -> crossbeam-utils-0.6.1.crate https://crates.io/api/v1/crates/daemonize/0.3.0/download -> daemonize-0.3.0.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/either/1.5.0/download -> either-1.5.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.10/download -> encoding_rs-0.8.10.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/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/flate2/1.0.5/download -> flate2-1.0.5.crate https://crates.io/api/v1/crates/flate2-crc/0.1.1/download -> flate2-crc-0.1.1.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.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/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/futures/0.1.25/download -> futures-0.1.25.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getopts/0.2.18/download -> getopts-0.2.18.crate https://crates.io/api/v1/crates/h2/0.1.13/download -> h2-0.1.13.crate https://crates.io/api/v1/crates/http/0.1.14/download -> http-0.1.14.crate https://crates.io/api/v1/crates/httparse/1.3.3/download -> httparse-1.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/hyper/0.11.27/download -> hyper-0.11.27.crate https://crates.io/api/v1/crates/hyper/0.12.16/download -> hyper-0.12.16.crate https://crates.io/api/v1/crates/hyper-tls/0.1.4/download -> hyper-tls-0.1.4.crate https://crates.io/api/v1/crates/hyper-tls/0.3.1/download -> hyper-tls-0.3.1.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/indexmap/1.0.2/download -> indexmap-1.0.2.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itertools/0.7.9/download -> itertools-0.7.9.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.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/jsonwebtoken/5.0.1/download -> jsonwebtoken-5.0.1.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/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.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.44/download -> libc-0.2.44.crate https://crates.io/api/v1/crates/libflate/0.1.18/download -> libflate-0.1.18.crate https://crates.io/api/v1/crates/libmount/0.1.11/download -> libmount-0.1.11.crate https://crates.io/api/v1/crates/linked-hash-map/0.2.1/download -> linked-hash-map-0.2.1.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lru-disk-cache/0.2.0/download -> lru-disk-cache-0.2.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memcached-rs/0.3.0/download -> memcached-rs-0.3.0.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.1.1/download -> memchr-2.1.1.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.12/download -> mime-0.3.12.crate https://crates.io/api/v1/crates/mime_guess/1.8.6/download -> mime_guess-1.8.6.crate https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download -> mime_guess-2.0.0-alpha.6.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/mio/0.6.16/download -> mio-0.6.16.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/multipart/0.13.6/download -> multipart-0.13.6.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/native-tls/0.2.2/download -> native-tls-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.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.1.43/download -> num-traits-0.1.43.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.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/number_prefix/0.2.8/download -> number_prefix-0.2.8.crate https://crates.io/api/v1/crates/openssl/0.10.15/download -> openssl-0.10.15.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.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-sys/0.9.39/download -> openssl-sys-0.9.39.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.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/phf/0.7.23/download -> phf-0.7.23.crate https://crates.io/api/v1/crates/phf_codegen/0.7.23/download -> phf_codegen-0.7.23.crate https://crates.io/api/v1/crates/phf_generator/0.7.23/download -> phf_generator-0.7.23.crate https://crates.io/api/v1/crates/phf_shared/0.7.23/download -> phf_shared-0.7.23.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/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/predicates/0.9.1/download -> predicates-0.9.1.crate https://crates.io/api/v1/crates/predicates-core/0.9.0/download -> predicates-core-0.9.0.crate https://crates.io/api/v1/crates/predicates-tree/0.9.0/download -> predicates-tree-0.9.0.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/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.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.3.15/download -> quote-0.3.15.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.3.22/download -> rand-0.3.22.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/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.2.2/download -> rand_core-0.2.2.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/redis/0.9.1/download -> redis-0.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.42/download -> redox_syscall-0.1.42.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.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.3/download -> regex-syntax-0.6.3.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-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/reqwest/0.8.8/download -> reqwest-0.8.8.crate https://crates.io/api/v1/crates/reqwest/0.9.5/download -> reqwest-0.9.5.crate https://crates.io/api/v1/crates/retry/0.4.0/download -> retry-0.4.0.crate https://crates.io/api/v1/crates/ring/0.13.2/download -> ring-0.13.2.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.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-serialize/0.3.24/download -> rustc-serialize-0.3.24.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/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework/0.2.1/download -> security-framework-0.2.1.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.2.1/download -> security-framework-sys-0.2.1.crate https://crates.io/api/v1/crates/selenium-rs/0.1.1/download -> selenium-rs-0.1.1.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.80/download -> serde-1.0.80.crate https://crates.io/api/v1/crates/serde_derive/1.0.80/download -> serde_derive-1.0.80.crate https://crates.io/api/v1/crates/serde_json/1.0.33/download -> serde_json-1.0.33.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.4/download -> serde_urlencoded-0.5.4.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.6/download -> signal-hook-0.1.6.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.1/download -> slab-0.4.1.crate https://crates.io/api/v1/crates/smallvec/0.6.6/download -> smallvec-0.6.6.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/string/0.1.2/download -> string-0.1.2.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.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.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.15.21/download -> syn-0.15.21.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tar/0.4.20/download -> tar-0.4.20.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.0.4/download -> tempfile-3.0.4.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/threadpool/1.7.1/download -> threadpool-1.7.1.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tokio/0.1.13/download -> tokio-0.1.13.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.4/download -> tokio-current-thread-0.1.4.crate https://crates.io/api/v1/crates/tokio-executor/0.1.5/download -> tokio-executor-0.1.5.crate https://crates.io/api/v1/crates/tokio-fs/0.1.4/download -> tokio-fs-0.1.4.crate https://crates.io/api/v1/crates/tokio-io/0.1.10/download -> tokio-io-0.1.10.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.3/download -> tokio-process-0.2.3.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.7/download -> tokio-reactor-0.1.7.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.2/download -> tokio-tcp-0.1.2.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.9/download -> tokio-threadpool-0.1.9.crate https://crates.io/api/v1/crates/tokio-timer/0.2.8/download -> tokio-timer-0.2.8.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.3/download -> tokio-udp-0.1.3.crate https://crates.io/api/v1/crates/tokio-uds/0.2.4/download -> tokio-uds-0.2.4.crate https://crates.io/api/v1/crates/toml/0.4.9/download -> toml-0.4.9.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.1.0/download -> try-lock-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.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/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.2.0/download -> unicase-2.2.0.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.0.4/download -> unicode-xid-0.0.4.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/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.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/uuid/0.6.5/download -> uuid-0.6.5.crate https://crates.io/api/v1/crates/uuid/0.7.1/download -> uuid-0.7.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.5/download -> version_check-0.1.5.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/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/want/0.0.4/download -> want-0.0.4.crate https://crates.io/api/v1/crates/want/0.0.6/download -> want-0.0.6.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-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 https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/which/2.0.0/download -> which-2.0.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=0e175212cfed990a1bfd6d3c625efdfb
diff --git a/metadata/md5-cache/dev-util/staruml-bin-2.8.1 b/metadata/md5-cache/dev-util/staruml-bin-2.8.1
index 118aea2d36ff..ec40e1111cfb 100644
--- a/metadata/md5-cache/dev-util/staruml-bin-2.8.1
+++ b/metadata/md5-cache/dev-util/staruml-bin-2.8.1
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt:11 dev-li
 RESTRICT=bindist mirror splitdebug
 SLOT=0
 SRC_URI=amd64? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-64-bit.deb ) x86? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-32-bit.deb )
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=f88703aaea0c8ba5f68dceb137f9216d
diff --git a/metadata/md5-cache/dev-util/strace-4.25 b/metadata/md5-cache/dev-util/strace-4.25
index 128d4eb113b8..979c2ee9e748 100644
--- a/metadata/md5-cache/dev-util/strace-4.25
+++ b/metadata/md5-cache/dev-util/strace-4.25
@@ -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.25/strace-4.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39a84163c05367c396fd355e44783b8a
+_md5_=e5dbb0228f4044cc2f807d29534e443c
diff --git a/metadata/md5-cache/dev-util/uftrace-0.8.3 b/metadata/md5-cache/dev-util/uftrace-0.8.3
deleted file mode 100644
index a7550e748833..000000000000
--- a/metadata/md5-cache/dev-util/uftrace-0.8.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Function (graph) tracer for user-space
-EAPI=6
-HOMEPAGE=https://github.com/namhyung/uftrace
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/namhyung/uftrace/archive/v0.8.3.tar.gz -> uftrace-0.8.3.tar.gz
-_md5_=fbe75c601d123c19addc0984364207ee
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.1.92.0 b/metadata/md5-cache/dev-util/vulkan-tools-1.1.92.0
index 42395c242793..e5cb0b451836 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.1.92.0
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.1.92.0
@@ -4,10 +4,10 @@ DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 IUSE=+cube +vulkaninfo X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e.tar.gz -> vulkan-tools-1.1.92.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a0882f70ee7f3451a10729c1dd933946
+_md5_=3b7c0d03efcee3ee789aa266f8fb64d8
diff --git a/metadata/md5-cache/dev-util/waf-1.9.8 b/metadata/md5-cache/dev-util/waf-1.9.8
deleted file mode 100644
index 0c2e33b14332..000000000000
--- a/metadata/md5-cache/dev-util/waf-1.9.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
-DESCRIPTION=piece of software used to help building software projects
-EAPI=6
-HOMEPAGE=https://waf.io/
-IUSE=examples
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://waf.io/waf-1.9.8.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5f72002af402e2579d1e813dde109ca5
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3d84f7e92cca..9f7ae851fc8d 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/bzr-2.5.1-r1 b/metadata/md5-cache/dev-vcs/bzr-2.5.1-r1
deleted file mode 100644
index 24a71d554139..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-2.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,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://launchpad.net/bzr/2.5/2.5.1/+download/bzr-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=798f2fa30ea55651ff7d1c68ab5a5012
diff --git a/metadata/md5-cache/dev-vcs/bzr-2.6.0 b/metadata/md5-cache/dev-vcs/bzr-2.6.0
deleted file mode 100644
index b5b3ff221736..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyftpdlib-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit >=dev-python/testtools-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar is a next generation distributed version control system
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/
-IUSE=curl doc +sftp test python_targets_python2_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 ~m68k-mint ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sftp? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl,xml] ) >=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://launchpad.net/bzr/2.6/2.6.0/+download/bzr-2.6.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2426a46aba3b2e381fbfdb2568c49652
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
deleted file mode 100644
index 1529ed6760a6..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-DESCRIPTION=Concurrent Versions System - source code revision control tools
-EAPI=6
-HOMEPAGE=http://cvs.nongnu.org/
-IUSE=crypt doc kerberos nls pam server
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e7820a687d58c006419933d8000fb57
diff --git a/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44 b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44
deleted file mode 100644
index b21ad4e1730b..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs-fast-export-1.44
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/asciidoc
-DESCRIPTION=fast-export history from a CVS repository or RCS collection
-EAPI=7
-HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.44.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6ee3676ee4c2d600239e6c0f28aaa801
diff --git a/metadata/md5-cache/dev-vcs/cvsgraph-1.6.1 b/metadata/md5-cache/dev-vcs/cvsgraph-1.6.1
deleted file mode 100644
index ceec8cd9feea..000000000000
--- a/metadata/md5-cache/dev-vcs/cvsgraph-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-DESCRIPTION=CVS/RCS repository grapher
-EAPI=0
-HOMEPAGE=http://www.akhphd.au.dk/~bertho/cvsgraph
-IUSE=gif jpeg nls png truetype zlib
-KEYWORDS=-alpha amd64 -ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
-SLOT=0
-SRC_URI=http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.6.1.tar.gz
-_md5_=7cfdeb9f3f5c3d8ed444b2de752e7c81
diff --git a/metadata/md5-cache/dev-vcs/cvsutils-0.2.5 b/metadata/md5-cache/dev-vcs/cvsutils-0.2.5
deleted file mode 100644
index c1117812d1c0..000000000000
--- a/metadata/md5-cache/dev-vcs/cvsutils-0.2.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A small bundle of utilities to work with CVS repositories
-EAPI=0
-HOMEPAGE=https://www.red-bean.com/cvsutils/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://www.red-bean.com/cvsutils/releases/cvsutils-0.2.5.tar.gz
-_md5_=82bb107491b182b600fd762f0c47aced
diff --git a/metadata/md5-cache/dev-vcs/easygit-1.6.5.5 b/metadata/md5-cache/dev-vcs/easygit-1.6.5.5
deleted file mode 100644
index b52dcbff1d35..000000000000
--- a/metadata/md5-cache/dev-vcs/easygit-1.6.5.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Easy GIT is a wrapper for git, designed to make git easy to learn and use
-EAPI=2
-HOMEPAGE=https://www.gnome.org/~newren/eg/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.5.5 dev-lang/perl
-SLOT=0
-SRC_URI=https://www.gnome.org/~newren/eg/download/1.6.5.5/eg -> easygit-1.6.5.5
-_md5_=8fea7b2fbbf78e2f0c85ef0306b3fd1a
diff --git a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024 b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
index dbc50e17f14e..80063494413c 100644
--- a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
+++ b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl dev-vcs/git virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes virtual/perl-Memoize virtual/perl-Data-Dumper dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/git-deploy/git-deploy/archive/e9ef93debd12d85e70676dd79b4bd78ac2b05271.tar.gz -> git-deploy-6.0.1_p20131024.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2595ebf2113dcc247d9db84fb4dbb708
diff --git a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
index 7c4441a7367c..33eda5ea715a 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://milki.github.com/gitolite/gitolite-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=632193f2683943d270c1ad331881a2a7
diff --git a/metadata/md5-cache/dev-vcs/gitolite-9999 b/metadata/md5-cache/dev-vcs/gitolite-9999
index 718135f7dee1..83f6599780e8 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-9999
+++ b/metadata/md5-cache/dev-vcs/gitolite-9999
@@ -7,5 +7,5 @@ IUSE=selinux tools vim-syntax
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=883267c8fb9acfbe3e944412b315e854
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
index d8469e6e0333..ae94a56b7ce7 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9cc21e49fa01d38e0a3d6123bf7c8970
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
index d9f82cddb3e9..c1b501e3a998 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1e9def179748d97c522f9c8b77bf364a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
index 26b60abe8b3e..846806d46eb8 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.5.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
index 4601776a25a1..b613918215e4 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
index 78729d95b353..2991001e67b3 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
index d4b4ce589b7b..8fc8022788a8 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
index 4dfad61333cf..7c9e26976a5e 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
index da3d75e89154..d6f5c544231b 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
index 951e06056f8e..27a495a84d5f 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
index a9ad3b546a32..8f8524ca2e20 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
index b243e2295a7d..3f96a0ed7f47 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
index 1c7436e56884..f53459fe1ccf 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
index b172800178e6..ec9b015f4bc6 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
index 4c5db4968dff..38d60a0174cb 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
index d5e4c9695d81..bba57d3e07cf 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
index 3adcd0705d07..6969b2295a29 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
index 9230cf1ac0bb..64f390e3e448 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-9999 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-9999
index 4a91588fae98..292bb13c2d1c 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-9999
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-9999
@@ -7,5 +7,5 @@ IUSE=selinux tools vim-syntax
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.4 b/metadata/md5-cache/dev-vcs/subversion-1.10.4
index 0f3494620960..1e2907b09c16 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.4
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.10.4.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=632aacae70317e7f1864e5ea56a43c3c
+_md5_=0ca00e610f8dfc0652239cb58274878b
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.8.2 b/metadata/md5-cache/dev-vcs/tortoisehg-4.8.2
new file mode 100644
index 000000000000..894c823cd5fb
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.8.2
@@ -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 postinst prepare test
+DEPEND=>=dev-vcs/mercurial-4.7 <dev-vcs/mercurial-4.9 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 )
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=7
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-4.7 <dev-vcs/mercurial-4.9 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),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://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.8.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ff538ee567066eca6e23f8ef6aaa002c
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 6089f92a6050..acb4f75efb84 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/beathazardultra-20130308-r1 b/metadata/md5-cache/games-action/beathazardultra-20130308-r1
index 2748f29c3350..aede068bfdba 100644
--- a/metadata/md5-cache/games-action/beathazardultra-20130308-r1
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( !bundled-libs? ( >=media-libs/libpng-1.2.51:1.2[
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=beathazard-installer_03-08-13
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a5d3da24b1736c56cccecbd7bb6aea4
diff --git a/metadata/md5-cache/games-action/brutal-legend-20130615-r2 b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
index d7921fda519d..b1cede99aab0 100644
--- a/metadata/md5-cache/games-action/brutal-legend-20130615-r2
+++ b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -9,5 +9,5 @@ RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[ab
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f66cd8c0b5e0873f5522e473af871f1
diff --git a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1 b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
index 988ff1efcebc..ad47481ff3be 100644
--- a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
+++ b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
@@ -8,5 +8,5 @@ LICENSE=free-noncomm
 RDEPEND=!games-action/descent1-data
 SLOT=0
 SRC_URI=http://icculus.org/d2x/data/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=eccd090b8ffa2f31c6dfd19a3a50b6bf
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 32671dd7664b..2cbac3a2023d 100644
--- a/metadata/md5-cache/games-action/descent3-1.4.0b-r2
+++ b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc media-libs/libsdl[abi_x86_32(-)] media-libs/smpeg[abi_x86
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1821063d044737b4f5a786ed553873d
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
index f659b8fc83e5..b75656e0bf9c 100644
--- a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+++ b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( alsa pulseaudio )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=58131cf0997822fa065e4972f63a49f4
diff --git a/metadata/md5-cache/games-action/heretic2-1.06c-r1 b/metadata/md5-cache/games-action/heretic2-1.06c-r1
index 765017fc578f..1186e31743e7 100644
--- a/metadata/md5-cache/games-action/heretic2-1.06c-r1
+++ b/metadata/md5-cache/games-action/heretic2-1.06c-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-lib
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=905ed7b1bbb2f0f660e5951851aa7808
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a b/metadata/md5-cache/games-action/heretic2-demo-1.06a
index 039f5d7d2056..e06c175462b2 100644
--- a/metadata/md5-cache/games-action/heretic2-demo-1.06a
+++ b/metadata/md5-cache/games-action/heretic2-demo-1.06a
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-mis
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6926969b65dd6d775746911f10da0946
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 199ba77e3b79..a4a79eab4aa7 100644
--- a/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1
+++ b/metadata/md5-cache/games-action/mutantstorm-demo-1.33-r1
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/lib-compat x11-libs/libX11[abi
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=268ab149ced8cc0ea43d4e99cb83ad59
diff --git a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
index 3947c5c2b6b3..4da84d1d9a7a 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=shadowgroundsUpdate1.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d14977c0a1f03388129186d3c494c0e7
diff --git a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
index 3283a716d5ff..e340e5bbcaf1 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=survivorUpdate1.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=301ea84d794019a8b67ddf2d7842ac12
diff --git a/metadata/md5-cache/games-action/spacetripper-demo-1-r1 b/metadata/md5-cache/games-action/spacetripper-demo-1-r1
index f73963ce4685..19e61f034935 100644
--- a/metadata/md5-cache/games-action/spacetripper-demo-1-r1
+++ b/metadata/md5-cache/games-action/spacetripper-demo-1-r1
@@ -8,5 +8,5 @@ RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.btinternet.com/~bongpig/spacetripperdemo.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ba598f0a211a99a37b1ebf89a2426b3
diff --git a/metadata/md5-cache/games-action/super-hexagon-20160217 b/metadata/md5-cache/games-action/super-hexagon-20160217
index be9e9234d4a1..384a0849d257 100644
--- a/metadata/md5-cache/games-action/super-hexagon-20160217
+++ b/metadata/md5-cache/games-action/super-hexagon-20160217
@@ -9,5 +9,5 @@ RDEPEND=media-libs/glew:1.6 media-libs/libsdl2[opengl,sound,video] media-libs/li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=superhexagon-02172016-bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d840f70659ed17da18ff73178fc9b9d
diff --git a/metadata/md5-cache/games-action/trine-1.08-r3 b/metadata/md5-cache/games-action/trine-1.08-r3
index ee062cf8bc89..cec185a7457d 100644
--- a/metadata/md5-cache/games-action/trine-1.08-r3
+++ b/metadata/md5-cache/games-action/trine-1.08-r3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=medi
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index b4cb18d0d243..29691c7924b7 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1 b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
index 3edf8df43cf1..8705f8b1fde3 100644
--- a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
+++ b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[
 RESTRICT=strip fetch bindist
 SLOT=0
 SRC_URI=aquaria-lnx-humble-bundle.mojo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb5af0371671120fe9957f6929ca1b7d
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
index 2ea0ab214627..a4d962a1dc69 100644
--- a/metadata/md5-cache/games-arcade/gunocide2ex-1.0
+++ b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c962a3e92501cec0c8378651b0c50b8
diff --git a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3 b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
index 6638ae94f953..5b2a7be4d982 100644
--- a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
+++ b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[video,joystick,abi_x86_32(-)] media-libs/libogg[abi_x8
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v1.1.sh.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=72494249f263f835f73c50334e10ecf7
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 32a1e469809a..3952dc84c5c1 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/pysolfc-2.4.0 b/metadata/md5-cache/games-board/pysolfc-2.4.0
deleted file mode 100644
index 458c11ed09ee..000000000000
--- a/metadata/md5-cache/games-board/pysolfc-2.4.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[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=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 exciting collection of more than 1000 solitaire card games
-EAPI=6
-HOMEPAGE=http://pysolfc.sourceforge.net/
-IUSE=extra-cardsets minimal +sound python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] ) python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] ) !minimal? ( dev-python/pillow[tk,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python2_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[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=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/shlomif/PySolFC/archive/pysolfc-2.4.0.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/archive/pysolfc-2.4.0/PySolFC-Cardsets-2.0.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24a89761b332df48fe9353ece29874c6
diff --git a/metadata/md5-cache/games-board/pysolfc-2.4.0-r1 b/metadata/md5-cache/games-board/pysolfc-2.4.0-r1
new file mode 100644
index 000000000000..3b9f82724cdc
--- /dev/null
+++ b/metadata/md5-cache/games-board/pysolfc-2.4.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six 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] ) >=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 exciting collection of more than 1000 solitaire card games
+EAPI=6
+HOMEPAGE=http://pysolfc.sourceforge.net/
+IUSE=extra-cardsets minimal +sound python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/six python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] ) python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] ) !minimal? ( dev-python/pillow[tk,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python2_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[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=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/shlomif/PySolFC/archive/pysolfc-2.4.0.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/archive/pysolfc-2.4.0/PySolFC-Cardsets-2.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7258a1501fc712b36c8eb93f44e34cb0
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 394ade717310..ad3de5dbaedd 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/mgba-0.6.1 b/metadata/md5-cache/games-emulation/mgba-0.6.1
deleted file mode 100644
index c19046d9a762..000000000000
--- a/metadata/md5-cache/games-emulation/mgba-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A new Game Boy Advance emulator written in C.
-EAPI=6
-HOMEPAGE=https://mgba.io
-IUSE=debug ffmpeg imagemagick opengl qt5 +sdl
-KEYWORDS=amd64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
-SLOT=0
-SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.1.tar.gz -> mgba-0.6.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb51b11aad2a0c3ee662457844b6e596
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.2 b/metadata/md5-cache/games-emulation/mgba-0.6.2
deleted file mode 100644
index 3ba30ad63f75..000000000000
--- a/metadata/md5-cache/games-emulation/mgba-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Game Boy Advance emulator written in C
-EAPI=6
-HOMEPAGE=https://mgba.io
-IUSE=debug ffmpeg imagemagick opengl qt5 +sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
-SLOT=0
-SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.2.tar.gz -> mgba-0.6.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aee0ccda218d041500929ee673c699f9
diff --git a/metadata/md5-cache/games-emulation/mgba-0.6.3 b/metadata/md5-cache/games-emulation/mgba-0.6.3
index 1ddcd08577b9..fb586fe97b8d 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.6.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Game Boy Advance emulator written in C
 EAPI=6
 HOMEPAGE=https://mgba.io
 IUSE=debug ffmpeg imagemagick libav opengl qt5 +sdl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.3.tar.gz -> mgba-0.6.3.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2ecf6303963c42b6d16a59507db045fd
+_md5_=00b1830ce815a8a3ae40c6c7d1fd06f9
diff --git a/metadata/md5-cache/games-emulation/mgba-0.7.0 b/metadata/md5-cache/games-emulation/mgba-0.7.0
new file mode 100644
index 000000000000..d664e370b928
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/mgba-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Game Boy Advance emulator written in C
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.7.0.tar.gz -> mgba-0.7.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8c7fd1f4c5e7db09df74c3008cec388f
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 60b696f4d669..73d43d62ddc6 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/darkplaces-20140513-r1 b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
index ae88b67877f5..c0460458478a 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20140513-r1
+++ b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20140513.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4abef158208be99ef6fe60c6411e1b6a
diff --git a/metadata/md5-cache/games-fps/doom3-1.3.1304-r1 b/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
index 89f87402821b..e0d941782290 100644
--- a/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
+++ b/metadata/md5-cache/games-fps/doom3-1.3.1304-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) !dedicated? ( >=virtu
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/doom3/linux/doom3-linux-1.3.1.1304.x86.run http://zerowing.idsoftware.com/linux/doom3.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7a3f637ca3e36de5568b97b1f102269
diff --git a/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1 b/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
index dbbb4dbb7638..283923a4f268 100644
--- a/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
+++ b/metadata/md5-cache/games-fps/doom3-demo-1.1.1286-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib]
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://3dgamers/doom3/doom3-linux-1.1.1286-demo.x86.run mirror://idsoftware/doom3/linux/doom3-linux-1.1.1286-demo.x86.run mirror://gentoo/doom3.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a89f37da431330eac152a7ed57772e25
diff --git a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4 b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
index 7d6129f86d58..82123f0f540d 100644
--- a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
+++ b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=mirror bindist gog? ( fetch )
 SLOT=0
 SRC_URI=gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86c985c1fb71ae7af49a477d7a05f703
diff --git a/metadata/md5-cache/games-fps/eduke32-20181010.7067 b/metadata/md5-cache/games-fps/eduke32-20181010.7067
deleted file mode 100644
index 35abf4d981f9..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20181010.7067
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm test unpack
-DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=6
-HOMEPAGE=http://www.eduke32.com/
-IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
-REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20181010-7067/eduke32_src_20181010-7067.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cc41d08587b86dd70f017ba154a08a77
diff --git a/metadata/md5-cache/games-fps/eduke32-20190123.7318 b/metadata/md5-cache/games-fps/eduke32-20190123.7318
new file mode 100644
index 000000000000..ccf1c0a46dee
--- /dev/null
+++ b/metadata/md5-cache/games-fps/eduke32-20190123.7318
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm test unpack
+DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4
+DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
+EAPI=6
+HOMEPAGE=http://www.eduke32.com/
+IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BUILDLIC GPL-2 HRP
+RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
+REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
+SLOT=0
+SRC_URI=http://dukeworld.com/eduke32/synthesis/20190123-7318/eduke32_src_20190123-7318.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6ad05157f342c5ba9ccac2452b234498
diff --git a/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1 b/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
index 0664e97202e5..d3ce7589395f 100644
--- a/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
+++ b/metadata/md5-cache/games-fps/enemy-territory-2.60b-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run mirror://idsoftware/et/linux/et-linux-2.60.x86.run ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run mirror://idsoftware/et/ET-2.60b.zip dedicated? ( https://dev.gentoo.org/~wolf31o2/sources/dump/enemy-territory-all-0.1.tar.bz2 mirror://gentoo/enemy-territory-all-0.1.tar.bz2 )
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b30681b28f222523900f9312c0dc4ac8
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
index bfcf2fdaab18..890800ede505 100644
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=32b3bfa88d8d86bf8bed408168861f9b
diff --git a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2 b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
index c7c97d38cd27..900330ff34ac 100644
--- a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
+++ b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adob
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://legendsthegame.net/files/legends_linux-0.4.1.43.run mirror://gentoo/legends.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd5481e39a51bd057b18ba8b2d615422
diff --git a/metadata/md5-cache/games-fps/postal2-1409.2-r2 b/metadata/md5-cache/games-fps/postal2-1409.2-r2
index 4ad7029b3312..dad833f9cd67 100644
--- a/metadata/md5-cache/games-fps/postal2-1409.2-r2
+++ b/metadata/md5-cache/games-fps/postal2-1409.2-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib]
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.1.run http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.2.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec8ab791af686173d8d0ce9e04a25e0e
diff --git a/metadata/md5-cache/games-fps/quake2-data-3.20 b/metadata/md5-cache/games-fps/quake2-data-3.20
index ebe352cc4284..435284f78a05 100644
--- a/metadata/md5-cache/games-fps/quake2-data-3.20
+++ b/metadata/md5-cache/games-fps/quake2-data-3.20
@@ -10,5 +10,5 @@ PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-3.20-x86-full-ctf.exe
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd31d09fe4b1001a0193f0bc9a902b70
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index a828bff7a039..c4fe71342947 100644
--- a/metadata/md5-cache/games-fps/quake2-demodata-3.14
+++ b/metadata/md5-cache/games-fps/quake2-demodata-3.14
@@ -9,5 +9,5 @@ LICENSE=quake2-demodata
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=214729a3ef4c229b66724ff28a6f54b7
diff --git a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2 b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
index 3dc3c6a53b46..94b947b4a8cd 100644
--- a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
+++ b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fp
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0bc945e7234ec4dacfaa4b2c9811139
diff --git a/metadata/md5-cache/games-fps/quake3-data-1.32b b/metadata/md5-cache/games-fps/quake3-data-1.32b
index f0d24ce305e5..e1f6858d48c2 100644
--- a/metadata/md5-cache/games-fps/quake3-data-1.32b
+++ b/metadata/md5-cache/games-fps/quake3-data-1.32b
@@ -9,5 +9,5 @@ PROPERTIES=cdinstall? ( interactive )
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f357e93cf472b179787f6862478396d
diff --git a/metadata/md5-cache/games-fps/quake3-demo-1.11-r1 b/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
index 79294d09be56..7e475ba83094 100644
--- a/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
+++ b/metadata/md5-cache/games-fps/quake3-demo-1.11-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh mirror://3dgamers/quake3arena/linuxq3ademo-1.11-6.x86.gz.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39f907c1aceb7d2895b6322b49310e27
diff --git a/metadata/md5-cache/games-fps/quake3-teamarena-1.32b b/metadata/md5-cache/games-fps/quake3-teamarena-1.32b
index f76fdc8a5bf3..e17b3ed0e744 100644
--- a/metadata/md5-cache/games-fps/quake3-teamarena-1.32b
+++ b/metadata/md5-cache/games-fps/quake3-teamarena-1.32b
@@ -9,5 +9,5 @@ PROPERTIES=cdinstall? ( interactive )
 RDEPEND=|| ( games-fps/quake3 games-fps/quake3-bin ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=781022a5b6ca7f7a7aaab9ddb8c9faa3
diff --git a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r2 b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r2
index c4272e4d3211..c39ab536fd64 100644
--- a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r2
+++ b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) sys-libs/zlib[abi_x86
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/linux/quake4-linux-1.4.2.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=94127d03eb70d4a3dc1dcabc7170f71d
diff --git a/metadata/md5-cache/games-fps/quake4-demo-1.0-r2 b/metadata/md5-cache/games-fps/quake4-demo-1.0-r2
index fd37c3fa2e47..a4365a7fd7c4 100644
--- a/metadata/md5-cache/games-fps/quake4-demo-1.0-r2
+++ b/metadata/md5-cache/games-fps/quake4-demo-1.0-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib]
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/demo/quake4-linux-1.0-demo.x86.run http://www.3ddownloads.com/Action/Quake%204/Demos/quake4-linux-1.0-demo.x86.run mirror://3dgamers/quake4/quake4-linux-1.0-demo.x86.run http://filebase.gmpf.de/quake4/quake4-linux-1.0-demo.x86.run http://www.holarse.de/mirror/quake4-linux-1.0-demo.x86.run http://sonic-lux.net/data/mirror/quake4/quake4-linux-1.0-demo.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e710089ebe7d62a97fc515e672694616
diff --git a/metadata/md5-cache/games-fps/rtcw-1.41b b/metadata/md5-cache/games-fps/rtcw-1.41b
index 775f3dc3c574..5497b834431f 100644
--- a/metadata/md5-cache/games-fps/rtcw-1.41b
+++ b/metadata/md5-cache/games-fps/rtcw-1.41b
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc sys-libs/lib-compat dedicated? ( app-misc/screen ) !dedic
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run mirror://idsoftware/wolf/linux/wolf-linux-1.41b.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f959ed9d4a098fc519309832652691a1
diff --git a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r2 b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r2
index b3dda550450d..cb04aa5e40bf 100644
--- a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r2
+++ b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5318669bed5f2b9339dc5d8b0bc1bbca
diff --git a/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r2 b/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r2
index f01015b01357..8c07a43c7d80 100644
--- a/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r2
+++ b/metadata/md5-cache/games-fps/rtcwsp-demo-1.1b-r2
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x8
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/wolf/linux/old/wolfspdemo-linux-1.1b.x86.run mirror://3dgamers/returnwolfenstein/wolfspdemo-linux-1.1b.x86.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=daeeb52c33097a3e18eabe31a3c8a722
diff --git a/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3 b/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
index 5ba71949edbf..b2fe8a9c2f5b 100644
--- a/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
+++ b/metadata/md5-cache/games-fps/serious-sam-tfe-1_beta3
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] vir
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://icculus.org/betas/ssam/ssam-tfe-lnx-beta1a.run http://icculus.org/updates/ssam/ssamtfe-beta1b.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta2.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta3.sh.bin
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd6348c7eceb244460f5c53fd1cd6183
diff --git a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1 b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
index 60337aaa5527..9055aa8fd56f 100644
--- a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
+++ b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[X
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://icculus.org/betas/ssam/ssamtse-beta1.sh.bin
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=791387b5240eff0300b7e6a24ab895c5
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index bff1f0f83a18..b699f0113db1 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x8
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=67072d9e842a580585df909382e9b4f6
diff --git a/metadata/md5-cache/games-fps/tribes2-25034 b/metadata/md5-cache/games-fps/tribes2-25034
index 8ca296e53501..7e7dc9517987 100644
--- a/metadata/md5-cache/games-fps/tribes2-25034
+++ b/metadata/md5-cache/games-fps/tribes2-25034
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc games-util/loki_patch virtual/opengl games-misc/games-env
 RESTRICT=mirror 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfa29ee226650165e704480f0e524231
diff --git a/metadata/md5-cache/games-fps/unreal-226 b/metadata/md5-cache/games-fps/unreal-226
index 64054c39451c..9507edea1287 100644
--- a/metadata/md5-cache/games-fps/unreal-226
+++ b/metadata/md5-cache/games-fps/unreal-226
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.icculus.org/%7Echunky/ut/unreal/unreali-install.run ftp://ftp.lokigames.com/pub/patches/ut/ut-install-436.run ftp://ftp.lokigames.com/pub/patches/ut/IpDrv-436-Linux-08-20-02.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d89e2d01a84ce9f97b8cec5e8d09b387
diff --git a/metadata/md5-cache/games-fps/unreal-tournament-451 b/metadata/md5-cache/games-fps/unreal-tournament-451
index f36d079bdd33..cfe482219b47 100644
--- a/metadata/md5-cache/games-fps/unreal-tournament-451
+++ b/metadata/md5-cache/games-fps/unreal-tournament-451
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.ut-files.com/Patches/ut-install-436.run http://www.ut-files.com/Patches/utpgpatch451.tar.bz2 -> UTPGPatch451.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d967ca4976051268817eaeaf17bd35f7
diff --git a/metadata/md5-cache/games-fps/unreal-tournament-goty-451 b/metadata/md5-cache/games-fps/unreal-tournament-goty-451
index 471eed9b9038..a501f9edf254 100644
--- a/metadata/md5-cache/games-fps/unreal-tournament-goty-451
+++ b/metadata/md5-cache/games-fps/unreal-tournament-goty-451
@@ -10,5 +10,5 @@ RDEPEND=opengl? ( virtual/opengl[abi_x86_32(-)] ) >=media-libs/libsdl-1.2.15-r5[
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.ut-files.com/Patches/ut-install-436-GOTY.run http://www.ut-files.com/Patches/utpgpatch451.tar.bz2 -> UTPGPatch451.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45057e462144412bcf28a3db7caecf58
diff --git a/metadata/md5-cache/games-fps/ut2003-data-2107 b/metadata/md5-cache/games-fps/ut2003-data-2107
index 715a75b5202f..0f9d261e8ac2 100644
--- a/metadata/md5-cache/games-fps/ut2003-data-2107
+++ b/metadata/md5-cache/games-fps/ut2003-data-2107
@@ -10,5 +10,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=41fea78d1a305b47e6af75e5cf5ce9d7
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
index 7f91a0d541b4..7c9f482dc06c 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/bc virtual/libstdc++:3.3 virtual/opengl[abi_x86_32(-)] x11-lib
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08e87ed02db549ad455172c0b896f12d
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r4 b/metadata/md5-cache/games-fps/ut2004-data-3186-r4
index 9ed9ef13ceb2..131d8b9da45b 100644
--- a/metadata/md5-cache/games-fps/ut2004-data-3186-r4
+++ b/metadata/md5-cache/games-fps/ut2004-data-3186-r4
@@ -9,5 +9,5 @@ PDEPEND=games-fps/ut2004
 PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d5b0504a4fb75a5ff3a76225798499d
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334 b/metadata/md5-cache/games-fps/ut2004-demo-3334
index 0891ce7ece99..67e1063e640a 100644
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334
@@ -8,5 +8,5 @@ RDEPEND=virtual/libstdc++:3.3 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[ab
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c15c31e344aaf6bafb95565e084377bf
diff --git a/metadata/md5-cache/games-fps/ut2004-hamsterbash-1 b/metadata/md5-cache/games-fps/ut2004-hamsterbash-1
index a82f581b4a8a..8e39c2f18591 100644
--- a/metadata/md5-cache/games-fps/ut2004-hamsterbash-1
+++ b/metadata/md5-cache/games-fps/ut2004-hamsterbash-1
@@ -10,5 +10,5 @@ RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fp
 RESTRICT=fetch
 SLOT=0
 SRC_URI=HamsterBashFinal.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	717d443e8308768de4178537c370a7ab	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	717d443e8308768de4178537c370a7ab	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03790f6d7d92a9c1e6f2e1b11a16e805
diff --git a/metadata/md5-cache/games-fps/ut2004-muralis-1.15 b/metadata/md5-cache/games-fps/ut2004-muralis-1.15
index e2454962c349..3bd42c694519 100644
--- a/metadata/md5-cache/games-fps/ut2004-muralis-1.15
+++ b/metadata/md5-cache/games-fps/ut2004-muralis-1.15
@@ -10,5 +10,5 @@ RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fp
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://ut.rushbase.net/beyondunreal/mods/muralis-v1.15-zip.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	717d443e8308768de4178537c370a7ab	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	games-mods	717d443e8308768de4178537c370a7ab	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=25f0e773d2d0a5113c32a0788c2c68c4
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 99cbc25b5b14..655b3824c0a3 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
index 087836af54e5..675da5570b90 100644
--- a/metadata/md5-cache/games-misc/little-inferno-20130509
+++ b/metadata/md5-cache/games-misc/little-inferno-20130509
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=LittleInferno-20130509.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.8.24110 b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.8.24110
index c781839c4af0..b8fb88cca9b5 100644
--- a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.8.24110
+++ b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.8.24110
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/l
 RESTRICT=bindist fetch mirror strip test
 SLOT=0
 SRC_URI=ftl_advanced_edition_1_6_8_24110.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=b4da37a6b94b882c26beec6f4fa106ef
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 6af5e3113451..b0dcd09d9ffb 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 008f338f37a0..aaa23150f41f 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/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
index 197c82ae5d84..19804aadcc85 100644
--- a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=avadon-linux-1331768904-bin.txt
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
index a0efed87e490..3f765b5f6882 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/op
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65500b856f2345f63f8f4cd12ae4ec10
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
index 3d21e8cac11e..e1c99dc92ce7 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/openssl:0 media-libs/openal virtual/opengl x11-l
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=baldur_s_gate_enhanced_edition_en_2_5_23121.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=598afa2d1f029fe5e055724027221692
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620-r1 b/metadata/md5-cache/games-rpg/bastion-20120620-r1
index 99a973425ba7..4ca88df9d46d 100644
--- a/metadata/md5-cache/games-rpg/bastion-20120620-r1
+++ b/metadata/md5-cache/games-rpg/bastion-20120620-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl media-libs/freealut media-libs/openal media-libs/sdl-gfx
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Bastion-HIB-2012-06-20.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fc50abe73edec72ec06215d7f908e2e7
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index 21051827d36e..eba0768af587 100644
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dearesther-linux-06082013-bin
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=084f7f23b5d0c53c7935efcb6c5721ac
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
index 7b2e3d5a37c9..d43d5e14bfc7 100644
--- a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
+++ b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
@@ -10,5 +10,5 @@ RDEPEND=x11-misc/xdg-utils >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dundef-linux-03052013.mojo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8ddf39a8fdfb58565bd40972d0faba6
diff --git a/metadata/md5-cache/games-rpg/grimrock-20150707 b/metadata/md5-cache/games-rpg/grimrock-20150707
index 28eced16022f..a68d3fcaf82d 100644
--- a/metadata/md5-cache/games-rpg/grimrock-20150707
+++ b/metadata/md5-cache/games-rpg/grimrock-20150707
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=Grimrock-Linux-2015-07-07.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2 b/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
index 91fba1f2d7ae..87a686657f63 100644
--- a/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
+++ b/metadata/md5-cache/games-rpg/runescape-launcher-2.2.4-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:1.2 >=media-libs/libsdl2-2.0.2 media-libs/glew:1.10 >=
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://content.runescape.com/downloads/ubuntu/pool/non-free/r/runescape-launcher/runescape-launcher_2.2.4_amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3653bae47f573ec76a265f1a67ba374
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index bb2f9e04a553..8cae04ae677b 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0
@@ -10,5 +10,5 @@ RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joyst
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=ToTheMoon_linux_1389114090.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d796de3135b68c4476d2dd1126a87fa2
diff --git a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1 b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
index ea7a1e3172fe..d8d09d2bde1e 100644
--- a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
+++ b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl x11-libs/gtk+:2
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh -> vendetta-online-bin-1.8.296-amd64.sh ) x86? ( http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh -> vendetta-online-bin-1.8.296-x86.sh )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ecd9b8cd52f2cda7ce97600d0114510a
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index fd869e63fa9f..4db7c72e9ca5 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/bf1942-lnxded-1.61-r1 b/metadata/md5-cache/games-server/bf1942-lnxded-1.61-r1
index 2595846bb3de..043f80c90e33 100644
--- a/metadata/md5-cache/games-server/bf1942-lnxded-1.61-r1
+++ b/metadata/md5-cache/games-server/bf1942-lnxded-1.61-r1
@@ -7,5 +7,5 @@ LICENSE=bf1942-lnxded
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://ftp.games.skynet.be/pub/misc/bf1942_lnxded-1.6-rc2.run http://ftp.games.skynet.be/pub/misc/bf1942-update-1.61.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bce5670f9811ab9f9fdffd0e3901ec3
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 6268695a8de0..e4833b902b44 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1 b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
index b4d67bb51f50..c551a65a4ecd 100644
--- a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+++ b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/glibc x11-libs/libX11[abi_x86_
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54f632376d84748ea2f2658d1fe3fa73
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index fe8be82b7d08..8a3230152399 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/darwinia-1.4.0_beta9 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
index 35ee6c4c85eb..b26a98de893b 100644
--- a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
+++ b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
@@ -10,5 +10,5 @@ RDEPEND=~virtual/libstdc++-3.3 media-libs/libsdl[abi_x86_32(-)] media-libs/libvo
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=deadbf88f354f4b99dbc832fc7c54f8a
diff --git a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r1 b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r1
index 13222c5c8f0c..b3e52eb35925 100644
--- a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r1
+++ b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r1
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] vir
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-demo2-1.3.0.sh
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fb1d6a9143f67db07b1a3bdea726d22
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 98f563d9807d..f072d39ccb7d 100644
--- a/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
+++ b/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
@@ -11,5 +11,5 @@ RDEPEND=!ppc? ( sys-libs/lib-compat-loki ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) amd64? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) ppc? ( mirror://lokigames/heroes3/heroes3-1.3.1a-ppc.run )
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=491f821945f5c93f12ff0187b305461d
diff --git a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2 b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
index 84ec78a43217..ad10ca2d7508 100644
--- a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
+++ b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/knights-demo-1.32.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e865f9a5641587ca9e9f71ba3bfdcd37
diff --git a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1 b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
index 6cb80c071e20..36f14a218bfb 100644
--- a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
+++ b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_3
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0a9382baab126fb0b086b8348a4266dc
diff --git a/metadata/md5-cache/games-strategy/mindrover-demo-1.07b b/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
index fc5e5fb96273..3acf8a1436a2 100644
--- a/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
+++ b/metadata/md5-cache/games-strategy/mindrover-demo-1.07b
@@ -8,5 +8,5 @@ RDEPEND=virtual/opengl games-misc/games-envd
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://demos.linuxgamepublishing.com/mindrover/mindrover_demo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=607231463986813eb882fd88b62f2a99
diff --git a/metadata/md5-cache/games-strategy/smac-6.0a b/metadata/md5-cache/games-strategy/smac-6.0a
index ec3f11793e0e..f7acbc083db5 100644
--- a/metadata/md5-cache/games-strategy/smac-6.0a
+++ b/metadata/md5-cache/games-strategy/smac-6.0a
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs
 RESTRICT=strip
 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	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2530ab3e491cc4e81b36d0a4180fd057
diff --git a/metadata/md5-cache/games-strategy/spaz-1.605 b/metadata/md5-cache/games-strategy/spaz-1.605
index abfdfe6167c5..f8a4db6704a7 100644
--- a/metadata/md5-cache/games-strategy/spaz-1.605
+++ b/metadata/md5-cache/games-strategy/spaz-1.605
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=spaz-linux-humblebundle-09182012-bin
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8df28e5e19c7eb1341a6317d66ec76ea
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index c78efd1d6848..4127232838e9 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/umodpack-0.5_beta16-r2 b/metadata/md5-cache/games-util/umodpack-0.5_beta16-r2
index b92288389a32..f6a63180d2ef 100644
--- a/metadata/md5-cache/games-util/umodpack-0.5_beta16-r2
+++ b/metadata/md5-cache/games-util/umodpack-0.5_beta16-r2
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/Tie-IxHash tk? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/umodpack-0.5b16-allinone.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2f88f616f2119e7f9628923865cd537
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 77a1a57d7a39..75926fc0257f 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/gsettings-desktop-schemas-3.24.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
index cfa1f1405063..d90fd79c4793 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.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 ~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.24/gsettings-desktop-schemas-3.24.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5ddcd5ca7b18b032c2742721b6c4e693
+_md5_=ec2ef63b98200b5357a8b6c22940c01a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 280dcab1f244..7c019ab03ce6 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/gtkhtml-4.10.0-r1 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
new file mode 100644
index 000000000000..eec61e00ee96
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-2.0.0 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.40.0 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 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight HTML rendering/printing/editing engine
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gtkhtml
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-2.0.0 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
+SLOT=4.0
+SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=232dcbf05b9098841c38c4027a3ec7d9
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 5bc06284c4db..4c2e02f2035c 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/kalzium-18.12.1-r1 b/metadata/md5-cache/kde-apps/kalzium-18.12.1-r1
deleted file mode 100644
index 791872e5b945..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-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 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-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 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b1e0e829e7558fe8160c8d14ac380de7
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.12.1-r2 b/metadata/md5-cache/kde-apps/kalzium-18.12.1-r2
new file mode 100644
index 000000000000..9656f3f2658b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.12.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-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 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-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 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0683d7a42d06788e509bb30c1eee440
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index c3ab7e8703cd..e221dae61b7d 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/ktexteditor-5.54.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.54.0-r1
new file mode 100644
index 000000000000..201147f17030
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.54.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=kde-frameworks/syntax-highlighting-5.54: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:= ) test? ( >=kde-frameworks/kservice-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=kde-frameworks/syntax-highlighting-5.54: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.54: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.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9c68a02ed3e35fbc7939832d8d9efa65
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0-r1 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0-r1
new file mode 100644
index 000000000000..7f4985d58fce
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=72ecfae5e8877361f22f6dbe0a1bd205
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0-r1 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0-r1
new file mode 100644
index 000000000000..138fdb75411e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54: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.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=attica test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54: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.54:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5f949304e98d001fd97e7f8696340342
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 9260bc6bad2c..2cc66e2bfa81 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/basket-2.49a_p20170225-r1 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
deleted file mode 100644
index 86cfbc1f5741..000000000000
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A DropDrawers clone. Multiple information organizer
-EAPI=6
-HOMEPAGE=https://github.com/basket-notepads/basket
-IUSE=crypt git test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b8982d4e29d534e36286aeefe1164d73
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.2 b/metadata/md5-cache/kde-misc/latte-dock-0.8.2
deleted file mode 100644
index 6dce840f0a4a..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=0
-SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f806e525f443db15f68715b7b12ccf8
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.3 b/metadata/md5-cache/kde-misc/latte-dock-0.8.3
deleted file mode 100644
index a817311e13dc..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=0
-SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1a224b1b6903afeb0575b5c841854a71
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.5 b/metadata/md5-cache/kde-misc/latte-dock-0.8.5
new file mode 100644
index 000000000000..c393aed92949
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Elegant dock, based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=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[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=0
+SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92c26b82493d507427793ba2c85c5db6
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 15087cb7d745..14d693b3b3a9 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.14.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.3
deleted file mode 100644
index 8c22852d6c57..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.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-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/bluedevil.git
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.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.14.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/bluedevil-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fdc821b6e611d7391692f142471a4700
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.14.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.5
index 35ee3b8104e2..ea72c7907831 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.14.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth stack for KDE Plasma
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/bluedevil.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.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.14.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff32b6dc71024a0e06d735a85dd6bd97
+_md5_=0d6ea1121346f812e5363f23c18287b2
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-5.14.3
deleted file mode 100644
index 7a5352350712..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3: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.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze.git
-IUSE=wayland X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.3:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3: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.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=65cf6af6024f01d3209f527bf0995e58
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-5.14.5
index 93644fa813d9..f58c94e5cfc8 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.14.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=6
 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.52.0:5 >=kde-plasma/kde-cli-tools-5.14.5:5
 RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.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.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=902f2a9b1871b976a0e49e18199689bf
+_md5_=40588ac89be0b2a37d763c828904ffd0
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3
deleted file mode 100644
index f4a4322d81eb..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for GRUB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-grub-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b0eade5c4f90f4589cf675f124323039
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5
index 77db9dfe792a..ea9596b7e789 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-f
 DESCRIPTION=Breeze theme for GRUB
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e39b0f0806f8f259b80fd80ec4e9ac0
+_md5_=f6ec10919b00004babc3e54de5cb4ffb
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3
deleted file mode 100644
index d862fff35e3d..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-gtk-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=567dd53c5b6e5818fe8028b2f8de28a9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
index 754158b81288..8bc7fe3e39e4 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d4920207c925919c08bb2aae58447022
+_md5_=439b4c22754cb69dadd410936de306c9
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3
deleted file mode 100644
index 3e1026faf148..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-plymouth-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=92f1a7ab28c1c2c252b358457b87d757
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5
index cd57ce99cfb0..26aca0834748 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Breeze theme for Plymouth
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2d2bbdd03218beae2a47dcba0b9062c
+_md5_=0abd980117d600f2aa8c16ffd3f1affd
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.3
deleted file mode 100644
index 5ffbe3cd6256..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.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 ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.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-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/drkonqi-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=30ff2ee3f3f6858390e8465a45db526b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.5
index ca29917aea6f..a2e2f04f62f3 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.14.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.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-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4e6f29d6e03b8b3085d7941631e08eb3
+_md5_=e449e9021a4ee08a0461c5c69457ef6b
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3
deleted file mode 100644
index a2f165be4664..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kactivitymanagerd-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43a2537f951274ea25b6ebcf6c27bea9
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5
index ad21acd953a7..805f456915b8 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=System service to manage user's activities, track the usage patterns
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3d25e1581bd9a2b29f12ae26c9d3fddf
+_md5_=337cad8bf1b04415408728ec10665713
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3
deleted file mode 100644
index aacc6ae6a5cc..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
-IUSE=+kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kde-cli-tools-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d59e73fe30cc1c1312c5446e80a983a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5
index eba94933651a..85e7e2354616 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=6
 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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.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.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b34a2725178e21db64801119146a4d0f
+_md5_=481c24e900881bac8dae74eb0bf6e24c
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3
deleted file mode 100644
index 976a93189ed4..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-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.14.3:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kde-gtk-config-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d3581bc4127a9a3e65a23e56beca8b1
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5
index fe4a45731392..c912acb4230e 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-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.14.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f541474a54e4be464404733bc2f4874
+_md5_=be9d6b93bc993e7e3bef628ac7f0e1d3
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.3
deleted file mode 100644
index 8302189e9b7e..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kdecoration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f0aec1217bd15b32de4e262d875842f
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.5
index b7c648cb9a45..716ccb37875c 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin based library to create window decorations
 EAPI=6
 HOMEPAGE=https://www.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d27fb0682b4ce9b9791418d68bcc76ae
+_md5_=c1bf563ce671f6b1ac845b3428636a95
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3
deleted file mode 100644
index b94feffab792..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=share webengine debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.3:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kdeplasma-addons-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eb0cab385259613b80431ca832bf2c19
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
index a665e64b0e7d..58324072094c 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Extra Plasma applets and engines
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=share webengine debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d0f1bbf7db697eeb81b4ea4b14c7cc2
+_md5_=a42202712182f32dcb130e9fac315e84
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.3 b/metadata/md5-cache/kde-plasma/kgamma-5.14.3
deleted file mode 100644
index e26ee91fd19e..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kgamma5-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2826ece0ecda44de13340606da2a917
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.5 b/metadata/md5-cache/kde-plasma/kgamma-5.14.5
index 57c06af82919..335b65521ea0 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Screen gamma values kcontrol module
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=344e4c6f24d052a9ff1c964234bacc0b
+_md5_=03b31c7947a82580860e247bbd3b6373
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.3
deleted file mode 100644
index 243ef21e39dc..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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 x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/khotkeys-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b0cd9bf3480dd54ca698424c4105211e
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.5
index 9b81fb5be131..3381d98efc34 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.14.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.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.52.0:5 >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8fe16f8f8d58e531710fcfcfd3615769
+_md5_=a011370958053d111a0003e9bc4ada92
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3
deleted file mode 100644
index f170e4e790c7..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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.52.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A utility that provides information about a computer system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.3:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.3/kinfocenter-5.14.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18b1ab8718ad32fe29145c9b59ca0183
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
index fcdd66034e92..46a63e90c446 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Utility providing information about the computer hardware
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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 sys-apps/hwids[pci,usb] 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.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.5/kinfocenter-5.14.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=62b0d49b0949d2e56227dbaafa9e535b
+_md5_=840ee2573d6ab58f341939c989354de2
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
deleted file mode 100644
index 9cd7ae38d5e7..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.14.3:5 ) >=kde-frameworks/kinit-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma menu editor
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kmenuedit.git
-IUSE=+hotkeys debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.14.3:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kmenuedit-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0c57e8455b4c7e6e23cfa6cbccab0505
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5
index 7615df346621..07fd4333a9ab 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma menu editor
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kmenuedit.git
 IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.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.14.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d07e66e6d6240a5be74e913d9fa573cf
+_md5_=9aa755df4fc4ec771ba053ddc95b4be5
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.3 b/metadata/md5-cache/kde-plasma/kscreen-5.14.3
deleted file mode 100644
index 6e491ac5d62b..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.3: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma screen management
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kscreen.git
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.3: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.14.3:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kscreen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5fb705bf4a7112c6e638806753e215e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.5 b/metadata/md5-cache/kde-plasma/kscreen-5.14.5
index 3669066b8c02..9f6aa7c0544f 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Plasma screen management
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kscreen.git
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.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.14.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=edcb1ca3f7b9efdd88e7769af8d3f400
+_md5_=de946c734bc84b4cd8e055d3800807cf
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3
deleted file mode 100644
index c59151dde762..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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 pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+pam seccomp test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.3:5
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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 pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kscreenlocker-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f68532172195d2ef30979a1c6de52fa
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5
index 92ad44f272d3..84b1e4f1a9fc 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=6
 HOMEPAGE=https://www.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.14.5:5
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.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-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.5/kscreenlocker-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d189a1b874c5d3c45013aca0f79a134a
+_md5_=d642962cc4e5e9245db7cb180c3163b0
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3
deleted file mode 100644
index 2151fadaf6f1..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/ksshaskpass-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b2cab7d5e3a16f8fb552673402e7520f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
index 2b2e1cd53df1..fd5a3fa5c993 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=79b4a554b1f6054d950af40f8f3784bd
+_md5_=2d68b2bfa7a8550eccd4127ce454aa55
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.3
deleted file mode 100644
index 94dffe55a40e..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.14.3:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 lm_sensors? ( sys-apps/lm_sensors:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.14.3:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 lm_sensors? ( sys-apps/lm_sensors:= ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/ksysguard-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c6bd1d5ea1662d4d5ef98be38f933a52
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.5
index 77fc75373310..dc17fca839da 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.14.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.14.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.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 lm_sensors? ( sys-apps/lm_sensors:= ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3217e04e025d3bd341f736ed42dffe3
+_md5_=211fe51f11c930ce033089cc47f6590c
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3
deleted file mode 100644
index a1b36566029e..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kwallet-pam-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=821a97e560f8126eedd1b35e6902f0ed
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5
index 2d5679482882..5a28bed9baf0 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KWallet PAM module to not enter password again
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ae7ee4fc20a8351faf6f7cac2a4c72c
+_md5_=62a551909e6b5d78bea2fe2b462339c4
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3
deleted file mode 100644
index 7971973965d9..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
-IUSE=debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kwayland-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ecf48c4bf75aa37e2e7c780bee56a908
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5
index 993ab8017046..b8468ce171a9 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bd32020649bef0a4e369350e3a8c9f5c
+_md5_=89d60c6239b37e0ca216166aa49567c1
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1 b/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1
deleted file mode 100644
index 0a155aae8da3..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.3:5 >=kde-plasma/kdecoration-5.14.3:5 >=kde-plasma/kscreenlocker-5.14.3: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/designer-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.3:5 >=kde-plasma/kdecoration-5.14.3:5 >=kde-plasma/kscreenlocker-5.14.3: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-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kwin-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2bc8e22f31215322075e6464327cd72a
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.5 b/metadata/md5-cache/kde-plasma/kwin-5.14.5
index ab1b0371230b..860bba2ba329 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=KDE window manager
 EAPI=6
 HOMEPAGE=https://www.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.14.5:5
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=kde-plasma/kdecoration-5.14.5:5 >=kde-plasma/kscreenlocker-5.14.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-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kwin-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=98317e782d29490a49384aa424e1cf63
+_md5_=50c3d7f5bbff32020be5e0feeb20b0d7
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.3 b/metadata/md5-cache/kde-plasma/kwrited-5.14.3
deleted file mode 100644
index 3231c153bc3f..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/kwrited-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e956e498b17186cd7fdb98821c040d57
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.5 b/metadata/md5-cache/kde-plasma/kwrited-5.14.5
index 0f69605d990a..d3f53d91685b 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d62b165b20d687f5cc4e32d2e57f54dd
+_md5_=38c930fda28e1b8d7fc832de3bf5b9ef
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.3
deleted file mode 100644
index 512e53969a7c..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.52.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma screen management library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.52.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 !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.3/libkscreen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a657a9c336354ad9828974dc70779839
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.5
index 45b93093f760..dd0bc8692e5c 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.14.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=6
 HOMEPAGE=https://www.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.52.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 !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.5/libkscreen-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cfc22c7c7fd450e7a624e97eaa8190f
+_md5_=6f937bfe6934c8049e6e6751543f66c6
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.3
deleted file mode 100644
index 9d89fdd2f1b2..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.52.0:5 !minimal? ( >=kde-frameworks/plasma-5.52.0:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Task management and system monitoring library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=minimal webkit X test debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/libksysguard-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=374b38ab7134ae7e6a0ee7edf4d5735e
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.5
index 50ce993c4613..f403d46eff5d 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.14.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Task management and system monitoring library
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=minimal webkit X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bcfd7c59b29ab83a3f5fa589d70075df
+_md5_=b0976da1138626a0729d12507c3b5b23
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
deleted file mode 100644
index 4084d988a829..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.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/kwin-5.14.3:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.50.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.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/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f7132a11bd1e381c99f8fbe341cfa749
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5
index ddaeb10972ba..f975151d4743 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.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/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f20d04db109c946a252dd5fd5bc564ea
+_md5_=983df89a8cceaf361c5544298e91da50
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.3 b/metadata/md5-cache/kde-plasma/milou-5.14.3
deleted file mode 100644
index e5db435f51cc..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/milou.git
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/milou-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cbdce19d8ad308d78a3eb4256f915b9
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.5 b/metadata/md5-cache/kde-plasma/milou-5.14.5
index b106a37524f6..11379e23ad1f 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.14.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=6
 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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/milou-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66a2f4bff0e8439e4d5ec97cf4834012
+_md5_=ba7c5c83fc11f0c8bde3f37a92e533f9
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.3 b/metadata/md5-cache/kde-plasma/oxygen-5.14.3
deleted file mode 100644
index 47a9d018909c..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3: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.52.0:5 ) >=kde-frameworks/kservice-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/oxygen.git
-IUSE=wayland debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3: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.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/oxygen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c8b50d177a58a97486983334ff35f171
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.5 b/metadata/md5-cache/kde-plasma/oxygen-5.14.5
index 072b7f2071ad..df67d13e885b 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.14.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/oxygen.git
 IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.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.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f189ebe611515e3eb498f129ba13659a
+_md5_=709681b7fab866e503caa06f8f412cf9
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3
deleted file mode 100644
index 5c5fad405186..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-browser-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c92cf829701d74d47d7a62f2ab00ee16
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5
index 9f2f3d61fc0f..feed7bfbfc0b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensio
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7031cf51444c6ee10d7797e085f36b3a
+_md5_=aa1add54f2905de0400d4c2f356ee624
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3
deleted file mode 100644
index 3c5559f0d381..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/plasma-workspace-5.14.3: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.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/plasma-workspace-5.14.3: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.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.52.0:5 >=kde-plasma/breeze-5.14.3:5 >=kde-plasma/kde-cli-tools-5.14.3:5 >=kde-plasma/oxygen-5.14.3:5 >=dev-qt/qtgraphicaleffects-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-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-desktop-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=252a062fb0189243b9ec0e5f54df48fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
index 79563a5f15be..cb581dc42b39 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma desktop
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/plasma-workspace-5.14.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.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-plasma/oxygen-5.14.5:5 >=dev-qt/qtgraphicaleffects-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-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=412a1f340578e23e291fb128366e084f
+_md5_=e928abb9b607f6779175d8f017207f34
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3
deleted file mode 100644
index 148504abac70..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.3: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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.3: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=acabfc6e9fc7e3c4be31611c78d5c0c3
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5
index 8f397bd30838..2068fc33e212 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b0abdd45b10db88d2cd49cb2cf67e84
+_md5_=b98c767f9ac4aca1694a5ac349d52879
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
deleted file mode 100644
index 5662f8f545c4..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.14.3:5 >=kde-plasma/drkonqi-5.14.3:5 >=kde-plasma/kactivitymanagerd-5.14.3:5 >=kde-plasma/kde-cli-tools-5.14.3:5 >=kde-plasma/kdecoration-5.14.3:5 >=kde-plasma/kdeplasma-addons-5.14.3:5 >=kde-plasma/kgamma-5.14.3:5 >=kde-plasma/khotkeys-5.14.3:5 >=kde-plasma/kinfocenter-5.14.3:5 >=kde-plasma/kmenuedit-5.14.3:5 >=kde-plasma/kscreen-5.14.3:5 >=kde-plasma/kscreenlocker-5.14.3:5 >=kde-plasma/ksshaskpass-5.14.3:5 >=kde-plasma/ksysguard-5.14.3:5 >=kde-plasma/kwayland-integration-5.14.3:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/kwrited-5.14.3:5 >=kde-plasma/libkscreen-5.14.3:5 >=kde-plasma/libksysguard-5.14.3:5 >=kde-plasma/milou-5.14.3:5 >=kde-plasma/oxygen-5.14.3:5 >=kde-plasma/plasma-desktop-5.14.3:5 >=kde-plasma/plasma-integration-5.14.3:5 >=kde-plasma/plasma-workspace-5.14.3:5 >=kde-plasma/polkit-kde-agent-5.14.3:5 >=kde-plasma/powerdevil-5.14.3:5 >=kde-plasma/systemsettings-5.14.3:5 >=kde-plasma/user-manager-5.14.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.14.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.3:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.14.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.3:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.3:5 >=kde-plasma/kde-gtk-config-5.14.3:5 ) handbook? ( >=kde-apps/khelpcenter-18.08.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.14.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.3:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.14.3:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.3:5 >=kde-plasma/plymouth-kcm-5.14.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.3:5 )
-REQUIRED_USE=?? ( consolekit elogind systemd )
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=717eed3d026724f7cf4d23f8041fca93
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5
index a5ccdb4cdeaf..6ad85aa9fadd 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all Plasma 5 packages
 EAPI=7
 HOMEPAGE=https://www.kde.org/plasma-desktop
 IUSE=bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.14.5:5 >=kde-plasma/drkonqi-5.14.5:5 >=kde-plasma/kactivitymanagerd-5.14.5:5 >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-plasma/kdecoration-5.14.5:5 >=kde-plasma/kdeplasma-addons-5.14.5:5 >=kde-plasma/kgamma-5.14.5:5 >=kde-plasma/khotkeys-5.14.5:5 >=kde-plasma/kinfocenter-5.14.5:5 >=kde-plasma/kmenuedit-5.14.5:5 >=kde-plasma/kscreen-5.14.5:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=kde-plasma/ksshaskpass-5.14.5:5 >=kde-plasma/ksysguard-5.14.5:5 >=kde-plasma/kwayland-integration-5.14.5:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/kwrited-5.14.5:5 >=kde-plasma/libkscreen-5.14.5:5 >=kde-plasma/libksysguard-5.14.5:5 >=kde-plasma/milou-5.14.5:5 >=kde-plasma/oxygen-5.14.5:5 >=kde-plasma/plasma-desktop-5.14.5:5 >=kde-plasma/plasma-integration-5.14.5:5 >=kde-plasma/plasma-workspace-5.14.5:5 >=kde-plasma/polkit-kde-agent-5.14.5:5 >=kde-plasma/powerdevil-5.14.5:5 >=kde-plasma/systemsettings-5.14.5:5 >=kde-plasma/user-manager-5.14.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.14.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.5:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.14.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.5:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.5:5 >=kde-plasma/kde-gtk-config-5.14.5:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.14.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.5:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.14.5:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.5:5 >=kde-plasma/plymouth-kcm-5.14.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.5:5 )
 REQUIRED_USE=?? ( consolekit elogind systemd )
 SLOT=5
-_md5_=2661f44632efc154cceaf32745f87482
+_md5_=17e84296c058e5109f86b60c06d6e027
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3
deleted file mode 100644
index 6b146cdbdaa0..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.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.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=modemmanager openconnect teamd debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.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.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-nm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=37e3e94e07d4d4d5d8bba8bc5d915912
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
index 47c5ec0d3c7a..354a18eb9a12 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.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.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=229ad4879c3902ec0399089f030c0014
+_md5_=75be572951717fd13e5742ec85d8279f
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3
deleted file mode 100644
index a510c67c4234..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.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 media-libs/libcanberra media-sound/pulseaudio sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.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 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-pa-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b6a6dd992491c2d52293de85055d635d
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5
index 604a3b2a1aac..e403eaf7f2b1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.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 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=00b8ebda0d38a45ef32311a3b063eeb2
+_md5_=eb379ec91b99e44e808d7ca8ec83751a
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3
deleted file mode 100644
index 5f60ce7de1a2..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Useful applications for Plasma development
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.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 !dev-util/plasmate >=kde-frameworks/kirigami-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-sdk-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=96dc08b4e8e334caf9d58e6e931a905d
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5
index dd74d41abfb6..7b79c91d109c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Useful applications for Plasma development
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.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 !dev-util/plasmate >=kde-frameworks/kirigami-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f71b330f0cb5fcc6b513149a7b64aae
+_md5_=eb04f23c291bc68e9879a158b3b66a6a
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3
deleted file mode 100644
index 0dc4731b839c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.3: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.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.3: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.52.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-vault-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1238008c67b28658ca6a7a54a85f8645
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5
index d84b4260361d..f05c776a6dcd 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=6
 HOMEPAGE=https://www.kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.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.52.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01c240e9f80b3bb43cc7634fb60bee8b
+_md5_=64c009bbb5600d3230fd35c87c33ebd0
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3
deleted file mode 100644
index d0a9d26387c7..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.3:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/libksysguard-5.14.3:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.3:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/libksysguard-5.14.3:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-apps/kio-extras-18.08.3:5 >=kde-plasma/ksysguard-5.14.3:5 >=kde-plasma/milou-5.14.3:5 >=kde-plasma/plasma-integration-5.14.3: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] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d14d3c23f82d1a0730beae9499022e2
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5
index ac9a63f45ad5..4fc95887a913 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.14.5:5
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/libksysguard-5.14.5:5 >=kde-plasma/libkworkspace-5.14.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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-apps/kio-extras-18.08.3:5 >=kde-plasma/ksysguard-5.14.5:5 >=kde-plasma/milou-5.14.5:5 >=kde-plasma/plasma-integration-5.14.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] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.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.14.5/plasma-workspace-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=80a3840c80b6d5bda6a9a7373d2977df
+_md5_=91a18e690528949d682950b55ce6d40e
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3
deleted file mode 100644
index eac94b6c2382..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-wallpapers-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=004a6bfdaf458783d87040aeb8d93e2f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
index c1bac5e48142..88a809d1f91e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
@@ -3,9 +3,9 @@ DEPEND=>=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 sy
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=63c231540421ed58aa3bd090c7cadf89
+_md5_=842c5370242d0ad585dbc46d87809b62
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3
deleted file mode 100644
index cf56312ad3d4..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.14.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/plymouth-kcm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e76a3183e2f0ccc2d96af6e65a8815d
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5
index 294a268c60e4..e21be6dd6325 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.14.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7aa3482e96798a6c2885679ee2a9adb
+_md5_=81469a65129b9a8d96cbe160df38f5ba
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3
deleted file mode 100644
index e9293ae01c17..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/polkit-kde-agent-1-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9443800d0c0adf359dbf6812003c49c
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5
index 2192796344f4..222fcab48c25 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=PolKit agent module for KDE Plasma
 EAPI=6
 HOMEPAGE=https://www.kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da25c4d8b8862c7244ac28de98ac0f67
+_md5_=9250a49232c1897863507633f84f6dc1
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
deleted file mode 100644
index 254365c3f8da..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.3:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.3:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.3:5 >=sys-power/upower-0.9.23 !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/powerdevil-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6396d2061ee944154c1aa4170b620bf
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.5
index 8328c35549a0..65696ac1c7ed 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.14.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/powerdevil.git
 IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.5:5 >=kde-plasma/libkworkspace-5.14.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.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=sys-power/upower-0.9.23 !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f0c056c64af8d14519dff6f8a47e4fb
+_md5_=0a5041c1dc9c045bf5659eee7d49b1cb
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3
deleted file mode 100644
index ecaecbea7408..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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 x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.14.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/sddm-kcm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=36aa83b648f88f8808d4cb5aebd693f7
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5
index ae0d2e91c5b6..e3ece68f8910 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.14.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=654a04adfb78c49abdfe8d4f12fa6900
+_md5_=3e37fff0a4821f1e2e99569d598ee5db
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.3
deleted file mode 100644
index 793e9e02096b..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System settings utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3: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.52.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.52.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/systemsettings-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66ffb66837c5049cc6190bea0d72c7f6
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.5
index 20c94b02f909..2803713b1e60 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.14.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=System settings utility
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.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.52.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.52.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=21418eea24b26b990108811aa989bc7a
+_md5_=1eeb99dc38da13c8b441c83a9996b838
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.3 b/metadata/md5-cache/kde-plasma/user-manager-5.14.3
deleted file mode 100644
index 386676126587..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.3/user-manager-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e8e8e67ac7a1f9d8988baae18ee50b09
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.5 b/metadata/md5-cache/kde-plasma/user-manager-5.14.5
index b8933ea4003b..6693b9971df2 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.14.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=259ed16b31d757d09c99a67ce2290083
+_md5_=088e5d2c4f0e474ec41f1b9c7f19836f
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3
deleted file mode 100644
index 90346c3982ea..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6: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.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3e069d5c054074c3f572842680be308
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5
index 0b7d20dd5567..97231e70bd09 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5
@@ -4,10 +4,10 @@ DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6: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.14.5/plasma-workspace-5.14.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1478ab8b27a70d88fc61e7de97eefb0e
+_md5_=03b6a35c074944080e7b37af01ff265f
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index a8956024c00b..21c5560562ff 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/thunderbird-60.5.0 b/metadata/md5-cache/mail-client/thunderbird-60.5.0
new file mode 100644
index 000000000000..f1d7aa16aecf
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-60.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=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/gtk+-3.4.0:3 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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 clang? ( >=sys-devel/llvm-4.0.1[gold] >=sys-devel/lld-4.0.1 ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( dev-lang/python: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
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=bindist clang dbus debug hardened jack lightning neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-sqlite wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 >=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/gtk+-3.4.0:3 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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1:= ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla sec-policy/selinux-thunderbird )
+REQUIRED_USE=wifi? ( dbus )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ar.xpi -> thunderbird-60.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ast.xpi -> thunderbird-60.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/be.xpi -> thunderbird-60.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/bg.xpi -> thunderbird-60.5.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/br.xpi -> thunderbird-60.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ca.xpi -> thunderbird-60.5.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cs.xpi -> thunderbird-60.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cy.xpi -> thunderbird-60.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/da.xpi -> thunderbird-60.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/de.xpi -> thunderbird-60.5.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/el.xpi -> thunderbird-60.5.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/et.xpi -> thunderbird-60.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/eu.xpi -> thunderbird-60.5.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fi.xpi -> thunderbird-60.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fr.xpi -> thunderbird-60.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gd.xpi -> thunderbird-60.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gl.xpi -> thunderbird-60.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/he.xpi -> thunderbird-60.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hr.xpi -> thunderbird-60.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hu.xpi -> thunderbird-60.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/id.xpi -> thunderbird-60.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/is.xpi -> thunderbird-60.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/it.xpi -> thunderbird-60.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ja.xpi -> thunderbird-60.5.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ko.xpi -> thunderbird-60.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/lt.xpi -> thunderbird-60.5.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nl.xpi -> thunderbird-60.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.5.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pl.xpi -> thunderbird-60.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/rm.xpi -> thunderbird-60.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ro.xpi -> thunderbird-60.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ru.xpi -> thunderbird-60.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/si.xpi -> thunderbird-60.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sk.xpi -> thunderbird-60.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sl.xpi -> thunderbird-60.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sq.xpi -> thunderbird-60.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sr.xpi -> thunderbird-60.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.5.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/tr.xpi -> thunderbird-60.5.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/uk.xpi -> thunderbird-60.5.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/vi.xpi -> thunderbird-60.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.5.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/source/thunderbird-60.5.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.2.1.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.5-patches-01.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.5-patches-01.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.5-patches-01.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.5-patches-01.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4e8a0e4a4ec00947b7d87710744eb961
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-60.5.0 b/metadata/md5-cache/mail-client/thunderbird-bin-60.5.0
new file mode 100644
index 000000000000..98b60d3401bb
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-60.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip app-arch/zip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ar.xpi -> thunderbird-60.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ast.xpi -> thunderbird-60.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/be.xpi -> thunderbird-60.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/bg.xpi -> thunderbird-60.5.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/br.xpi -> thunderbird-60.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ca.xpi -> thunderbird-60.5.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cs.xpi -> thunderbird-60.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/cy.xpi -> thunderbird-60.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/da.xpi -> thunderbird-60.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/de.xpi -> thunderbird-60.5.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/el.xpi -> thunderbird-60.5.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/et.xpi -> thunderbird-60.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/eu.xpi -> thunderbird-60.5.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fi.xpi -> thunderbird-60.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fr.xpi -> thunderbird-60.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gd.xpi -> thunderbird-60.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/gl.xpi -> thunderbird-60.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/he.xpi -> thunderbird-60.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hr.xpi -> thunderbird-60.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hu.xpi -> thunderbird-60.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/id.xpi -> thunderbird-60.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/is.xpi -> thunderbird-60.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/it.xpi -> thunderbird-60.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ja.xpi -> thunderbird-60.5.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ko.xpi -> thunderbird-60.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/lt.xpi -> thunderbird-60.5.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nl.xpi -> thunderbird-60.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.5.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pl.xpi -> thunderbird-60.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/rm.xpi -> thunderbird-60.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ro.xpi -> thunderbird-60.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/ru.xpi -> thunderbird-60.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/si.xpi -> thunderbird-60.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sk.xpi -> thunderbird-60.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sl.xpi -> thunderbird-60.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sq.xpi -> thunderbird-60.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sr.xpi -> thunderbird-60.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.5.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/tr.xpi -> thunderbird-60.5.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/uk.xpi -> thunderbird-60.5.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/vi.xpi -> thunderbird-60.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.5.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-x86_64/en-US/thunderbird-60.5.0.tar.bz2 -> thunderbird-bin_x86_64-60.5.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/60.5.0/linux-i686/en-US/thunderbird-60.5.0.tar.bz2 -> thunderbird-bin_i686-60.5.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-6.2.2.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0b76c90f01fee47f09a2705b5c759520
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index f025b233d4e4..9e194ab23397 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/spamassassin-botnet-0.8-r1 b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
index d1f08beeb111..13f30525f13b 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=mail-filter/spamassassin-3.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://people.ucsc.edu/~jrudd/spamassassin/Botnet-0.8.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f7c8adc0a717c8e20d6eb28c1bed875
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2 b/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2
deleted file mode 100644
index c45330d75537..000000000000
--- a/metadata/md5-cache/mail-filter/spambayes-1.1_alpha6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools python_targets_python2_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=An anti-spam filter using on Bayesian filtering
-EAPI=5
-HOMEPAGE=http://spambayes.sourceforge.net
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=PSF-2.2 GPL-2
-RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools python_targets_python2_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/spambayes/spambayes-1.1a6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e1ec9165fa15bbc3e539dab3182e43aa
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_beta1 b/metadata/md5-cache/mail-filter/spambayes-1.1_beta1
deleted file mode 100644
index 61bcd804421d..000000000000
--- a/metadata/md5-cache/mail-filter/spambayes-1.1_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools python_targets_python2_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=An anti-spam filter using on Bayesian filtering
-EAPI=5
-HOMEPAGE=http://spambayes.sourceforge.net
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=PSF-2.2 GPL-2
-RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools python_targets_python2_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/spambayes/spambayes-1.1b1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a6e1c97515a5ca106d0f2a7ca58f8c58
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 5f7beefa9532..b7e5ec573072 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-1.0.5 b/metadata/md5-cache/mail-mta/courier-1.0.5
index fadbdb3791d9..1056ed48cea6 100644
--- a/metadata/md5-cache/mail-mta/courier-1.0.5
+++ b/metadata/md5-cache/mail-mta/courier-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) 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? ( dev-db/mysql-connector-c ) 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
+DEPEND=>=net-libs/courier-authlib-0.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) 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? ( dev-db/mysql-connector-c ) 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[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
 DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=7
 HOMEPAGE=http://www.courier-mta.org/
@@ -7,9 +7,9 @@ IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web
 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.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) 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? ( dev-db/mysql-connector-c ) 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
+RDEPEND=>=net-libs/courier-authlib-0.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) 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? ( dev-db/mysql-connector-c ) 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[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !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
 REQUIRED_USE=?? ( gnutls libressl )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-1.0.5.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f8ef2a6f0027d8d51724156bfdd5e01e
+_md5_=9e318c4b1506f6e02069acff9d69bf88
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
index 33fc394da13e..f93e2d2f887c 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7a19d3d670de14d80009e219931294c
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index 2f60905b0991..6e94374f812a 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eebccd59d8b6d0cd72934097dedb1d5b
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 150f0fba5436..9803d9b4dda9 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -7,5 +7,5 @@ IUSE=postfix ipv6 syslog
 LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3fefee1fe53f47116ee0c5aa0995e2ad
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 5457c9465302..784f2afbfb26 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/polarsys-b612-fonts-1.003 b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003
new file mode 100644
index 000000000000..e2f441fbbbdc
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/polarsys-b612-fonts-1.003
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup unpack
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Font designed for aircraft cockpit displays
+EAPI=6
+HOMEPAGE=http://b612-font.com/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0
+SLOT=0
+SRC_URI=https://git.polarsys.org/c/b612/b612.git/snapshot/b612-bd14fde2544566e620eab106eb8d6f2b7fb1347e.tar.bz2 -> polarsys-b612-fonts-1.003.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=1c3038d59b0ff7e30f6f44b8904f5dd3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 09a13a26993e..f1359a485c1a 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/dcraw-9.28.0 b/metadata/md5-cache/media-gfx/dcraw-9.28.0
index 5d5145d7428d..b6272c2e0c3e 100644
--- a/metadata/md5-cache/media-gfx/dcraw-9.28.0
+++ b/metadata/md5-cache/media-gfx/dcraw-9.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line decoder for raw digital photos
 EAPI=6
 HOMEPAGE=https://www.cybercom.net/~dcoffin/dcraw/
 IUSE=nls gimp jpeg jpeg2k lcms
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs/jasper:= ) gimp? ( media-gfx/gimp ) media-libs/netpbm
 SLOT=0
 SRC_URI=https://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.28.0.tar.gz mirror://gentoo/parse-1.73.tar.bz2 gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=42857c745c7d76bfc275e6e40f4ad10d
+_md5_=54eb2e8d71c925558688b90c38e77589
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2 b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
index 043addc891e8..68354752f170 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.17.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=823f121b825c6e8f5740d042c0c53d57
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.18 b/metadata/md5-cache/media-gfx/llgal-0.13.18
index 1674a3a8a5dd..8626cb2a0a9a 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.18
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.18.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=295383c077acce296a2ee2d26802ecca
diff --git a/metadata/md5-cache/media-gfx/mkgallery-1.1-r1 b/metadata/md5-cache/media-gfx/mkgallery-1.1-r1
index ed6609adb9d2..b6484ad81ec5 100644
--- a/metadata/md5-cache/media-gfx/mkgallery-1.1-r1
+++ b/metadata/md5-cache/media-gfx/mkgallery-1.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Creates thumbnails and a HTML index file for a directory of jpg files
 EAPI=7
 HOMEPAGE=http://mkgallery.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-devel/bc virtual/imagemagick-tools
 SLOT=0
 SRC_URI=http://mkgallery.sourceforge.net/mkgallery-1.1.tgz
-_md5_=ca5f0745d323a4423204783b18dd986a
+_md5_=7fa75eb61f9b05d438ced4d0d3506c5f
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3 b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
deleted file mode 100644
index 36e864b2f248..000000000000
--- a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/glew-2.0.0:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
-DESCRIPTION=The Programmers Solid 3D CAD Modeller
-EAPI=6
-HOMEPAGE=http://www.openscad.org/
-IUSE=emacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 >=media-libs/glew-2.0.0:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://files.openscad.org/openscad-2015.03-2.src.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=955a9f18cbc76eff4d81ac27d82850cf
diff --git a/metadata/md5-cache/media-gfx/recoverjpeg-2.0-r2 b/metadata/md5-cache/media-gfx/recoverjpeg-2.0-r2
deleted file mode 100644
index dcb5c5ff4997..000000000000
--- a/metadata/md5-cache/media-gfx/recoverjpeg-2.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-gfx/exif virtual/imagemagick-tools
-DESCRIPTION=Recover JPEG pictures from a possibly corrupted disk image
-EAPI=4
-HOMEPAGE=http://www.rfc1149.net/devel/recoverjpeg.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/exif virtual/imagemagick-tools
-SLOT=0
-SRC_URI=http://www.rfc1149.net/download/recoverjpeg/recoverjpeg-2.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f4b76b46f575ce806fa4736ecb69330
diff --git a/metadata/md5-cache/media-gfx/recoverjpeg-2.1.1-r1 b/metadata/md5-cache/media-gfx/recoverjpeg-2.1.1-r1
deleted file mode 100644
index 028185262e13..000000000000
--- a/metadata/md5-cache/media-gfx/recoverjpeg-2.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-gfx/exif virtual/imagemagick-tools
-DESCRIPTION=Recover JPEG pictures from a possibly corrupted disk image
-EAPI=4
-HOMEPAGE=http://www.rfc1149.net/devel/recoverjpeg.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/exif virtual/imagemagick-tools
-SLOT=0
-SRC_URI=http://www.rfc1149.net/download/recoverjpeg/recoverjpeg-2.1.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=022507fe14b14566b3de543e3355dce8
diff --git a/metadata/md5-cache/media-gfx/recoverjpeg-2.2.1-r1 b/metadata/md5-cache/media-gfx/recoverjpeg-2.2.1-r1
deleted file mode 100644
index 88270b38de82..000000000000
--- a/metadata/md5-cache/media-gfx/recoverjpeg-2.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-gfx/exif virtual/imagemagick-tools
-DESCRIPTION=Recover JPEG pictures from a possibly corrupted disk image
-EAPI=4
-HOMEPAGE=http://www.rfc1149.net/devel/recoverjpeg.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/exif virtual/imagemagick-tools
-SLOT=0
-SRC_URI=http://www.rfc1149.net/download/recoverjpeg/recoverjpeg-2.2.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb7ec98af650eb1b37c7cfd796120292
diff --git a/metadata/md5-cache/media-gfx/recoverjpeg-2.2.2-r1 b/metadata/md5-cache/media-gfx/recoverjpeg-2.2.2-r1
deleted file mode 100644
index c212712f39dc..000000000000
--- a/metadata/md5-cache/media-gfx/recoverjpeg-2.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-gfx/exif virtual/imagemagick-tools
-DESCRIPTION=Recover JPEG pictures from a possibly corrupted disk image
-EAPI=4
-HOMEPAGE=http://www.rfc1149.net/devel/recoverjpeg.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/exif virtual/imagemagick-tools
-SLOT=0
-SRC_URI=http://www.rfc1149.net/download/recoverjpeg/recoverjpeg-2.2.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=022507fe14b14566b3de543e3355dce8
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
index b78d73e17766..78e31b57ee0a 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r2
@@ -5,11 +5,11 @@ 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 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	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=43f0f64296d02f33a4d9ec1c5c4ff00c
+_md5_=26661a1f54d4958095fd949995adac43
diff --git a/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1 b/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
index 5fff4f2f4c3d..1619d7d5c2e3 100644
--- a/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
+++ b/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/imlib2-1.0.3 >=media-libs/giblib-1.2.3 || ( media-libs/imli
 SLOT=0
 SRC_URI=http://scrot.sourcearchive.com/downloads/0.8-13/scrot_0.8.orig.tar.gz http://scrot.sourcearchive.com/downloads/0.8-13/scrot_0.8-13.debian.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5eb9105b2b0a74ab5c5390752dee817e
+_md5_=c1d8c765d97a72940fffe12596ee40b5
diff --git a/metadata/md5-cache/media-gfx/videorbits-2.201 b/metadata/md5-cache/media-gfx/videorbits-2.201
deleted file mode 100644
index 4cbb5692c960..000000000000
--- a/metadata/md5-cache/media-gfx/videorbits-2.201
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 sys-libs/zlib media-libs/libpng virtual/jpeg
-DESCRIPTION=a collection of programs for creating high dynamic range images
-EAPI=4
-HOMEPAGE=http://comparametric.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 sys-libs/zlib media-libs/libpng virtual/jpeg
-SLOT=0
-SRC_URI=mirror://sourceforge/comparametric/videorbits-2.201.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=500baf81910d3be5b1104a8eb8fe7c13
diff --git a/metadata/md5-cache/media-gfx/videorbits-2.205 b/metadata/md5-cache/media-gfx/videorbits-2.205
index 0eec2798f48d..a4e8c98657ae 100644
--- a/metadata/md5-cache/media-gfx/videorbits-2.205
+++ b/metadata/md5-cache/media-gfx/videorbits-2.205
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 sys-libs/zlib media-libs/libpng:0= virtual/jpeg:0 sci-lib
 DESCRIPTION=a collection of programs for creating high dynamic range images
 EAPI=6
 HOMEPAGE=http://comparametric.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 sys-libs/zlib media-libs/libpng:0= virtual/jpeg:0 sci-libs/fftw:2.1 media-libs/netpbm
 SLOT=0
 SRC_URI=mirror://sourceforge/comparametric/videorbits-2.205.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e059535b1ce2d642a84a09279554d1d2
+_md5_=e7fcd79939bbcdf851d4b06b67fb1521
diff --git a/metadata/md5-cache/media-gfx/xv-3.10a-r19 b/metadata/md5-cache/media-gfx/xv-3.10a-r19
index 6bef3b55dcf2..b04ca79a5f63 100644
--- a/metadata/md5-cache/media-gfx/xv-3.10a-r19
+++ b/metadata/md5-cache/media-gfx/xv-3.10a-r19
@@ -4,10 +4,10 @@ DESCRIPTION=Interactive image manipulation program supporting a wide variety of
 EAPI=6
 HOMEPAGE=http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html
 IUSE=jpeg tiff png
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xv
 RDEPEND=x11-libs/libXt jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/xv-3.10a.tar.gz mirror://gentoo/xv-3.10a.png.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b94f15a45d46b3110b3861559017721d
+_md5_=bb45563127150b328090c04977685739
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9188e7b03273..6c0809d5c3fe 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/allegro-4.4.2-r1 b/metadata/md5-cache/media-libs/allegro-4.4.2-r1
deleted file mode 100644
index 2e4fea126943..000000000000
--- a/metadata/md5-cache/media-libs/allegro-4.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) ) virtual/pkgconfig X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=cross-platform multimedia library
-EAPI=6
-HOMEPAGE=https://liballeg.org/
-IUSE=alsa fbcon jack jpeg opengl oss png svga test vga vorbis X
-KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 x86
-LICENSE=Allegro MIT GPL-2+ ZLIB
-RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=68af51db2c36d4e5fd694586a0620314
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.2-r2 b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
index 3f994b65e464..607284a34025 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.2-r2
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=cross-platform multimedia library
 EAPI=6
 HOMEPAGE=https://liballeg.org/
 IUSE=alsa fbcon jack jpeg opengl oss png svga test vga vorbis X
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 x86
 LICENSE=Allegro MIT GPL-2+ ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=760b80186a0ceadf949bceb7fbb6ba63
+_md5_=c53d82129018784f887495af828429e5
diff --git a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5 b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
index a6db7f63c1e5..1acc6d11211e 100644
--- a/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
+++ b/metadata/md5-cache/media-libs/ftgl-2.1.3_rc5
@@ -4,10 +4,10 @@ DESCRIPTION=library to use arbitrary fonts in OpenGL applications
 EAPI=6
 HOMEPAGE=http://ftgl.sourceforge.net/
 IUSE=static-libs
-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 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut virtual/pkgconfig
 SLOT=0
 SRC_URI=mirror://sourceforge/ftgl/ftgl-2.1.3-rc5.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52c954ec0c25c7c40ce8c42671d55d5e
+_md5_=c22780efd8edae3f3ee55c2d217820fa
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 1eee7502b7c3..02729eba8ba3 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+BDEPEND=dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 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_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/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_4 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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9e016e0167ca98cc4741ff3ef0e2a570
+_md5_=4b2eb743bbadacbca5e8cb09d80cecda
diff --git a/metadata/md5-cache/media-libs/gexiv2-9999 b/metadata/md5-cache/media-libs/gexiv2-9999
index 1de8c2734242..a45628cd20cb 100644
--- a/metadata/md5-cache/media-libs/gexiv2-9999
+++ b/metadata/md5-cache/media-libs/gexiv2-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/glib-utils virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 DESCRIPTION=GObject-based wrapper around the Exiv2 library
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0392e116d19318ead2a6b77fe58054c8
+_md5_=caeb7612abd81eb5191b5a689bcbde78
diff --git a/metadata/md5-cache/media-libs/glew-2.1.0-r1 b/metadata/md5-cache/media-libs/glew-2.1.0-r1
index 6f7306e75fab..37408ddc84c1 100644
--- a/metadata/md5-cache/media-libs/glew-2.1.0-r1
+++ b/metadata/md5-cache/media-libs/glew-2.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Extension Wrangler Library
 EAPI=7
 HOMEPAGE=http://glew.sourceforge.net/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2.1
 SRC_URI=mirror://sourceforge/glew/glew-2.1.0.tgz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ecbbf3fbeff0904bd73a0b60ee6e4541
+_md5_=9fcff86598141d2432636470461a4ac3
diff --git a/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.0 b/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.0
deleted file mode 100644
index b241cd2a7bde..000000000000
--- a/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=ICC color profiles by OpenICC
-EAPI=4
-HOMEPAGE=https://www.freedesktop.org/wiki/OpenIcc/ProfilePackages
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/openicc/OpenICC-Profiles/icc-profiles-openicc-1.3.0.tar.bz2
-_md5_=f286ecbe311d67b090f0d7374948c00c
diff --git a/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1 b/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
index 27320efba82f..620b2043fb3c 100644
--- a/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source HEVC encoder
 EAPI=7
 HOMEPAGE=http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/ultravideo/kvazaar/archive/v1.2.0.tar.gz -> kvazaar-1.2.0.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v1.2.1.tar.gz -> greatest-1.2.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=052c54711563dceab77554cee47ea6e8
+_md5_=3bc2c6da08d9cd1688da2abc8509f7bf
diff --git a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2 b/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
deleted file mode 100644
index efa07e51776f..000000000000
--- a/metadata/md5-cache/media-libs/libasdcp-cth-0.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/boost dev-libs/openssl:0 dev-util/waf virtual/pkgconfig || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
-DESCRIPTION=implementation of SMPTE and the MXF Interop Sound & Picture Track File format
-EAPI=6
-HOMEPAGE=http://carlh.net/asdcplib
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://carlh.net/downloads/libasdcp-cth/libasdcp-cth-0.1.2.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=d7526a96f02c8ead2c2970810dfed096
diff --git a/metadata/md5-cache/media-libs/libdcp-1.3.4 b/metadata/md5-cache/media-libs/libdcp-1.3.4
deleted file mode 100644
index 2925e8e5c6c6..000000000000
--- a/metadata/md5-cache/media-libs/libdcp-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 <dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec media-libs/libasdcp-cth media-libs/openjpeg:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) dev-util/waf virtual/pkgconfig || ( dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) test? ( app-text/xmldiff )
-DESCRIPTION=create and read Digital Cinema Packages using JPEG2000 and WAV files
-EAPI=6
-HOMEPAGE=http://carlh.net/libdcp
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 <dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec media-libs/libasdcp-cth media-libs/openjpeg:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
-SLOT=1.0
-SRC_URI=http://carlh.net/downloads/libdcp/libdcp-1.3.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=3153bebaa025421f8590bdc9085248da
diff --git a/metadata/md5-cache/media-libs/libdcp-1.4.4 b/metadata/md5-cache/media-libs/libdcp-1.4.4
deleted file mode 100644
index 0754fd7c3177..000000000000
--- a/metadata/md5-cache/media-libs/libdcp-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 >=dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec >=media-libs/libasdcp-cth-0.1.3 media-libs/openjpeg:2 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) dev-util/waf virtual/pkgconfig || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) test? ( app-text/xmldiff )
-DESCRIPTION=create and read Digital Cinema Packages using JPEG2000 and WAV files
-EAPI=6
-HOMEPAGE=http://carlh.net/libdcp
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 >=dev-libs/boost-1.61.0 >=dev-libs/libcxml-0.15.4 dev-libs/libsigc++:2 dev-libs/libxml2 dev-libs/openssl:0 dev-libs/xmlsec >=media-libs/libasdcp-cth-0.1.3 media-libs/openjpeg:2 || ( media-gfx/graphicsmagick media-gfx/imagemagick )
-SLOT=1.0
-SRC_URI=http://carlh.net/downloads/libdcp/libdcp-1.4.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=58754467a3c55d203b469d873b60c32b
diff --git a/metadata/md5-cache/media-libs/libemf-1.0.7 b/metadata/md5-cache/media-libs/libemf-1.0.7
index b1571ad3e2c9..94c47b0b7067 100644
--- a/metadata/md5-cache/media-libs/libemf-1.0.7
+++ b/metadata/md5-cache/media-libs/libemf-1.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library implementation of ECMA-234 API for the generation of enhance
 EAPI=5
 HOMEPAGE=http://libemf.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=~amd64 -arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 -arm ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libemf/libEMF-1.0.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2bb42f6d1c619cce87255b06777691d
+_md5_=1ff5181cbf9e7e5a1757113b5d1e85c9
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.16 b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
index dfdba9c50401..d73d632fb082 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.16
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
@@ -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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.16.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ff2cb086c271fa84178d8cb973b9b6c
+_md5_=0cc3bee30c24e7a1b4de01d54498fa83
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.20 b/metadata/md5-cache/media-libs/libgphoto2-2.5.20
index 524bc45a2887..35da16dd3349 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.20
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.20
@@ -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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.20.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad64da76608a177658fa63563219f3ee
+_md5_=18a6704183617c278b092f747d68d991
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
index 9bd3fc1acea9..ae7c920f62f9 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=003ef159e2ce48a0bbd3b70da5144c8e
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.0-r1 b/metadata/md5-cache/media-libs/libmetalink-0.1.0-r1
deleted file mode 100644
index 7d97c7d1417a..000000000000
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=expat? ( dev-libs/expat ) xml? ( >=dev-libs/libxml2-2.6.24 ) test? ( dev-util/cunit )
-DESCRIPTION=Library for handling Metalink files
-EAPI=4
-HOMEPAGE=https://launchpad.net/libmetalink
-IUSE=expat static-libs test xml
-KEYWORDS=amd64 arm hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=expat? ( dev-libs/expat ) xml? ( >=dev-libs/libxml2-2.6.24 )
-REQUIRED_USE=^^ ( expat xml )
-SLOT=0
-SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.0/+download/libmetalink-0.1.0.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61632aea4d470c1d532f4916e4f5ae31
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.1 b/metadata/md5-cache/media-libs/libmetalink-0.1.1
deleted file mode 100644
index d70d5acd5af7..000000000000
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=expat? ( dev-libs/expat ) xml? ( >=dev-libs/libxml2-2.6.24 ) test? ( dev-util/cunit )
-DESCRIPTION=Library for handling Metalink files
-EAPI=5
-HOMEPAGE=https://launchpad.net/libmetalink
-IUSE=expat static-libs test xml
-KEYWORDS=amd64 arm hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=expat? ( dev-libs/expat ) xml? ( >=dev-libs/libxml2-2.6.24 )
-REQUIRED_USE=^^ ( expat xml )
-SLOT=0
-SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.1/+download/libmetalink-0.1.1.tar.bz2
-_md5_=a60a5913ec817bed5b1557143ae39e81
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1
deleted file mode 100644
index e7cf592110be..000000000000
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/alsa-lib media-libs/freetype x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Audio library used by OpenShot
-EAPI=6
-HOMEPAGE=https://www.openshot.org/ https://launchpad.net/libopenshot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/alsa-lib media-libs/freetype x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
-SLOT=0
-SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.1.2.tar.gz -> libopenshot-audio-0.1.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4445153390e117c10cda6bc3f5a4eb21
diff --git a/metadata/md5-cache/media-libs/libopusenc-0.2.1 b/metadata/md5-cache/media-libs/libopusenc-0.2.1
new file mode 100644
index 000000000000..0fab038c748a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopusenc-0.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/opus-1.1:= doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=High-level API for encoding .opus files
+EAPI=7
+HOMEPAGE=https://www.opus-codec.org/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=media-libs/opus-1.1:=
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/opus/libopusenc-0.2.1.tar.gz
+_md5_=65f877a2cb3985b9eeec0d036f33ae89
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.9 b/metadata/md5-cache/media-libs/libsdl2-2.0.9
index fa023918f64f..1703372e16bd 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.9
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) kms? ( >=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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) vulkan? ( video ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4aeee80bdd92d89659af499b71790f6
+_md5_=813939c51bce27914c11161256a943e7
diff --git a/metadata/md5-cache/media-libs/libsub-1.1.13 b/metadata/md5-cache/media-libs/libsub-1.1.13
deleted file mode 100644
index c1cdee48a813..000000000000
--- a/metadata/md5-cache/media-libs/libsub-1.1.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= <dev-libs/libcxml-0.15.4 dev-libs/openssl:0 media-libs/libasdcp-cth dev-util/waf virtual/pkgconfig || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
-DESCRIPTION=read and write subtitles in a few different formats
-EAPI=6
-HOMEPAGE=http://carlh.net/libsub
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= <dev-libs/libcxml-0.15.4 dev-libs/openssl:0 media-libs/libasdcp-cth
-SLOT=1.0
-SRC_URI=http://carlh.net/downloads/libsub/libsub-1.1.13.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=49788254b4c0c6557205c33258f45ac4
diff --git a/metadata/md5-cache/media-libs/libsub-1.2.4 b/metadata/md5-cache/media-libs/libsub-1.2.4
deleted file mode 100644
index 19e8fc187467..000000000000
--- a/metadata/md5-cache/media-libs/libsub-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= >=dev-libs/libcxml-0.15.4 dev-libs/openssl:0 >=media-libs/libasdcp-cth-0.1.3 dev-util/waf virtual/pkgconfig || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
-DESCRIPTION=read and write subtitles in a few different formats
-EAPI=6
-HOMEPAGE=http://carlh.net/libsub
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= >=dev-libs/libcxml-0.15.4 dev-libs/openssl:0 >=media-libs/libasdcp-cth-0.1.3
-SLOT=1.0
-SRC_URI=http://carlh.net/downloads/libsub/libsub-1.2.4.tar.bz2
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=00a1d86b3a86c9702708cdca53814f9c
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
index ef6699c3992b..a038b078e044 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
@@ -4,10 +4,10 @@ DESCRIPTION=A library for reading vector images in Microsoft's Windows Metafile
 EAPI=6
 HOMEPAGE=https://wvware.sourceforge.net/
 IUSE=debug doc expat 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 ~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=LGPL-2
 RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2[X?] virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5c04a8e003856d44c8d59a6c0075e33
+_md5_=603b808f4b6a23c2df7e7c293bdf1a5e
diff --git a/metadata/md5-cache/media-libs/libzmf-0.0.2 b/metadata/md5-cache/media-libs/libzmf-0.0.2
index 8ba944789c74..bb68e20f964e 100644
--- a/metadata/md5-cache/media-libs/libzmf-0.0.2
+++ b/metadata/md5-cache/media-libs/libzmf-0.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for parsing Zoner Callisto/Draw documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libzmf
 IUSE=debug doc test tools
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libzmf/libzmf-0.0.2.tar.xz
-_md5_=211e5393716513001553d6d4c3742097
+_md5_=ff1ca739e22dd8285c2ac2f1553cb550
diff --git a/metadata/md5-cache/media-libs/mesa-18.2.8 b/metadata/md5-cache/media-libs/mesa-18.2.8
index 00bdbd8f96e1..01845bbb8a7c 100644
--- a/metadata/md5-cache/media-libs/mesa-18.2.8
+++ b/metadata/md5-cache/media-libs/mesa-18.2.8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.2.8.tar.xz
 _eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9d2380d827c9a23ef979323026af8909
+_md5_=55c81230b1ee2be3accf06062889ac86
diff --git a/metadata/md5-cache/media-libs/mesa-18.3.2 b/metadata/md5-cache/media-libs/mesa-18.3.2
index 8bc7cdcbb7d7..a94f51f019ac 100644
--- a/metadata/md5-cache/media-libs/mesa-18.3.2
+++ b/metadata/md5-cache/media-libs/mesa-18.3.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-18.3.2.tar.xz
 _eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=23b26b44a53c06f4757d5fe637f38827
+_md5_=a9fd63f21b5f7cb7225ff298d775ece4
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index c8877cb4b245..a1e24a92f903 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4db72eda8d0cb049add451a77deb097a
+_md5_=7afad2332c6949eae26488d037e70a85
diff --git a/metadata/md5-cache/media-libs/mlt-6.10.0-r1 b/metadata/md5-cache/media-libs/mlt-6.10.0-r1
deleted file mode 100644
index 79facf79d4b6..000000000000
--- a/metadata/md5-cache/media-libs/mlt-6.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
-DESCRIPTION=Open source multimedia framework for television broadcasting
-EAPI=6
-HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/mltframework/mlt/archive/v6.10.0.tar.gz -> mlt-6.10.0.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5d761dd96fa9391d4d855f06cdb2edc6
diff --git a/metadata/md5-cache/media-libs/netpbm-10.76.00 b/metadata/md5-cache/media-libs/netpbm-10.76.00
index 11f1872fdf57..44c70bf1998d 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.76.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.76.00
@@ -4,10 +4,10 @@ DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) f
 EAPI=5
 HOMEPAGE=http://netpbm.sourceforge.net/
 IUSE=doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-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=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://gentoo/netpbm-10.76.00.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53a2035559d997a9eb79f27b415586f9
+_md5_=6ed9a6d0e1116f2d6540fc9708c879f1
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1 b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
index 480925b45873..86766c0bea9e 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=https://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6b92497b7911f2c22acbbdfc09665233
+_md5_=5f8e45a3f04e278789f52a7f6383a809
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.3 b/metadata/md5-cache/media-libs/sdl2-image-2.0.3
index b5089aafb5b0..91bf13d59ba2 100644
--- a/metadata/md5-cache/media-libs/sdl2-image-2.0.3
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=media-libs/libsdl2-2.0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Image file loading library
 EAPI=6
 HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
 IUSE=gif jpeg png static-libs tiff webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=ZLIB
-RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/libsdl2-2.0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.3.tar.gz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=afc68a21a91b698a1bfe89084a49e47c
+_md5_=c62994b688fe8342f6596ad8939d2d3e
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.4 b/metadata/md5-cache/media-libs/sdl2-image-2.0.4
index b4e6937002f0..6a63dcdd87c9 100644
--- a/metadata/md5-cache/media-libs/sdl2-image-2.0.4
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=media-libs/libsdl2-2.0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Image file loading library
 EAPI=7
 HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
 IUSE=gif jpeg png static-libs tiff webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=ZLIB
-RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/libsdl2-2.0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.4.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0af65a65ade0bfc327440998d1c7f02d
+_md5_=688ce1ce78b901f3304bf60b71b6133f
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15 b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
new file mode 100644
index 000000000000..da69d1e4c73e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
+EAPI=7
+HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
+IUSE=static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.15.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=dc577f291a5018f163b9660fde16e7f8
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028 b/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
index ff3cb0ff3c8d..b6bdd6349cde 100644
--- a/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
+++ b/metadata/md5-cache/media-libs/taglib-1.11.1_p20181028
@@ -4,10 +4,10 @@ DESCRIPTION=A library for reading and editing audio meta data
 EAPI=6
 HOMEPAGE=https://taglib.github.io/
 IUSE=debug examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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-solaris
 LICENSE=LGPL-2.1 MPL-1.1
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/5cb589a5b82c13ba8f0542e5e79629da7645cb3c.tar.gz -> taglib-1.11.1_p20181028.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=909351c878e6de9b3499f752e548cfc3
+_md5_=58b732d7c0fceeb56ee696343ab7d411
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 67221e39c557..e291d36ec116 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/calf-0.90.0 b/metadata/md5-cache/media-plugins/calf-0.90.0
index 03ca08850c8e..ca0ea81794f5 100644
--- a/metadata/md5-cache/media-plugins/calf-0.90.0
+++ b/metadata/md5-cache/media-plugins/calf-0.90.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack?
 SLOT=0
 SRC_URI=https://github.com/calf-studio-gear/calf/archive/0.90.0.tar.gz -> calf-0.90.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=525642fc4e33e3113b74fe158412db50
+_md5_=8c68f2b865dc63f3f53057d908b3735e
diff --git a/metadata/md5-cache/media-plugins/calf-0.90.0-r1 b/metadata/md5-cache/media-plugins/calf-0.90.0-r1
deleted file mode 100644
index d2e4dffab9c6..000000000000
--- a/metadata/md5-cache/media-plugins/calf-0.90.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) 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 set of open source instruments and effects for digital audio workstations
-EAPI=6
-HOMEPAGE=http://calf-studio-gear.org/
-IUSE=cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=https://github.com/calf-studio-gear/calf/archive/0.90.0.tar.gz -> calf-0.90.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=94ca3aacd8f904030a3387617b2c231c
diff --git a/metadata/md5-cache/media-plugins/calf-0.90.0-r2 b/metadata/md5-cache/media-plugins/calf-0.90.0-r2
new file mode 100644
index 000000000000..4c0ceed9c394
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/calf-0.90.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) 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 >=sys-apps/sed-4
+DESCRIPTION=A set of open source instruments and effects for digital audio workstations
+EAPI=6
+HOMEPAGE=http://calf-studio-gear.org/
+IUSE=cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=https://github.com/calf-studio-gear/calf/archive/0.90.0.tar.gz -> calf-0.90.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=386d32440b601460d391b67c8d1d15fd
diff --git a/metadata/md5-cache/media-plugins/calf-9999 b/metadata/md5-cache/media-plugins/calf-9999
index b7ccaa3bb1a9..82fa35702f3d 100644
--- a/metadata/md5-cache/media-plugins/calf-9999
+++ b/metadata/md5-cache/media-plugins/calf-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) 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=configure postinst postrm prepare unpack
+DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) 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 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A set of open source instruments and effects for digital audio workstations
 EAPI=6
 HOMEPAGE=http://calf-studio-gear.org/
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 media-sound/fluidsynth jack? ( virtual/jack ) gtk? ( x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=94ca3aacd8f904030a3387617b2c231c
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=386d32440b601460d391b67c8d1d15fd
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1
new file mode 100644
index 000000000000..22364d890d0b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Timidity decoder addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5dc490a7a16f40cd51cb8a0ff78fc9c2
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index 26c5244280b3..d8e800b375c9 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Timidity decoder addon for Kodi
 EAPI=6
 HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
 LICENSE=GPL-2
-RDEPEND=~media-tv/kodi-9999
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e285929a296d72578837b277ffd0b583
+_md5_=571992f8b605b85c6b93be06ccfa0c06
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.17 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.17
new file mode 100644
index 000000000000..02eaa4f5d077
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's MediaPortal TVServer client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/3.5.17-Leia.tar.gz -> kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=daf3077932ad9d8f2b73951dfb1bf532
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.9 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.9
new file mode 100644
index 000000000000..c3506cb0309a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Shadertoy visualizer for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/xbmc/visualization.shadertoy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/1.1.9-Leia.tar.gz -> kodi-visualization-shadertoy-1.1.9.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=82e16ece6927edf18a4f44ea64e3f124
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
index 650a7817cd95..81350c3ca6aa 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.23 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ventoso.org/luca/vdr/vdr-actuator-1.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7b88546287718a9619a797f7947bfa51
diff --git a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
index c02381d6af96..aa9a354abc12 100644
--- a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-atscepg-0.3.0.tgz mirror://gentoo/atscepg-0.3.0_vdr-1.7.13.tbz https://dev.gentoo.org/~hd_brummy/distfiles/atscepg-0.3.0_vdr-1.7.13.tbz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f44b37a6f843aec0e8ae429bdd63964a
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index c0bffc6ce0c0..6acb36add876 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=948d8cd646d0102f1d81ec477eb60ad5
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index 3de51b13aa95..53203e7e4f64 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.deltab.de/component/option,com_docman/task,doc_download/gid,104/Itemid,62/ -> vdr-beep-0.1.2.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=3d7d0a48af7061fd7710842511a6b43c
diff --git a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0 b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
index 3532750a5cc0..0bb9b5ef91c8 100644
--- a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.reelbox.org/software/vdr/vdr-bgprocess-0.1.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=9aa190c21d15b5c583de58559bfb8c6d
diff --git a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0 b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
index 5e3dbe87ef77..72357a13ff98 100644
--- a/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-browse-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-browse-0.2.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bc2e5b2c8e3c0285154373503003b1f3
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
index f99daa56871c..540e20f4aa41 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdio-0.71 >=media-video/dvdauthor-0.6.14 >=media-video/mjpegtools-1.6.2[png] media-video/transcode media-fonts/corefonts virtual/eject >=app-cdr/dvd+rw-tools-5.21 >=media-video/projectx-0.90.4.00_p32 dvdarchive? ( media-video/vdrtools-genindex ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1252/vdr-burn-0.2.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=cbcacfb420500f3729faa12c97741d16
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index d73d93c000cf..4c58dac2b6eb 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdrcalc.bmschneider.de/dateien/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d4752d82532ac61a6419123f662b440b
diff --git a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2 b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
index 231d49138878..4f4ed53995a8 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://www.uli-eckhardt.de/vdr/download/vdr-cdplayer-1.2.2.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f4d776e9daba5a695c1f4268ea00bf70
diff --git a/metadata/md5-cache/media-plugins/vdr-chanman-0.0.9 b/metadata/md5-cache/media-plugins/vdr-chanman-0.0.9
index 44ba29bf4f03..743ee1f8c5ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-chanman-0.0.9
+++ b/metadata/md5-cache/media-plugins/vdr-chanman-0.0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/993/vdr-chanman-0.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=84a53662f07cf73bc11e3a6a93a955fc
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index c39189e1866c..a62e04edec3c 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=572a26682e3fe2cb7afaebefd9dd2952
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r1
index 69c25aa79da4..f96dba9134d4 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.aistleitner.info/vdr-clock-1.0.0.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0bf835bfed1495ed3569ed478eb62a2b
diff --git a/metadata/md5-cache/media-plugins/vdr-console-0.6.0 b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
index d756d7e975ee..1e6829dc857b 100644
--- a/metadata/md5-cache/media-plugins/vdr-console-0.6.0
+++ b/metadata/md5-cache/media-plugins/vdr-console-0.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ricomp.de/vdr/vdr-console-0.6.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d995d70e8d372f3e7d4b93317e3ca808
diff --git a/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2 b/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
index 81bfddb72610..02a4beb8acae 100644
--- a/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-coverviewer-0.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-music >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.kost.sh/vdr/vdr-coverviewer-0.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=3daf9e1c7cb80f3de82b7afd525c2b00
diff --git a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1 b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
index 7d7395c8abc2..d6209ad50baa 100644
--- a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
+++ b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.christianglass.de/cpumon//vdr-cpumon-0.0.6a.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=989465271ff8ec8911b3f10c4b84e760
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
index 8dfe21a48ab9..458b3180c4a4 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.4.tar.gz -> vdr-ddci2-1.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index 96082806fe53..0356cae39179 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-9999 b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
index c36a5f1efd83..811996bd27d1 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-9999
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jasmin-j/vdr-plugin-ddci2
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1 b/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
index a2642e7fbafd..cc7590540ce6 100644
--- a/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-decruft-0.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.21-r2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f783ddf6a9b969bf9f39934c48c0c278
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
index 8fe93e9a93fe..6acaa5d9ad3f 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7960515ffabcbe506c6dc5b3f9c53c45
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
index cbceeaa65c9d..31ea35751b20 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-2.0.0.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c47b1cefad24a8e68c11077f45c78c89
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
index 0dcd48e97a4c..016aeac252f0 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=5ae02aa4c2678a5b5cfdd52c1dba48a5
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
index 8f21f87dfa60..a75f67c8f04f 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d623b9858fe94f0c46c969990cb51799
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
index 0dd7e8cd968c..b28f4ebe23cf 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.1.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=336c949700287f44f0c51d4cc30ed0e3
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.1.1 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.1.1
index 7ee4db8f39dd..bcd2c47d56c9 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.1.1.tar.gz -> vdr-dvbapi-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=27f2ea587624cbf577cd8bae38a2b7ea
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.2 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.2
index ad19f73ff3c3..ce99338406a6 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.2.tar.gz -> vdr-dvbapi-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=a1450e1630a3fedb926fd687dd25d35f
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
index cfc75ff573da..04a607158d36 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.4.tar.gz -> vdr-plugin-dvbapi-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=baac8fd160e0447918c663d187c70628
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
index 9b736ad59f0d..007c63dd6cd0 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c9d4e09c84b87bf99157cf9c875ece78
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115-r1 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115-r1
index a94bfbd2d7d5..f2fe6276b2c7 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=cb8fb61dd2e3a161565052976f2d87da
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.6_p20141116-r1 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.6_p20141116-r1
index 38dd7e52a758..eaed30b986cb 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.6_p20141116-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.6_p20141116-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/88cd727ebc99.tar.gz -> vdr-dvbhddevice-2.1.6_p20141116.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d8f231177cb4a91728cf6655eea220a6
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
index ddc02992cd4e..201d60d5e5de 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=833408bc4505e0deb1637dcdc16a02be
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
index a637f633db7c..533253a6f290 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvbsddevice-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=6877c33328340ad4b6dd05b3a2e9ac19
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
index bdf86d126037..a5e9b5af803f 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=478da0e8a903f7fc165d7d85541e3d29
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
index fda37c71147e..3a2011ed7d37 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1323/vdr-dvdswitch-0.2.2.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2b4723259b88f85c33dfffa4675a3851
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
index 64aeb53312dc..a41734cb75f3 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
@@ -10,5 +10,5 @@ RDEPEND=media-video/vdr pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.tar.gz -> vdr-epgsearch-1.0.1_p20141227.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=5a3830c0a30c9647e2ca40450355847c
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
index 44ed1e209f19..06152ef73a51 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
@@ -10,5 +10,5 @@ RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.2.0.tar.gz -> vdr-epgsearch-2.2.0.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=47d594fb90526edc82d58344d7478e3a
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
index 423c97663143..f7768155d79e 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1c7eee23090850887927dfcd04bb4b94
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index 736346d3b245..30eeb992ce9e 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/exec/vdr-exec-0.0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=82710cf8dba01451e1384d1cfaf941c6
diff --git a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1 b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
index 604f3b2c7f73..cb812b479d87 100644
--- a/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-extb-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 app-misc/lirc >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.deltab.de/component/option,com_docman/task,doc_download/gid,102/ -> vdr-extb-0.3.1.tar.gz mirror://vdrfiles/vdr-extb/extb_firmware_1.08_lircd.conf.zip mirror://vdrfiles/vdr-extb/extb.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c83fa20eb705ef760ea2334408207ef0
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2-r2 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2-r2
index b2b8c5821ac0..a15c7fb2edd7 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2-r2
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/936/vdr-extrecmenu-1.2.2.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=80f523c8cba320c33686052c28e24cbe
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
index 98b29e2da636..ec687ccb66b8 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1783/vdr-extrecmenu-1.2.4.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=80fad907d5c2cfcd14b468e4ab6dc3c6
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4 b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
index 6b85cf614a90..d1f6512094a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.0.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0391a4a7a3d5f401a95086212dc4d51d
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
index 63dcc8a58bcb..eefd1fc7b40c 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.1.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=fe9e057731e22bbb7cd8d28ee6355fa4
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
index fe751f7818a6..b1ec6f28226b 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=209e7a92984367c9c8f20a683126a26e
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
index d6fab7369776..98c948804182 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0dd40595b762c197d59d709f129f3f89
diff --git a/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1 b/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
index 12320b6c2b8d..1b7d929f2795 100644
--- a/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-fepg-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-fepg-0.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2643babc400378104a68f5f98d844e74
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
index 741bace87483..b6e1ccce92a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/837/vdr-ffnetdev-0.1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bbd0fc3f9138f4edaa0a339f9affaccc
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
index be1c73b19aa0..5e54be678279 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.nasenbaeren.net/filebrowser/vdr-filebrowser-0.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=101b27b142877aa1cbd8cbca314169fd
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
index 4af2ecbdef2a..4218e3a1f1ed 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.magoa.net/linux/files/vdr-freecell-0.0.2.tgz mirror://vdrfiles/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=4ee60d13337cf724a94682c9ca778990
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3
index 236b6b08244d..9e26eabf6829 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 dev-libs/libgcrypt:0 dev-libs/boost[threads] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=6b68d80489e7feab8dd8e9481d71f7ae
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9 b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
index 541a0d8441f1..f52defc0cf0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-0.1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/graphlcd-base-0.1.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/502/vdr-graphlcd-0.1.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=fb1b8f09eecf7de8c442bb578f33d8ae
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
deleted file mode 100644
index 141d261d0207..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-0.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/freetype nls? ( sys-devel/gettext ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers virtual/pkgconfig
-DESCRIPTION=VDR Plugin: shows information about the current state of VDR on iMON LCD
-EAPI=5
-HOMEPAGE=http://projects.vdr-developer.org/wiki/plg-imonlcd
-IUSE=nls kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/408/vdr-imonlcd-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=6913c02b9072468a724ecc971d920c2c
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
deleted file mode 100644
index 57db6367bf25..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-libs/freetype media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers virtual/pkgconfig
-DESCRIPTION=VDR Plugin: shows information about the current state of VDR on iMON LCD
-EAPI=5
-HOMEPAGE=http://projects.vdr-developer.org/wiki/plg-imonlcd
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/1327/vdr-imonlcd-1.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
-_md5_=ed341481962743282a93dab0478794a2
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index 9c8e018b5607..9bf42b119c1a 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=02ff8d4077d16f6379f2ddf428b88acc
diff --git a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.12 b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.12
index 0fda818ac34b..5dcbe60d07dc 100644
--- a/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.12
+++ b/metadata/md5-cache/media-plugins/vdr-infosatepg-0.0.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1098/vdr-infosatepg-0.0.12.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=82cbce19413bd4092dbebe4e1aa260a2
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
index 0815f16acab0..285b111b8bfb 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.2.1.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=20224ed271d8566781ce4fddb83e068e
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 66b818872417..d19509dfb792 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bce51eb7fe9ed784602a799a03572a13
diff --git a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6 b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
index e3e4aaef9d79..0cfc9f54870c 100644
--- a/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-kvdrmon-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://sourceforge/vdr-statusleds/vdr-kvdrmon-0.6.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=153732b47d929b7e750e7cad191e2994
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
index eaf0196614e8..d93d6b5b2c74 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=97bc0b18db9573a8f219562b8243304e
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index 416a3e041e70..e4700fb86b07 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=151988d53b34332bf4b16230ed235b16
diff --git a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9 b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
index 4812a4473a6b..14d082d87713 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-lcr-0.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=9e35d28ea3b5d9c333d795f55e5d9ba4
diff --git a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
index 7d19edd3a085..486b306f1f38 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-perl/libwww-perl-5.69-r2 >=dev-perl/HTML-Parser-3.34-r1 >=www-client/lynx-2.8.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-lcr-0.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=fc3ca9526f3fd22be892adffebf28a02
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index 76bfa8401a5f..9225b81d93c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=4fba2231249611b5c8b038a4b2ca4ffe
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
index 3fdc95110fae..fde8626d52da 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=6cf8ec7cd7ec0cb8059b8c8890f9c4f6
diff --git a/metadata/md5-cache/media-plugins/vdr-live-2.3.1 b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
index f1b8197676c8..ff09642e7382 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-2.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/release_2-3-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bf529ef2282ec17e6c1afc6fd2057997
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
index 6bf638a4b39f..7467104a5dc3 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=384512d0229e06b89adf9309550ad0da
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.5 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.5
index 39bf6493d15d..b69534377b7b 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=3b7ed611986441fb9272ce6b311e5361
diff --git a/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1 b/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
index 34e9df8d6ba2..79daddfb9684 100644
--- a/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.41 >=net-libs/c-client-2002e-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://alex.vdr-developer.org/download/vdr-mailbox-0.7.0.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=77bdfa6a41f02da527c00fe815db3ed8
diff --git a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4 b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4
index e805d21c0f2e..ebd91190020e 100644
--- a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 virtual/ffmpeg[mp3,x264] !media-video/noad >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1041/vdr-markad-0.1.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=286289e4e8f02a1ef09ad99438e060ca
diff --git a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r1
index 993d8962746d..a9d38599308f 100644
--- a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 virtual/ffmpeg[mp3,x264] !media-video/noad >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1041/vdr-markad-0.1.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=df00589d5adb825480e442f2c998710e
diff --git a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r2 b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r2
index d4182810e9a1..3efada5eb2ae 100644
--- a/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r2
+++ b/metadata/md5-cache/media-plugins/vdr-markad-0.1.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 virtual/ffmpeg[mp3] !media-video/noad >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1041/vdr-markad-0.1.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=61a7ded4b162482d3daab28ad6651857
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
index af6a4aaeabd9..7515a74c9383 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1312/vdr-menuorg-0.5.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=cce9c2cf7095c8f421d889fdb97996ed
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
index 4e6055a42de2..fc3821aa46d3 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://joachim-wilke.de/vdr-mlist/vdr-mlist-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1ac5f27fd4630e9a212641d9c47c3764
diff --git a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2 b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
index 423cc303211d..eecc918123ec 100644
--- a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://homepages.physik.uni-muenchen.de/~Felix.Rauscher/vdr-mount-0.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c738922125dac3a0bf1c199d222093b5
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r1 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r1
index 74ddbed1c6fe..a733a330ad24 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.glaserei-franz.de/VDR/Moronimo2/downloads/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2bb47808b136c051449f35e710c51a8b
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
index 16006059d7d1..57f811f45173 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d7e0f9e0648ea510ed9974d373e71184
diff --git a/metadata/md5-cache/media-plugins/vdr-music-0.9.9 b/metadata/md5-cache/media-plugins/vdr-music-0.9.9
index 75d90beb3f40..3bb93b642228 100644
--- a/metadata/md5-cache/media-plugins/vdr-music-0.9.9
+++ b/metadata/md5-cache/media-plugins/vdr-music-0.9.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-process/at media-sound/id3v2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.glaserei-franz.de/VDR/Moronimo/files/vdr-music-0.9.9-dev2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1a8311381eda74dd2bf39c6610a82b70
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index c233f2a9c881..da9c2be0ec9e 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.wontorra.net/filemgmt_data/files/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=89283fef0a33bf765768c196f7b19a5f
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
index 92dee33ddf51..de6a8d9ce127 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.4.tar.gz -> vdr-noepg-0.0.4.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=54e9303daec358a8d0ad12fc5ad9e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1 b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
index c0570ae457c0..181fa81639b4 100644
--- a/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-nordlichtsepg-0.9_pre1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://martins-kabuff.de/download/vdr-nordlichtsepg-0.9-test1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=feb9f3df8062c24849eb8a870b61a3a2
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.2-r1 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.2-r1
index ebf02f6148d2..7928e8bb5147 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.27 >=media-libs/libmpeg2-0.5.1 >=virtual/ffmpeg-0.6.90 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/961/vdr-osdpip-0.1.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=9d994b1a92536762cd080e2b3ca66dd0
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
index bbbd06a6dba8..68f49d0d297c 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2b208c71c6151d8bbfb5a2fc407e407e
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index 54e31cab1d0c..29940a148d6e 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0a7ff78af1bba1af53351dd1670a76b3
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
index eb9370a8c833..164c60a34ae4 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1282/vdr-osdteletext-0.9.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=06197b2cb509a1b22dd1d1d6d07eca3e
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
index 21de77239a58..19bc8b6b85db 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1881/vdr-osdteletext-0.9.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c895b1964f6e48a15596a21a6df6195f
diff --git a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1 b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
index ad60e3be0d44..a333b2646a35 100644
--- a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/peer/vdr-peer-0.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d6a5e2849458967730e0fbccfd7e54dd
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1
index 1e45ac3b4546..0ba36e1c3433 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ee5ec75909bff730b3166b72e2072eb0
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
index ce36aa42b1c6..84e5157b03db 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7040d7ce352480fc094ab8c5c17bb52b
diff --git a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
index 0acaf7513dd9..2357aa69798a 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilotskin-0.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdrwiki.free.fr/vdr/pilotskin/files/vdr-pilotskin-0.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c252b00fbe978cf18a3e3a4c85b8d28b
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
index 1159f5f26910..325218f4467d 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1379/vdr-pin-0.1.14.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=825ac4fa81444d69991f628fe108f1fe
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index 7c7dfa74bf5c..7001bd478782 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d1e2bb48fc4186ce6cb9fdaebc458818
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
index 2557b1f0cd50..2e9f80aaa461 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.4.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0e1605f067432a6bb06789964634b2d1
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
index cc2f407e79e1..47cb1faa4b73 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec yaepg? ( >=media-video/vdr-2[yaepg] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1657/vdr-pvr350-1.7.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=374b5a4bd15f9ca068a48becc8194991
diff --git a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17 b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
index 56b1bd416692..2b33c7b39329 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
+++ b/metadata/md5-cache/media-plugins/vdr-pvrinput-2011.09.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-pvrinput-2011.09.17.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f61e53d7ce6134eb7188ea0af03ed9f7
diff --git a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1 b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
index f75ad069b575..20e23c907608 100644
--- a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-quicktimer-0.1.1.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=dbf567be745e30d49835701c49572ee2
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
index 9bdc410cad4e..02e1b6295398 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.1.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ffbf723f26a9495693b896b3a477f4e7
diff --git a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2 b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
index 6097eaa62db2..e28c58a9d615 100644
--- a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://194.95.44.38/~pjuszack/digicam/download/vdr-radiolist-0.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1d529bdb842a4c829eaf089f0962516c
diff --git a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
index e905e74a8a6c..2a08b17ee6a1 100644
--- a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-rcu-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-rcu-2.2.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7b579ecc7b0a56a02ea744e6f199082e
diff --git a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.5 b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.5
index 1d91a65abfee..e2d91b7df683 100644
--- a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.5
+++ b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-recsearch/archive/v0.3.5.tar.gz -> vdr-recsearch-0.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=3eafed41672f8b1159c4ee7d77b8ff56
diff --git a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8 b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
index 46e3b9331aa1..fbf85a709e25 100644
--- a/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
+++ b/metadata/md5-cache/media-plugins/vdr-recstatus-0.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://www.constabel.net/files/vdr/vdr-recstatus-0.0.8.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=53102452105e8d964f2c6279b0e64513
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
index 410f5130bc55..5ff3c763cb03 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.6.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1f4bebc960c01c9cb13ffd9e04646392
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
index 7a7eda176349..f079d4bd75be 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=a1e01b47e15b102ea443f31719931fa1
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
index 9949dc664419..ce30ab0822b5 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ad796d28327298dea905ab45557720b8
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
index f7b787480469..28a2184da40e 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=d0693e31fcba03290f78d60ed68df334
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.10 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.10
index ffed882ed1dd..854b0fd6a592 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.10
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-libs/raspberrypi-userland-0_pre20140117 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1817/vdr-rpihddevice-0.0.10.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=175560f506d06a6bfa91d4c15d8f8cde
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.11 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.11
index d87444e51c82..4c534590e460 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.11
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-0.0.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-libs/raspberrypi-userland-0_pre20140117 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1861/vdr-rpihddevice-0.0.11.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0143da80c96b5ec91b5c102550b29e8a
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.0 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.0
index fc9335f8337d..804399ebcccd 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-libs/raspberrypi-userland-0_pre20140117 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1966/vdr-rpihddevice-1.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=54a896d19ae35688c043d3b703be5e8b
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
index 86d12a708f01..4e6daa8fb777 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-libs/raspberrypi-userland-0_pre20140117 virtual/ffmpeg >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2045/vdr-rpihddevice-1.0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7e3434945d5af9addd1c90b3e009cfba
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
index 844800afbb92..f9c98b2ba941 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=b089105b16b23d274e0f949cbacc0184
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
index 3ca373562e44..2f27f6f8a734 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=8caa2808970f823b9d88d60754ee9cd1
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
index 4778f3c1122e..78fb7c5a64a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
index 1c631d36ff32..8fd845e40c5c 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
index 5e9f6581b4ab..c1abaa03b1ff 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=a0c81d93b7f3eb659fb687aa8c353fcf
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
index 8ebeb98afc36..db07273c8062 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.3.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=17fa586ddd75f265fb01bc8d1232731d
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index 5116e8b4426c..20f59803f2a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=550e7c47a800e0aca1a28ff157368f57
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
index 59224bfbc44f..7b50c412f615 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.joachim-wilke.de/downloads/vdr-screenshot/vdr-screenshot-0.0.15.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bc8cb77f0838103bd4b4d9ef10457f55
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index a2dab44763f0..5efb551573c3 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz mirror://vdrfiles/vdr-serial/vdr-serial-0.0.6a.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=657214953b43503959b96a545eb927e9
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
index d03572c83c78..8c8a689480cb 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-skincurses-2.2.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=9d04c2d764760e526873baac0f341a2e
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0
index 704fc3cd7de8..2c04923093d2 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=487c9c601785d92dc4e346077f3935dc
diff --git a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2_p20130302 b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2_p20130302
index 1d3658e3dcfe..ce7c158fa5cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2_p20130302
+++ b/metadata/md5-cache/media-plugins/vdr-skinenigmang-0.1.2_p20130302
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 x11-themes/skinenigmang-logos imagemagick? ( media-gfx/imagemagick[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-skinenigmang.git/snapshot/vdr-plugin-skinenigmang-0147c0ee6222bd10714ef36f42dcee94495bdb92.tar.gz -> vdr-skinenigmang-0.1.2_p20130302.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=b25914e9b7b4eb5ed508f75e523d65f1
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
index a3ffce64ca6c..c311d37e6deb 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=4d5899362162c490c3f983524adafd9f
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
index b3fa7084d67f..612eab020ff9 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=489da1878f4418af51880565902f6609
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
index e70186c0d12e..9583c033be6a 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
index 90af86043a4e..419bdd2f8122 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index 5fa97daef271..43a7af1608e9 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=993d2e65d97fcaa636bf783482528fff
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 18e3a9e61c5b..0f9d556cbcfc 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr-portal.de/board/attachment.php?attachmentid=25497 -> vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=11cab65e14a15f2f8916ea459c6ca500
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index 0155fe619655..42473c409d91 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=dc07ffbd9d945180def7427aa33dda8e
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index ddadfe3d17e1..e64abf0419f2 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c384c44b1a6671a0a6c8c920be18f49c
diff --git a/metadata/md5-cache/media-plugins/vdr-spider-0.2.2 b/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
index 79481cf0163c..0442ed1766b2 100644
--- a/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-spider-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://toms-cafe.de/vdr/spider/vdr-spider-0.2.2.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=23f4d6c2e1f3801ab5f83b57ba2d50c3
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
index 209bc9f50439..ef3a851d3915 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1580/vdr-streamdev-0.6.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f1e2ad841f10714a09fa0bf59b19f9ad
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
index 54358f669153..6d1e3a97d108 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=52cba881086dd881f92f53026aacac8f
diff --git a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5 b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
index a889569c39a7..fc7dc579dc70 100644
--- a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
+++ b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/280/vdr-sudoku-0.3.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c3798119031046c4c2be909fe3781b00
diff --git a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1 b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
index aaa89d788078..834a7556e8fb 100644
--- a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/280/vdr-sudoku-0.3.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7b4e037f7e9cb43d8946be52e35a5d7b
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
index c7f812dbda59..aeb3e71867e7 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ff6c75e17e7f7b97f201443dc72dc780
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
index 5f011ebfee31..e35df2771a20 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpext/vdr-svdrposd-1.0.0.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=de14083fe23eb7fa879f850a0fb815af
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
index dd479acf386f..fd0aaa44658e 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=470c1b7e02b8fb15189d447035842db3
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
index e89720235480..6591e7b98430 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2e5111de8f9ba0760f518dc9dc37ab1c
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
index 2be6e4352ec6..944ee4cc92a9 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=7c9993287f76ae5db43b5df632d5a3df
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
index 352d6c603299..fdc474fd3709 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=8f8e607581e843b829387eae066d2f6d
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
index a372cea0d3f6..c85432282fb1 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.38[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=de191e3b495699f8d3f89d216780aaba
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
index 66a0076dd46f..e960b4e15230 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ea2479542b1bbce9bd1d4c582f80e665
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
index cf9822502030..fc1ac7ab5129 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=861f7aec85e45d052e2d42af388bbdd1
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
index d9dddda338f9..59127e059a04 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr.heiligenmann.de/download/vdr-vcd-0.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=98c0e1e203180e0ca5b5ee044aa9b85b
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index b0edbcdc5787..838249ea3c29 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.vdr.heiligenmann.de/download/vdr-vcd-0.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=8e85ab05932315f825df1d8374b0798d
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index 55513668080d..86b6b7427af6 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=1d8a95e39a8c33cd6020ef8540fc71ef
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
index 588861c0b1c3..1247b27faf5b 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f0dd585317f133f6065e87cbf1acc46d
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
index 1ab1d00fccf7..d520116ba252 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=f5c1c82cb2f04ab25955b2a6de3b6a61
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
index 19d8ce67706e..33fc8b555a3c 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=e1a4d1124143a158dbd4364ef36eb905
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
index 0435dee16ebf..9b5f9ba529a1 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=43f32a997cfd4e9848a6a4ad13d4bd9b
diff --git a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1 b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
index 6f54b1f066e7..dee82535f31a 100644
--- a/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wapd-0.9_p1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-wapd-0.9.tgz http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=e1e37bf6c2771e4b63788c3e81fa5ca7
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index 3e256e497772..f4b88c88ee55 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdrfiles/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=9559af4a70f82c606597f686d72a136d
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index 71ce1e286fad..73faf3da19a2 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=900b092c346b86b5094e3da81dc2637c
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.1.0 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.1.0
index 7f8f53dbbe5b..eee6f47e9666 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-1.1.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=bf3b4b33340d195c929c51cadfd36bd2
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0
index c65fa00c9234..818963bdf4d4 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.0.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=c2a2f44a719747767a4589dc74379ca2
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20130821 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20130821
index 3ec1cfe83d4d..83f6c81313cb 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20130821
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20130821
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-xineliboutput/xineliboutput-2.0.0_p20130821.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=ce0ce5bdd78e77eb26a2e0064b9003c2
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20150220 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20150220
index 77ec6b283c75..ddbef56fc1de 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20150220
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.0.0_pre20150220
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=2297e6ee69a48399792209fd918ded53
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index 6decb7bbbcb9..1b92982ca3fa 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -7,5 +7,5 @@ IUSE=bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine
 LICENSE=GPL-2
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 virtual/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2 )
 SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=8d8bbf728aeb28a5d9c7f29cb9ef2aa6
diff --git a/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.6 b/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.6
index 016ed2103743..c415a5ab2cc5 100644
--- a/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.6
+++ b/metadata/md5-cache/media-plugins/vdr-zaphistory-0.9.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1437/zaphistory-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=be70ab4139d6d2354468c4d5cbbe0217
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
index 5349190256ef..f764d2c00262 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=3e7fb425f1507659c92adc9f87d0c4c2
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
index 3e13bf2c28bb..bf637318a699 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	fbdfa56b71cf0193ab303e13ea40b188
 _md5_=0699e36abfc518a52e16428ffa160c66
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 1f313b8988e5..08b365f65874 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/fldigi-4.0.16 b/metadata/md5-cache/media-radio/fldigi-4.0.16
deleted file mode 100644
index eed3f28993c6..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.0.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10 nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
-EAPI=5
-HOMEPAGE=http://www.w1hkj.com
-IUSE=hamlib nls pulseaudio
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4db475e80f381083a9a2495a9a174250
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.17 b/metadata/md5-cache/media-radio/fldigi-4.0.17
deleted file mode 100644
index 51358aaea184..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10 nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
-EAPI=6
-HOMEPAGE=http://www.w1hkj.com
-IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.17.tar.gz
-_md5_=ffd5c14629100dc7d295d676c81ff23c
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.00 b/metadata/md5-cache/media-radio/fldigi-4.1.00
new file mode 100644
index 000000000000..0ef36b5a24c6
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.00
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10 nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=6
+HOMEPAGE=http://www.w1hkj.com
+IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/fldigi-4.1.00.tar.gz
+_md5_=c342b7e483e44447faecf843eea7e8d4
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5567e4b1bd33..5879e59766ae 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/clementine-1.3.1_p20190127 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
new file mode 100644
index 000000000000..a8d5e3c767a1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm 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-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) projectm? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
+EAPI=6
+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 )
+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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=32e62d25de984a7109893ad6a264ba19
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15 b/metadata/md5-cache/media-sound/fmit-1.0.15
deleted file mode 100644
index 17d9b28f4e24..000000000000
--- a/metadata/md5-cache/media-sound/fmit-1.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sci-libs/fftw-3.3.4 media-libs/freeglut dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio )
-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 media-libs/freeglut dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5 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	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=36999039d5985c4b53d06942f55ce55c
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
index de4be9b91b1f..6744d68a5c09 100644
--- a/metadata/md5-cache/media-sound/gnump3d-3.0-r2
+++ b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sox? ( media-sound/sox ) dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f47cf4ef1fccef825178ad6a28d5cc4d
diff --git a/metadata/md5-cache/media-sound/helm-0.9.0 b/metadata/md5-cache/media-sound/helm-0.9.0
new file mode 100644
index 000000000000..9bc3ece5d9fa
--- /dev/null
+++ b/metadata/md5-cache/media-sound/helm-0.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=media-libs/alsa-lib media-libs/freetype media-libs/lv2 virtual/jack virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
+DESCRIPTION=Open source polyphonic software synthesizer with lots of modulation
+EAPI=7
+HOMEPAGE=https://tytel.org/helm/
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=media-libs/alsa-lib media-libs/freetype media-libs/lv2 virtual/jack virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr !app-admin/helm
+SLOT=0
+SRC_URI=https://github.com/mtytel/helm/archive/v0.9.0.tar.gz -> helm-0.9.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58e6feedefd11051252019dc03e8d160
diff --git a/metadata/md5-cache/media-sound/linuxsampler-2.0.0-r2 b/metadata/md5-cache/media-sound/linuxsampler-2.0.0-r2
deleted file mode 100644
index df5a57f5f8ba..000000000000
--- a/metadata/md5-cache/media-sound/linuxsampler-2.0.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-4.0.0 media-libs/alsa-lib jack? ( virtual/jack ) virtual/pkgconfig doc? ( app-doc/doxygen ) lv2? ( media-libs/lv2 ) >=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=LinuxSampler is a software audio sampler engine with professional grade features
-EAPI=6
-HOMEPAGE=http://www.linuxsampler.org/
-IUSE=doc jack lv2 sqlite static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sqlite? ( >=dev-db/sqlite-3.3 ) >=media-libs/libgig-4.0.0 media-libs/alsa-lib jack? ( virtual/jack )
-SLOT=0
-SRC_URI=http://download.linuxsampler.org/packages/linuxsampler-2.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92ffb3394ba33f79b1acaf38986252c2
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.4-r1 b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
index e6b57d93c9cb..36cd7cc1f8f4 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.4-r1
+++ b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/lltag/lltag-0.14.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3f55c55d9f00942e522a17189e4e203
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.5 b/metadata/md5-cache/media-sound/lltag-0.14.5
index 2d18562c7553..42048936c08b 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.5
+++ b/metadata/md5-cache/media-sound/lltag-0.14.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/lltag/lltag-0.14.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b8f01a4f188e073b0523644c11c10d8
diff --git a/metadata/md5-cache/media-sound/paprefs-1.1 b/metadata/md5-cache/media-sound/paprefs-1.1
new file mode 100644
index 000000000000..52f51150d4e6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/paprefs-1.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=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 )
+DESCRIPTION=PulseAudio Preferences, configuration dialog for PulseAudio
+EAPI=7
+HOMEPAGE=https://freedesktop.org/software/pulseaudio/paprefs
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+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	55aaa148741116aa54ad0d80e361818e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=25d21e154edcc7bbf476294745cc4dbc
diff --git a/metadata/md5-cache/media-sound/picard-2.0.3 b/metadata/md5-cache/media-sound/picard-2.0.3
deleted file mode 100644
index 7ed057fb284f..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=nls? ( dev-qt/linguist-tools:5 ) 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_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sys-apps/sed-4
-DESCRIPTION=A cross-platform music tagger
-EAPI=6
-HOMEPAGE=https://picard.musicbrainz.org
-IUSE=nls 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=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 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_4(-),-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/metabrainz/picard/archive/release-2.0.3.tar.gz -> picard-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ebae0673f8fd71cfdf059f85d7de469
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.1.0 b/metadata/md5-cache/media-sound/quodlibet-4.1.0
index 5ac3f256cb04..a758c5a7e4f4 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.1.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.1.0
@@ -1,8 +1,8 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-util/intltool python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
 DESCRIPTION=audio library tagger, manager, and player for GTK+
 EAPI=6
-HOMEPAGE=http://quodlibet.readthedocs.org
+HOMEPAGE=https://quodlibet.readthedocs.io/
 IUSE=+dbus gstreamer +udev python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.1.0.tar.gz -> quodlibet-4.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cadbf4351ca11ff25d7b6e10b73b585
+_md5_=4fac67e65f0cb9e63c6efc0a600e4ab7
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72-r1 b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
index f04407158624..7174acc39c95 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c03f296f44601cb0856c7aaefd9fa931
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.96 b/metadata/md5-cache/media-sound/spotify-1.0.96
index 2ec37b48a4be..7b7a514844f2 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.96
+++ b/metadata/md5-cache/media-sound/spotify-1.0.96
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity medi
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e193253cd7458f2860e0efd16869d6c2
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.98 b/metadata/md5-cache/media-sound/spotify-1.0.98
new file mode 100644
index 000000000000..b9183da8639f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.0.98
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=dev-util/patchelf-0.9_p20180129 >=sys-apps/sed-4
+DESCRIPTION=Spotify is a social music platform
+EAPI=6
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=libnotify systray pax_kernel pulseaudio
+KEYWORDS=~amd64
+LICENSE=Spotify
+RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python libnotify? ( x11-libs/libnotify ) pulseaudio? ( media-sound/pulseaudio ) systray? ( gnome-extra/gnome-integration-spotify )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8eed21d1f62b8f9440c941c1af870063
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
index 0a046c81229c..dda3f4d7fcb1 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.2.3
@@ -10,5 +10,5 @@ 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	ee2f5086cd7e7b747b061f58db14d89e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dadf37cc33d9d330a7d2f27404b6668f
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
index 1e16b2f107de..ad315e7627c3 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 SLOT=0
 SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/777b31219179b43f56c7b95857d2fbd7f33199aa.tar.gz -> tomahawk-0.9.0_pre20181030.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0722967eb93588601850901b7c0a1e4b
+_md5_=2daddcfd19d05a87d4e516aa1c5ce7d3
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index eeb5e096b515..51bb412a52f4 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
index 8e610346fd5c..2a420fbb276f 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
@@ -3,8 +3,8 @@ DEPEND=>=media-tv/v4l-utils-1.4
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=6
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2
-_md5_=ef73ddd4065619f290b2a9df78d87f98
+_md5_=764bb792618cecb8a2770ce2e90898ee
diff --git a/metadata/md5-cache/media-tv/kodi-18.0 b/metadata/md5-cache/media-tv/kodi-18.0
new file mode 100644
index 000000000000..faf9b9df5fac
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) >=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-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-RC5.tar.gz -> ffmpeg-kodi-4.0.3-Leia-RC5.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0-Leia.tar.gz -> kodi-18.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3f277e9657f6f9437e9f6404b39e35ae
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
index 6663be869e3e..223fb4d6a339 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321
@@ -4,10 +4,10 @@ DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
 EAPI=6
 HOMEPAGE=https://www.linuxtv.org/
 IUSE=alevt usb
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ppc ~x86
 LICENSE=GPL-2
 RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
 SLOT=0
 SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=04c9d876617aec9eba74d78ac803c994
+_md5_=fe7ed764e15c42aa6fc27af4c21201d4
diff --git a/metadata/md5-cache/media-tv/mythtv-29.1 b/metadata/md5-cache/media-tv/mythtv-29.1
deleted file mode 100644
index 5fcbc3195e95..000000000000
--- a/metadata/md5-cache/media-tv/mythtv-29.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm virtual/pkgconfig x11-base/xorg-proto virtual/pkgconfig
-DESCRIPTION=Homebrew PVR project
-EAPI=6
-HOMEPAGE=https://www.mythtv.org
-IUSE=alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
-REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
-SLOT=0/29.1
-SRC_URI=https://github.com/MythTV/mythtv/archive/d8a2db77f5731cf32c6d31127452391c6cf7f91f.tar.gz -> mythtv-29.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=a4cf67b57ea73df8512224580df881b9
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.11.3 b/metadata/md5-cache/media-tv/plex-media-server-1.11.3
index 14336b61864a..6b6c7822c22c 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.11.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.11.3.4803-c40bba82e/plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4afccc5a7dc49bc6d2b875fe4e12a82e
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.12.3 b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
index 0a05070f00cf..d9052653d33a 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.12.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.12.3.4973-215c28d86/plexmediaserver_1.12.3.4973-215c28d86_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7b5a19f174acb9d7cd0b2fc284b3adb
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
index 9a5a477fab7e..9dc785ebd4cd 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82cacdd653d4fefaa5bb13c675fa728d
diff --git a/metadata/md5-cache/media-tv/w_scan-20170107 b/metadata/md5-cache/media-tv/w_scan-20170107
new file mode 100644
index 000000000000..41679f407048
--- /dev/null
+++ b/metadata/md5-cache/media-tv/w_scan-20170107
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=virtual/linuxtv-dvb-headers-5.8
+DESCRIPTION=Scan DVB-C/DVB-T/DVB-S channels
+EAPI=5
+HOMEPAGE=http://wirbel.htpc-forum.de/w_scan/index2.html
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://wirbel.htpc-forum.de/w_scan/w_scan-20170107.tar.bz2
+_md5_=ac976bb27b32db25215f1920f1751f4f
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 6d3750243bc5..cbc8b91748c3 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/acidrip-0.14-r4 b/metadata/md5-cache/media-video/acidrip-0.14-r4
index c707426a3909..482f159f6c0b 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r4
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/acidrip-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17ef7ae40308a11f34f5f97668da6d45
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
index e3ffabf6cc33..8f961c9b05bf 100644
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ b/metadata/md5-cache/media-video/clive-2.3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Digest-SHA-5.47 >=dev-perl/HTML-TokeParser-Simple-2.37 >=dev-perl/Class-Singleton-1.4 >=dev-perl/WWW-Curl-4.05 >=dev-perl/XML-Simple-2.18 >=dev-perl/Getopt-ArgvFile-1.11 dev-perl/JSON-XS dev-perl/URI virtual/perl-Getopt-Long virtual/perl-File-Spec clipboard? ( >=dev-perl/Clipboard-0.09 ) pager? ( >=dev-perl/IO-Pager-0.05 ) password? ( >=dev-perl/Expect-1.21 ) media-libs/quvi || ( net-misc/wget net-misc/curl ) dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d2e307228c6edd323573d3b9ab431e7
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.10.2 b/metadata/md5-cache/media-video/dcpomatic-2.10.2
deleted file mode 100644
index 3e7c693b8438..000000000000
--- a/metadata/md5-cache/media-video/dcpomatic-2.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 ) || ( dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig
-DESCRIPTION=create Digital Cinema Packages (DCPs) from videos, images and sound files
-EAPI=6
-HOMEPAGE=https://dcpomatic.com/
-IUSE=+gtk
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
-SLOT=0
-SRC_URI=http://dcpomatic.com/downloads/2.10.2/dcpomatic-2.10.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=794c7c7edfb3f485be2aa54f8acc1aa5
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.10.5 b/metadata/md5-cache/media-video/dcpomatic-2.10.5
deleted file mode 100644
index aaf80574ae36..000000000000
--- a/metadata/md5-cache/media-video/dcpomatic-2.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 ) || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig
-DESCRIPTION=create Digital Cinema Packages (DCPs) from videos, images and sound files
-EAPI=6
-HOMEPAGE=https://dcpomatic.com/
-IUSE=+gtk
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >=media-libs/libdcp-1.4.1:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
-SLOT=0
-SRC_URI=http://dcpomatic.com/downloads/2.10.5/dcpomatic-2.10.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=71d2d872e095911fc4484437f37a292d
diff --git a/metadata/md5-cache/media-video/dcpomatic-2.11.7 b/metadata/md5-cache/media-video/dcpomatic-2.11.7
deleted file mode 100644
index a2b19b53d253..000000000000
--- a/metadata/md5-cache/media-video/dcpomatic-2.11.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >media-libs/libdcp-1.4.4:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 media-libs/rtaudio[alsa?,jack?,pulseaudio?] >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 ) || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) dev-util/waf virtual/pkgconfig
-DESCRIPTION=create Digital Cinema Packages (DCPs) from videos, images and sound files
-EAPI=6
-HOMEPAGE=https://dcpomatic.com/
-IUSE=+alsa +gtk jack pulseaudio
-LICENSE=GPL-2
-RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm:1.4 dev-libs/boost dev-libs/glib:2 dev-libs/icu dev-libs/libcxml dev-libs/libzip dev-libs/openssl:0 || ( media-gfx/graphicsmagick media-gfx/imagemagick ) media-libs/fontconfig:1.0 >media-libs/libdcp-1.4.4:1.0 media-libs/libsamplerate media-libs/libsndfile >=media-libs/libsub-1.2.1:1.0 media-libs/rtaudio[alsa?,jack?,pulseaudio?] >=media-video/ffmpeg-3:= net-libs/libssh net-misc/curl gtk? ( x11-libs/gtk+:2 x11-libs/wxGTK:3.0 )
-REQUIRED_USE=^^ ( alsa jack pulseaudio )
-SLOT=0
-SRC_URI=http://dcpomatic.com/downloads/2.11.7/dcpomatic-2.11.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	wxwidgets	ed63935305b6de2210ae97a407719d89
-_md5_=b3b7767f298ce96dd0724a32a71e74cd
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r3 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
index acc6b0078208..e09f6cc003ca 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( virtual/ffmpeg ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f0064c65b7bc3eb3290697acaa9e64d8
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
index da195735f4fe..0399e6990710 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( libav? ( media-video/libav ) !libav? ( media-video/ffmpeg:0 ) ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac039325fb60666a4489e9c757d203dc
diff --git a/metadata/md5-cache/media-video/gpac-0.6.1-r2 b/metadata/md5-cache/media-video/gpac-0.6.1-r2
deleted file mode 100644
index a599dc6392af..000000000000
--- a/metadata/md5-cache/media-video/gpac-0.6.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext )
-DESCRIPTION=Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C
-EAPI=6
-HOMEPAGE=http://gpac.wp.mines-telecom.fr/
-IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=a52? ( media-libs/a52dec ) aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) mad? ( >=media-libs/libmad-0.15.1b ) opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) >=media-libs/libogg-1.1 png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) truetype? ( >=media-libs/freetype-2.1.4:2 ) xml? ( >=dev-libs/libxml2-2.6.0:2 ) xvid? ( >=media-libs/xvid-1.0.1 ) sdl? ( media-libs/libsdl ) jpeg2k? ( media-libs/openjpeg:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext )
-SLOT=0
-SRC_URI=https://github.com/gpac/gpac/archive/v0.6.1.tar.gz -> gpac-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cd7cab7497eb787425c4862bd330211
diff --git a/metadata/md5-cache/media-video/gpac-0.7.1-r1 b/metadata/md5-cache/media-video/gpac-0.7.1-r1
index 46959e0c5f3d..c8e2c5dd368f 100644
--- a/metadata/md5-cache/media-video/gpac-0.7.1-r1
+++ b/metadata/md5-cache/media-video/gpac-0.7.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Implementation of the MPEG-4 Systems standard developed from scratch
 EAPI=6
 HOMEPAGE=https://gpac.wp.imt.fr/
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libogg a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) ffmpeg? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) mad? ( media-libs/libmad ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) theora? ( media-libs/libtheora ) truetype? ( media-libs/freetype:2 ) sdl? ( media-libs/libsdl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext ) xml? ( dev-libs/libxml2:2 ) xvid? ( media-libs/xvid )
 SLOT=0/7
 SRC_URI=https://github.com/gpac/gpac/archive/v0.7.1.tar.gz -> gpac-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6176fc5b31062163e543a3e7e15089b5
+_md5_=9fe50917f536166d43aa92707604d70c
diff --git a/metadata/md5-cache/media-video/imagination-3.0 b/metadata/md5-cache/media-video/imagination-3.0
deleted file mode 100644
index 2288345ac7d4..000000000000
--- a/metadata/md5-cache/media-video/imagination-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/sox >=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=Simple DVD slideshow maker
-EAPI=4
-HOMEPAGE=http://imagination.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-sound/sox virtual/ffmpeg
-SLOT=0
-SRC_URI=mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=404d8ac86df95cc0caa1ce9872052ac1
diff --git a/metadata/md5-cache/media-video/vlc-3.0.6 b/metadata/md5-cache/media-video/vlc-3.0.6
index 3d590737ba5c..6bdd5bedec87 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.6
+++ b/metadata/md5-cache/media-video/vlc-3.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( <media-libs/fdk-aac-2.0.0:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( <media-libs/fdk-aac-2.0.0:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=10bit 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
+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
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( <media-libs/fdk-aac-2.0.0:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( <media-libs/fdk-aac-2.0.0:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[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	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae6a335c9bbebac3d456c7263cc7b35e
+_md5_=d048107270a698c2cfe590daecd6bb4c
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index ec49c503c1d5..5a8b252fd2d5 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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? ( !10bit? ( >=media-libs/x264-0.0.20160712:0= ) 10bit? ( >=media-libs/x264-9999:0= ) ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=10bit 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
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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? ( !10bit? ( >=media-libs/x264-0.0.20160712:0= ) 10bit? ( >=media-libs/x264-9999:0= ) ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[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	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4ac98e3f05eb43203ad411313148d493
+_md5_=d7f4b7da2c28cd3c6ee873f25dd8e39b
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 4de32ba8dd5e..d01348cd76cb 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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? ( !10bit? ( >=media-libs/x264-0.0.20160712:0= ) 10bit? ( >=media-libs/x264-9999:0= ) ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( 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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=10bit 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 +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
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) 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:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) 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? ( !10bit? ( >=media-libs/x264-0.0.20160712:0= ) 10bit? ( >=media-libs/x264-9999:0= ) ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[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	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ebf4e6772dcfd3f9dfa37ae562bcce90
+_md5_=7e72d908a632954ae1e54a27cd5a4f70
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 74a69fe62083..8caeb2aea103 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/nagios-plugins-2.2.1-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
index ad22749e2a79..de021e9d5e78 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Official plugins for Nagios
 EAPI=6
 HOMEPAGE=http://nagios-plugins.org/
 IUSE=ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) radius? ( net-dialup/freeradius-client ) nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.2.1.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3a88e263ace1e210ef83061e6020b4e7
+_md5_=5eb2d24040aadef4e0c15ef619a0e584
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
index 37962001da2d..7a0fe3745de9 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524-2.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28e75bd69721cddc09c47c9dfd28cb32
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
index 985d13dcbf5d..101d4be70fb4 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524-2.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31d933612948e6311cf395ee6ed7e1da
diff --git a/metadata/md5-cache/net-analyzer/netsniff-ng-0.6.0 b/metadata/md5-cache/net-analyzer/netsniff-ng-0.6.0
deleted file mode 100644
index 75b5a53347fa..000000000000
--- a/metadata/md5-cache/net-analyzer/netsniff-ng-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/geoip dev-libs/libcli dev-libs/libnl:3 dev-libs/userspace-rcu:= net-libs/libnet:1.1 net-libs/libnetfilter_conntrack net-libs/libpcap sys-libs/ncurses:0 sys-libs/zlib sys-devel/flex sys-devel/bison =net-libs/nacl-0_p20110221* virtual/pkgconfig
-DESCRIPTION=high performance network sniffer for packet inspection
-EAPI=5
-HOMEPAGE=http://netsniff-ng.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/geoip dev-libs/libcli dev-libs/libnl:3 dev-libs/userspace-rcu:= net-libs/libnet:1.1 net-libs/libnetfilter_conntrack net-libs/libpcap sys-libs/ncurses:0 sys-libs/zlib
-SLOT=0
-SRC_URI=http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08df495ca25d10e8ece2b30f424d00e8
diff --git a/metadata/md5-cache/net-analyzer/nikto-1.36 b/metadata/md5-cache/net-analyzer/nikto-1.36
deleted file mode 100644
index 42d6829eb877..000000000000
--- a/metadata/md5-cache/net-analyzer/nikto-1.36
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Web Server vulnerability scanner
-EAPI=0
-HOMEPAGE=http://www.cirt.net/Nikto2
-IUSE=ssl
-KEYWORDS=~amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=net-analyzer/nmap-3.00 ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://www.cirt.net/source/nikto/ARCHIVE/nikto-1.36.tar.gz
-_md5_=e19bbc47ae79b23d757625c5249bfd67
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.70 b/metadata/md5-cache/net-analyzer/nmap-7.70
index fe30eb6065b8..8e1f8fd727ac 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.70
+++ b/metadata/md5-cache/net-analyzer/nmap-7.70
@@ -11,4 +11,4 @@ REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( p
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.70.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ecfcbc44a2a5931d124611af1614040
+_md5_=3925d90a18209b4c97734cab17a84c62
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 88d41ed7a0d3..b70908521efc 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=system-lua? ( nse ) ndiff? ( python_targets_python2_7 ) zenmap? ( p
 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	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f0222272b5b6d5049ffb04c18ae60d4
+_md5_=7b01b3e03a94768ad27936cbe154aaa0
diff --git a/metadata/md5-cache/net-analyzer/pbnj-2.04 b/metadata/md5-cache/net-analyzer/pbnj-2.04
index 690318c987bf..536d6a287499 100644
--- a/metadata/md5-cache/net-analyzer/pbnj-2.04
+++ b/metadata/md5-cache/net-analyzer/pbnj-2.04
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/DBD-SQLite dev-perl/DBI dev-perl/File-HomeDir dev-perl/File-Which dev-perl/Nmap-Parser dev-perl/Text-CSV_XS dev-perl/XML-Twig dev-perl/YAML net-analyzer/nmap dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/pbnj/pbnj-2.04.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c58b929788343994f011dffaf03f75b
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1
deleted file mode 100644
index c6e1ae6b6168..000000000000
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The official command-line client for RIPE Atlas
-EAPI=5
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c167bc830aa6d9ec4ab3a8bd440e896
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
deleted file mode 100644
index 74a58da9638a..000000000000
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-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_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The official command-line client for RIPE Atlas
-EAPI=5
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2b580b728f0bee895612d6cc80db009
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3
deleted file mode 100644
index 81e3661f6418..000000000000
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The official command-line client for RIPE Atlas
-EAPI=6
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=www-client/ripe-atlas-cousteau-1.0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.3.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7d53cbbdd99596c1272f98be1fdc6a5c
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
index 010f6ea470e1..91b4329c2471 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[sta
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fbb18df0fbd87d3c06af38eeecdf26b8
diff --git a/metadata/md5-cache/net-analyzer/symon-2.87 b/metadata/md5-cache/net-analyzer/symon-2.87
index c8e502a507da..befc2352bb8c 100644
--- a/metadata/md5-cache/net-analyzer/symon-2.87
+++ b/metadata/md5-cache/net-analyzer/symon-2.87
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://wpd.home.xs4all.nl/symon/philes/symon-2.87.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dae5e1a7fad52e807d9dbe088f4f5407
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-3.0 b/metadata/md5-cache/net-analyzer/thc-ipv6-3.0
deleted file mode 100644
index f1d1a93f7a46..000000000000
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-3.0
+++ /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=http://www.thc.org/releases/thc-ipv6-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71cd341f3f699996a8aab748aa821cf5
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.1.0 b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
index ba114bece927..86332445ee64 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.1.0
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.1.0
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to trace the route of IP packets
 EAPI=6
 HOMEPAGE=http://traceroute.sourceforge.net/
 IUSE=static
-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 LGPL-2.1
 RDEPEND=!<net-misc/iputils-20121221-r1 !net-misc/iputils[traceroute]
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a6da71a0a9e765bfbea02f05f389de0
+_md5_=6d24f365f448ecc5e5d06ea7e1e8690e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 48c01f7d3200..d02a95168825 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/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index f7593a0b9805..4ba0bd5217f2 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for ATM
 EAPI=5
 HOMEPAGE=http://linux-atm.sourceforge.net/
 IUSE=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
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07762e76abfcc224347077fbab6a0bc5
+_md5_=46e298e3ad36b2332919a002bf312ba7
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1
index 21e0d72ee5f2..a8e3ad546def 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
 EAPI=6
 HOMEPAGE=http://mgetty.greenie.net/
 IUSE=+fax fidonet
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a9a47fe022f2d19cb4449f2ec74093a
+_md5_=b678fd9e75ce73234b1e49ad11d125e7
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 397aab7b3776..418a02774468 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.11.4_p2 b/metadata/md5-cache/net-dns/bind-9.11.4_p2
index 790a6b3fe2f7..552c79ab893b 100644
--- a/metadata/md5-cache/net-dns/bind-9.11.4_p2
+++ b/metadata/md5-cache/net-dns/bind-9.11.4_p2
@@ -5,7 +5,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.11.4-P2/?version=tar-gz -> bind-9.11.4_p2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=35035c661e9944efc2378faa2965459c
+_md5_=e084961f0dd903e6691e330a8b255d77
diff --git a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1 b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
index 039d518601ce..22ae6f2e9427 100644
--- a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+++ b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/kirei/fpdns/archive/20130404.tar.gz -> fpdns-0.10.0_pre20130404.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6ca7dbadc32c65ad49d8baddf6be294
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 17a5f0ef8f8b..d7f16e088867 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/nftables-0.9.0-r4 b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
new file mode 100644
index 000000000000..2ce2aa4a35f8
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=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= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-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=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
+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	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ac3ec643a13e08ed8abb06bcdad8370f
diff --git a/metadata/md5-cache/net-firewall/psad-2.2.5 b/metadata/md5-cache/net-firewall/psad-2.2.5
index 0727617a9f1c..f32dbe925e5e 100644
--- a/metadata/md5-cache/net-firewall/psad-2.2.5
+++ b/metadata/md5-cache/net-firewall/psad-2.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Bit-Vector dev-perl/Date-Calc dev-perl/NetAddr-IP dev-perl/Unix-Syslog net-firewall/iptables net-misc/whois virtual/logger virtual/mailx virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/psad/download/psad-2.2.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b4f39fec9c5fe328b86c3a9efc7980f
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.2 b/metadata/md5-cache/net-firewall/shorewall-5.2.2
new file mode 100644
index 000000000000..c3290c60dc9a
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall-core-5.2.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall-5.2.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall6-5.2.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall-lite-5.2.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall6-lite-5.2.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall-init-5.2.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.2/shorewall-docs-html-5.2.2.tar.bz2 )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ef58396bdb14bf3916d0928d7eb2e72b
diff --git a/metadata/md5-cache/net-firewall/ufw-0.35-r1 b/metadata/md5-cache/net-firewall/ufw-0.35-r1
index 75739d7009af..dd5b4be58388 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.35-r1
+++ b/metadata/md5-cache/net-firewall/ufw-0.35-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A program used to manage a netfilter firewall
 EAPI=6
 HOMEPAGE=https://launchpad.net/ufw
 IUSE=examples ipv6 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=>=net-firewall/iptables-1.4[ipv6?] !<kde-misc/kcm-ufw-0.4.2 !<net-firewall/ufw-frontends-0.3.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.35/0.35/+download/ufw-0.35.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=04bad3ce76e273bb3371e7d0e5af1664
+_md5_=d30d9838affa32000b82b5cd1950dda0
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index de500a7c064f..1808369a138a 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/mc-2018.09.06.23.26.56 b/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
deleted file mode 100644
index 9cedc9c8c84b..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-06T23-26-56Z.tar.gz -> mc-2018.09.06.23.26.56.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8516dc5dea867db960604a3580d9b911
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12 b/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
deleted file mode 100644
index 74cc46aa2577..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-10T23-39-12Z.tar.gz -> mc-2018.09.10.23.39.12.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5efdadeebb997b5f3f58901db02ea867
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43 b/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
deleted file mode 100644
index 8b646c8f5254..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-26T00-42-43Z.tar.gz -> mc-2018.09.26.00.42.43.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25 b/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
deleted file mode 100644
index 7077beb98153..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-10-16T23-25-25Z.tar.gz -> mc-2018.10.16.23.25.25.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20 b/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
deleted file mode 100644
index a81eb2bc751b..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-11-06T01-12-20Z.tar.gz -> mc-2018.11.06.01.12.20.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08 b/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
deleted file mode 100644
index 49bc0b95b777..000000000000
--- a/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
-EAPI=6
-HOMEPAGE=https://github.com/minio/mc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!app-misc/mc
-SLOT=0
-SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-11-30T01-52-08Z.tar.gz -> mc-2018.11.30.01.52.08.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2019.01.24.01.40.23 b/metadata/md5-cache/net-fs/mc-2019.01.24.01.40.23
new file mode 100644
index 000000000000..8d369f20ee33
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2019.01.24.01.40.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
+EAPI=6
+HOMEPAGE=https://github.com/minio/mc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!app-misc/mc
+SLOT=0
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-01-24T01-40-23Z.tar.gz -> mc-2019.01.24.01.40.23.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=40943f4cae2daa541ea10706fef6ad7b
diff --git a/metadata/md5-cache/net-fs/mc-2019.01.30.19.57.22 b/metadata/md5-cache/net-fs/mc-2019.01.30.19.57.22
new file mode 100644
index 000000000000..5e7a97efae55
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2019.01.30.19.57.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
+EAPI=6
+HOMEPAGE=https://github.com/minio/mc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!app-misc/mc
+SLOT=0
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-01-30T19-57-22Z.tar.gz -> mc-2019.01.30.19.57.22.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=40943f4cae2daa541ea10706fef6ad7b
diff --git a/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58 b/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
deleted file mode 100644
index 2046b7a894a8..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-10-18T00-28-58Z.tar.gz -> minio-2018.10.18.00.28.58.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03 b/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
deleted file mode 100644
index 6604317a90d9..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-10-25T01-27-03Z.tar.gz -> minio-2018.10.25.01.27.03.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02 b/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
deleted file mode 100644
index 2bde279bc2bb..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-06T01-01-02Z.tar.gz -> minio-2018.11.06.01.01.02.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07 b/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
deleted file mode 100644
index 575c492902f0..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-15T01-26-07Z.tar.gz -> minio-2018.11.15.01.26.07.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48 b/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
deleted file mode 100644
index 020af9dcd4ce..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-17T01-23-48Z.tar.gz -> minio-2018.11.17.01.23.48.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56 b/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
deleted file mode 100644
index 362cb09502d8..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-22T02-51-56Z.tar.gz -> minio-2018.11.22.02.51.56.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59 b/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
deleted file mode 100644
index 6b79e771025d..000000000000
--- a/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=An Amazon S3 compatible object storage server
-EAPI=6
-HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-30T03-56-59Z.tar.gz -> minio-2018.11.30.03.56.59.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2019.01.23.23.18.58 b/metadata/md5-cache/net-fs/minio-2019.01.23.23.18.58
new file mode 100644
index 000000000000..9dfa4001f5a6
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.01.23.23.18.58
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2019-01-23T23-18-58Z.tar.gz -> minio-2019.01.23.23.18.58.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=77e7d0e63cfa6465950444c2b9c515ad
diff --git a/metadata/md5-cache/net-fs/minio-2019.01.31.00.31.19 b/metadata/md5-cache/net-fs/minio-2019.01.31.00.31.19
new file mode 100644
index 000000000000..4cc8ee47b649
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.01.31.00.31.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2019-01-31T00-31-19Z.tar.gz -> minio-2019.01.31.00.31.19.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=77e7d0e63cfa6465950444c2b9c515ad
diff --git a/metadata/md5-cache/net-fs/samba-4.10.0_rc1-r1 b/metadata/md5-cache/net-fs/samba-4.10.0_rc1-r1
index 0aee8d727d25..efd1c4906052 100644
--- a/metadata/md5-cache/net-fs/samba-4.10.0_rc1-r1
+++ b/metadata/md5-cache/net-fs/samba-4.10.0_rc1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.2[ldap(+)?,python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.15[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,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.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.2[ldap(+)?,python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.15[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python?,python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,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_ppc_32(-)?,abi_ppc_64(-)?,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/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/rc/samba-4.10.0rc1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=cee1daa072355e09f26485fbb7c2c1ee
+_md5_=9ced14da8ae33394d7fcd097de6f3fe5
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6-r3 b/metadata/md5-cache/net-fs/samba-4.8.6-r3
index 936840388be8..769203866c6d 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.6-r3
+++ b/metadata/md5-cache/net-fs/samba-4.8.6-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=43a0b6f48679bc442195b979f6db1864
+_md5_=28ed94d7dc3aea61325cc65331d7eeac
diff --git a/metadata/md5-cache/net-fs/samba-4.8.8-r1 b/metadata/md5-cache/net-fs/samba-4.8.8-r1
index 7b9864ecf998..3b853f93e22d 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.8-r1
+++ b/metadata/md5-cache/net-fs/samba-4.8.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.8.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=b4e517de4f2e73c8cce42cacc51382c7
+_md5_=9cf3e422cc8da63b081023fc8de36609
diff --git a/metadata/md5-cache/net-fs/samba-4.9.4-r1 b/metadata/md5-cache/net-fs/samba-4.9.4-r1
index cc902c9100e3..19f5e768df5b 100644
--- a/metadata/md5-cache/net-fs/samba-4.9.4-r1
+++ b/metadata/md5-cache/net-fs/samba-4.9.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,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_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_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_ppc_32(-)?,abi_ppc_64(-)?,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/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.9.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=1b02b48025c97acbaf00b7a1881d597b
+_md5_=090057c8a88a1f01be89e3933af122e7
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 0e17d9ac6ad2..30032996fa08 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/filezilla-3.40.0 b/metadata/md5-cache/net-ftp/filezilla-3.40.0
new file mode 100644
index 000000000000..c10cc151c92e
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.15.1 >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.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 >=sys-apps/sed-4
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=6
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.15.1 >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.4.15 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.40.0_src.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ac90e19e2e2d01f76c82fd75f6c1c5c0
diff --git a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2 b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
index 0bf0dbb794a2..091dff6b9d02 100644
--- a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
+++ b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://duncanthrax.net/profxp/profxp-v3-pre2-src.tar.gz http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d76ae7a5af190c8e82dd2da6151c30e1
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c22bcbb69966..1fd4cbd807c5 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/discord-bin-0.0.8 b/metadata/md5-cache/net-im/discord-bin-0.0.8
index 1cb194ecf2e3..1f7b4e265fa3 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.8
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss g
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.8/discord-0.0.8.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1f46bd6c72d8262e3ceaad4fc6f1286
diff --git a/metadata/md5-cache/net-im/gitter-bin-3.1.0 b/metadata/md5-cache/net-im/gitter-bin-3.1.0
index 64c4081455fb..2a260d30e449 100644
--- a/metadata/md5-cache/net-im/gitter-bin-3.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-3.1.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-ba
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_3.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_3.1.0_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2d9d87df1d4398711a060a8c45181c3a
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.23 b/metadata/md5-cache/net-im/sendxmpp-1.23
index c54a07b85013..8990b97bfd31 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.23
+++ b/metadata/md5-cache/net-im/sendxmpp-1.23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/sendxmpp/sendxmpp_1.23.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3a8a609208b60359b99f5d0ce18390a
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.24 b/metadata/md5-cache/net-im/sendxmpp-1.24
index 6922bbb26273..86ad9a2cae08 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.24
+++ b/metadata/md5-cache/net-im/sendxmpp-1.24
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A perl-script to send xmpp (jabber), similar to what mail(1) does for mail
 EAPI=5
 HOMEPAGE=http://sendxmpp.hostname.sk/
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~amd64 hppa ~ppc sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/lhost/sendxmpp/archive/v1.24.tar.gz -> sendxmpp-1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ade08916c59192b459be6763ea92f4d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1f32bc33b057cfc939da9e2838a6b080
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.20.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.20.0
index 1ded963b1886..7ca13e736ad6 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.20.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.20.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups
 SLOT=0
 SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.20.0_amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f230a0d5f3ff125a1ded47b16291c154
diff --git a/metadata/md5-cache/net-im/slack-bin-2.1.2 b/metadata/md5-cache/net-im/slack-bin-2.1.2
index 34fa19b3e3f3..836cad34c86c 100644
--- a/metadata/md5-cache/net-im/slack-bin-2.1.2
+++ b/metadata/md5-cache/net-im/slack-bin-2.1.2
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=x86? ( https://downloads.slack-edge.com/linux_releases/slack-desktop-2.1.2-i386.deb ) amd64? ( https://downloads.slack-edge.com/linux_releases/slack-desktop-2.1.2-amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db31961e9e3b76b5ca951dd63433081e
diff --git a/metadata/md5-cache/net-im/slack-bin-3.1.1 b/metadata/md5-cache/net-im/slack-bin-3.1.1
index b047195dc1ec..0f48a993ac22 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.1.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9d1b6d49f82113bb1d0b74590e64e14
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.1 b/metadata/md5-cache/net-im/slack-bin-3.3.1
index 891b150b778f..950e6dd68ae8 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.3.1
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.1-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=71f92fca0a1b11952d5439dc5fe7fce7
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.3 b/metadata/md5-cache/net-im/slack-bin-3.3.3
index 2a408abb1ff1..dad3c5eae0dc 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.3.3
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.3-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8d39d46ce6702484d65819547832c22
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.4 b/metadata/md5-cache/net-im/slack-bin-3.3.4
index 26387e974c9e..aef786bc6e98 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.3.4
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.4-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b929eba8cc0101774c92ac8b19dbc299
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.7 b/metadata/md5-cache/net-im/slack-bin-3.3.7
index a691c4bb03ca..bf3a5be9c224 100644
--- a/metadata/md5-cache/net-im/slack-bin-3.3.7
+++ b/metadata/md5-cache/net-im/slack-bin-3.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.7-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b929eba8cc0101774c92ac8b19dbc299
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.10 b/metadata/md5-cache/net-im/spectrum2-2.0.10
new file mode 100644
index 000000000000..3465e7fb164e
--- /dev/null
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-python/sleekxmpp[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/cppunit net-irc/ngircd )
+DESCRIPTION=An open source instant messaging transport
+EAPI=7
+HOMEPAGE=https://www.spectrum.im
+IUSE=debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/boost:= dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.10.tar.gz -> spectrum2-2.0.10.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=da0e469493ec3afc9ecac1ead3db1532
diff --git a/metadata/md5-cache/net-im/swift-4.0.2 b/metadata/md5-cache/net-im/swift-4.0.2
deleted file mode 100644
index 7471f8cf57fa..000000000000
--- a/metadata/md5-cache/net-im/swift-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib:= client? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 net-dns/avahi ) expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gconf? ( gnome-base/gconf:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( dev-lang/lua:= ) spell? ( app-text/hunspell:= ) >=dev-util/scons-3.0.1-r3 client? ( dev-qt/linguist-tools:5 ) test? ( net-dns/avahi ) >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
-EAPI=6
-HOMEPAGE=https://www.swift.im/
-IUSE=client expat gconf +icu +idn lua spell test zeroconf
-KEYWORDS=~amd64
-LICENSE=BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1
-RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib:= client? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 net-dns/avahi ) expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gconf? ( gnome-base/gconf:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( dev-lang/lua:= ) spell? ( app-text/hunspell:= )
-REQUIRED_USE=|| ( icu idn ) gconf? ( client ) spell? ( client )
-RESTRICT=test
-SLOT=4/0
-SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0aed7d314ef72aa6d6d6820be5c10afd
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 73c7baec7850..250aa6de5184 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/epic5-2.0.1 b/metadata/md5-cache/net-irc/epic5-2.0.1
new file mode 100644
index 000000000000..8e871c8331e8
--- /dev/null
+++ b/metadata/md5-cache/net-irc/epic5-2.0.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
+DEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) virtual/rubygems ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Epic5 IRC Client
+EAPI=7
+HOMEPAGE=http://epicsol.org/
+IUSE=archive perl tcl ruby socks5 valgrind
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2:= ) tcl? ( dev-lang/tcl:0= ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) virtual/rubygems )
+SLOT=0
+SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-2.0.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=19b3cf615e4bbeb2de950cb42f9904b6
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.29 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.29
deleted file mode 100644
index 9f52282a556d..000000000000
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby ) ssl? ( !gnutls? ( dev-libs/openssl ) )
-DESCRIPTION=IRC fileserver using DCC
-EAPI=5
-HOMEPAGE=http://iroffer.dinoex.net/
-IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby ) ssl? ( !gnutls? ( dev-libs/openssl ) )
-REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.29.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81b148b546dfce81624ec0f97a651c2a
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
index 8fea969e227b..3e4c36447e78 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
@@ -4,11 +4,11 @@ DESCRIPTION=IRC fileserver using DCC
 EAPI=6
 HOMEPAGE=http://iroffer.dinoex.net/
 IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=65b9a908ea4a51c8d615c43972387971
+_md5_=56f4417cbf3e761698c52be9782336d4
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
new file mode 100644
index 000000000000..a32bcfc95291
--- /dev/null
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+DESCRIPTION=IRC fileserver using DCC
+EAPI=6
+HOMEPAGE=http://iroffer.dinoex.net/
+IUSE=+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/curl[curl_ssl_gnutls] ) !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls ) ruby? ( dev-lang/ruby:* ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) )
+REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.31.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.31.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f011b1fa10d0dab0f723f28afd8bc35c
diff --git a/metadata/md5-cache/net-irc/pisg-0.73-r1 b/metadata/md5-cache/net-irc/pisg-0.73-r1
index 1ce9a66ff27b..fdc5addc1d0c 100644
--- a/metadata/md5-cache/net-irc/pisg-0.73-r1
+++ b/metadata/md5-cache/net-irc/pisg-0.73-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Iconv dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/pisg/pisg-0.73.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8659612623decbe2a7afdcb9b928f4ff
diff --git a/metadata/md5-cache/net-irc/znc-1.7.2 b/metadata/md5-cache/net-irc/znc-1.7.2
new file mode 100644
index 000000000000..40e23539f44b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/znc-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) test? ( dev-qt/qtnetwork:5 )
+DESCRIPTION=An advanced IRC Bouncer
+EAPI=7
+HOMEPAGE=https://znc.in
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+SLOT=0
+SRC_URI=https://znc.in/releases/archive/znc-1.7.2.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad64e97e748164ee2142325ac84c054b
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 7764e8e92627..2be0d962d8e9 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) test? ( dev-qt/qtnetwork:5 ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) virtual/pkgconfig nls? ( sys-devel/gettext ) perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) test? ( dev-qt/qtnetwork:5 )
 DESCRIPTION=An advanced IRC Bouncer
-EAPI=6
+EAPI=7
 HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0
-RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) icu )
+RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9561d8557558e4fe590e9bcde9774da1
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad64e97e748164ee2142325ac84c054b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ccd2ae4ee122..e663a6600a36 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/courier-authlib-0.66.4 b/metadata/md5-cache/net-libs/courier-authlib-0.66.4
index c1cad90e3faf..6df22e0b2406 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.66.4
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.66.4
@@ -4,11 +4,11 @@ DESCRIPTION=Courier authentication library
 EAPI=5
 HOMEPAGE=https://www.courier-mta.org/authlib/
 IUSE=berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=net-mail/mailbase =net-libs/courier-unicode-1.3 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.66.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25e554ea66ff3926511ff3f13b374f8e
+_md5_=6858adb3dca0ca7db528c81e9c1ea441
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.6 b/metadata/md5-cache/net-libs/gnutls-3.6.6
new file mode 100644
index 000000000000..0a95073c4139
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.6
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
+DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
+EAPI=7
+HOMEPAGE=http://www.gnutls.org/
+IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1
+RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
+SLOT=0/30
+SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.6.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0e7d65de8d491f9902b9a45209a2d2c7
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.75 b/metadata/md5-cache/net-libs/gsoap-2.8.75
deleted file mode 100644
index 6cbd8af3e9ef..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.75
+++ /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.75.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.76 b/metadata/md5-cache/net-libs/gsoap-2.8.76
deleted file mode 100644
index a431e7a87981..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.76
+++ /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.76.zip
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.77 b/metadata/md5-cache/net-libs/gsoap-2.8.77
new file mode 100644
index 000000000000..5360fae97287
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.77
@@ -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.77.zip
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.78 b/metadata/md5-cache/net-libs/gsoap-2.8.78
new file mode 100644
index 000000000000..4e9806b949a3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.78
@@ -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.78.zip
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/gssdp-1.0.3 b/metadata/md5-cache/net-libs/gssdp-1.0.3
new file mode 100644
index 000000000000..27ef85428cc4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gssdp-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.44.2:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.14 sys-devel/gettext >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GObject-based API for handling resource discovery and announcement over SSDP
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IUSE=+introspection gtk abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.44.2:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3
+SLOT=0/3
+SRC_URI=mirror://gnome/sources/gssdp/1.0/gssdp-1.0.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=38533102cb250119c117cef6ac48e5a7
diff --git a/metadata/md5-cache/net-libs/libetpan-1.9.1 b/metadata/md5-cache/net-libs/libetpan-1.9.1
deleted file mode 100644
index bd9ffec1fa1a..000000000000
--- a/metadata/md5-cache/net-libs/libetpan-1.9.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=configure install prepare setup
-DEPEND=sys-libs/zlib berkdb? ( <sys-libs/db-6.1:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
-DESCRIPTION=A portable, efficient middleware for different kinds of mail access
-EAPI=7
-HOMEPAGE=http://libetpan.sourceforge.net/
-IUSE=berkdb gnutls ipv6 liblockfile libressl sasl ssl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib berkdb? ( <sys-libs/db-6.1:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
-SLOT=0
-SRC_URI=https://github.com/dinhviethoa/libetpan/archive/1.9.1.tar.gz -> libetpan-1.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=26345f9577c54800cbac08b41bedc419
diff --git a/metadata/md5-cache/net-libs/libetpan-1.9.3 b/metadata/md5-cache/net-libs/libetpan-1.9.3
new file mode 100644
index 000000000000..9a4406e9fd58
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libetpan-1.9.3
@@ -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 pretend
+DEPEND=sys-libs/zlib !lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) ) lmdb? ( dev-db/lmdb ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
+DESCRIPTION=A portable, efficient middleware for different kinds of mail access
+EAPI=7
+HOMEPAGE=http://libetpan.sourceforge.net/
+IUSE=berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=sys-libs/zlib !lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) ) lmdb? ( dev-db/lmdb ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
+SLOT=0
+SRC_URI=https://github.com/dinhviethoa/libetpan/archive/1.9.3.tar.gz -> libetpan-1.9.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=607d66b67abecff7c7cbfc66812c8bc0
diff --git a/metadata/md5-cache/net-libs/libgssglue-0.4-r1 b/metadata/md5-cache/net-libs/libgssglue-0.4-r1
index 29bf96f86ed3..30ad21057ad6 100644
--- a/metadata/md5-cache/net-libs/libgssglue-0.4-r1
+++ b/metadata/md5-cache/net-libs/libgssglue-0.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
 EAPI=7
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-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
 RDEPEND=!app-crypt/libgssapi
 SLOT=0
 SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/libgssglue-0.4.tar.gz
-_md5_=f5df885c83584f46b82d8c12be937990
+_md5_=ee8ca4a7e4f8ace4531045b7f85dae34
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1 b/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
index 30203da51402..7862c9e6f57a 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1 !net-libs/hubbub dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-lang/perl >=dev-libs/json-c-0.10-r1 )
+DEPEND=>=dev-libs/libparserutils-0.2.1-r1 !net-libs/hubbub dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-lang/perl <dev-libs/json-c-0.13 )
 DESCRIPTION=HTML5 compliant parsing library, written in C
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/projects/hubbub/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 !net-libs/hubbub
 SLOT=0/0.3.5
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.5-src.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=51e39ce09c25948a00ddaf1003134a3d
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7351af2ece6997ccdaa215d3fd029ce7
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 0c53eef4f7a5..8081226ead17 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
@@ -11,4 +11,4 @@ RDEPEND=curl? ( net-misc/curl ) nss? ( dev-libs/nss curl? ( || ( net-misc/curl[s
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.3.tar.gz
-_md5_=eaf4fe1a7e5d7791cf19e277b4242699
+_md5_=ec10ae4753627cacb0850ee16bf46155
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.5 b/metadata/md5-cache/net-libs/libssh-0.8.5
index c492efacb141..349a87bc239c 100644
--- a/metadata/md5-cache/net-libs/libssh-0.8.5
+++ b/metadata/md5-cache/net-libs/libssh-0.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=6
 HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.5.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=973d2613d9c251b5fb58222ba290160a
+_md5_=425342ee833c84f826925346ca14dc09
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3 b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
new file mode 100644
index 000000000000..768e9ae73d85
--- /dev/null
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn:= ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 ) dev-util/glib-utils dev-util/gtk-doc-am test? ( dev-libs/check ) virtual/pkgconfig
+DESCRIPTION=Lightweight C Jabber library
+EAPI=7
+HOMEPAGE=https://mcabber.com
+IUSE=asyncns ssl openssl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn:= ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
+SLOT=0
+SRC_URI=https://mcabber.com/files/loudmouth/loudmouth-1.5.3.tar.bz2
+_md5_=e47ce3fa5ddf5477fb3035edb952c18a
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
index 28014af1e252..2d665b719adb 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
@@ -10,5 +10,5 @@ RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/nfqueue-bindings-0.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94d8f98b71f002e62fc0ad62829dd63d
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
index 9cabde0bb922..f9302f691284 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
@@ -10,5 +10,5 @@ RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( perl python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/v0.6.tar.gz -> nfqueue-bindings-0.6.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed0b00c5ccb5d0709bf32d014e63156f
diff --git a/metadata/md5-cache/net-libs/nodejs-10.15.1 b/metadata/md5-cache/net-libs/nodejs-10.15.1
new file mode 100644
index 000000000000..b5d915f5b42f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.23.2:= >=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-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*: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_4(-),-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.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.15.1/node-v10.15.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=18cec15d870be46ffefe79070b3b60ea
diff --git a/metadata/md5-cache/net-libs/nodejs-11.6.0 b/metadata/md5-cache/net-libs/nodejs-11.6.0
deleted file mode 100644
index b674127d7b12..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-11.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.24.1:= >=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-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*: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_4(-),-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.24.1:= >=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-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v11.6.0/node-v11.6.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55febc04503103b334084fdbd965f52d
diff --git a/metadata/md5-cache/net-libs/nodejs-11.8.0 b/metadata/md5-cache/net-libs/nodejs-11.8.0
new file mode 100644
index 000000000000..3e23cdfd515c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-11.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.25.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-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*: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_4(-),-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.25.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-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v11.8.0/node-v11.8.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b0abf99cea2e5976bd65fcaf9a4cd7b0
diff --git a/metadata/md5-cache/net-libs/nodejs-11.9.0 b/metadata/md5-cache/net-libs/nodejs-11.9.0
new file mode 100644
index 000000000000..6e2dd6a4c4e4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-11.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.25.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-63.1:= ) 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_4(-),-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.25.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-63.1:= ) 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/v11.9.0/node-v11.9.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fc64c27e0b14f56dbf139c62b8b02891
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
index 0a155df40647..c2f229267bec 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=RabbitMQ C client
 EAPI=7
 HOMEPAGE=https://github.com/alanxz/rabbitmq-c
 IUSE=doc libressl test +ssl static-libs tools
-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=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )
 REQUIRED_USE=test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.9.0.zip -> rabbitmq-c-v0.9.0.zip
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cedb973b30f8e64272c899a08b032b96
+_md5_=2bfe69049e14237688d959e4b692f5d9
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index b89a2c313dd2..4eaeae6a6bee 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=28e099ce38be28af3f832d0ccbcaebd9
+_md5_=5b95edc5aea9160b2b1d79d0555147be
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 4bc2056963ea..5d1358141bdd 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/mhonarc-2.6.18-r2 b/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
index a44ebabf0fea..f86d2c688dc2 100644
--- a/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
+++ b/metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.18.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43c4cf657517958738efaa318c6d29e7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 374baf05d9c0..6a028382a7aa 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/arpsponge-3.12.2 b/metadata/md5-cache/net-misc/arpsponge-3.12.2
index d0dee600ac19..7c92059fc7d6 100644
--- a/metadata/md5-cache/net-misc/arpsponge-3.12.2
+++ b/metadata/md5-cache/net-misc/arpsponge-3.12.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=dev-lang/perl dev-perl/IO-String dev-perl/NetAddr-IP dev-perl/NetPacket dev-perl/Net-ARP dev-perl/Net-Pcap dev-perl/Readonly dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu virtual/perl-Data-Dumper virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Sys-Syslog virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.ams-ix.net/downloads/arpsponge/3.12.2/arpsponge-3.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55e88946cc98e9bc1f6566fed8dc608f
diff --git a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2 b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
index 5291d2d7032b..83c91937d8c3 100644
--- a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
+++ b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://whois.bw.org/dist/whois-5.5.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e094b570dc2e8c54f16aba9aa7be1724
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40 b/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40
index fe0d611d1d24..a8795c88fa0f 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40
@@ -9,5 +9,5 @@ RDEPEND=app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_49.0.2623.40_amd64.deb ) x86? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_49.0.2623.40_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b6546adad4e8f22f202843108e93863
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37 b/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
index 16c3660e56bb..f67e5e6704b2 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
@@ -9,5 +9,5 @@ RDEPEND=app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_57.0.2987.37_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7638babe1f7c06156b498423f976ad12
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1 b/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
index b11fbf3c1b5b..c493ef071722 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-63.0.3239.17-r1
@@ -9,5 +9,5 @@ RDEPEND=app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_63.0.3239.17_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd97f6f88cf75863fcd1d7ac4154504c
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index ed592c335b3f..77a6eca25b27 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=628fbdf23c41c044d93a89cfe8f54703
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.30.600 b/metadata/md5-cache/net-misc/clusterssh-4.30.600
index 04cbe0cc6b06..57dba6c3ff54 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.30.600
+++ b/metadata/md5-cache/net-misc/clusterssh-4.30.600
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Tk dev-perl/Readonly dev-perl/Test-DistManifest dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Try-Tiny dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.03_06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e094b9c0b6bfbcd3695557de56ec6a6
diff --git a/metadata/md5-cache/net-misc/clusterssh-9999 b/metadata/md5-cache/net-misc/clusterssh-9999
index 7df7398cab64..c7ac3871e688 100644
--- a/metadata/md5-cache/net-misc/clusterssh-9999
+++ b/metadata/md5-cache/net-misc/clusterssh-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=GPL-2
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e0003a1f8bea6b3fc54d217655464a2
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.4 b/metadata/md5-cache/net-misc/cni-plugins-0.7.4
index 43cfd5aa619c..cbc17b85339e 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.4
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=Standard networking plugins for container networking
 EAPI=6
 HOMEPAGE=https://github.com/containernetworking/plugins
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.4.tar.gz -> cni-plugins-0.7.4.tar.gz
 _eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
-_md5_=f9bafa97b368b9435fccb205e0040c09
+_md5_=029cc0936a906a4566576b35b9b80ae2
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.1 b/metadata/md5-cache/net-misc/dhcp-4.4.1
index bd77be39067a..f2dfe7523eb2 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=6
 HOMEPAGE=http://www.isc.org/products/DHCP
 IUSE=+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a42ee9e3d89d5a9303c1e1ac6f5ad755
+_md5_=ac8ec2e6862cb5fd8e7444dc107fb6a2
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.5 b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
deleted file mode 100644
index c8f6df27e8a1..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.5
+++ /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-6.11.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de980e1beb156805bc41c365b353ce9e
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.6 b/metadata/md5-cache/net-misc/dhcpcd-7.0.6
deleted file mode 100644
index 0dcb5774d6c2..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.6
+++ /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.0.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd5f793b1d3cb7d03596d77bbde88171
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.7 b/metadata/md5-cache/net-misc/dhcpcd-7.0.7
deleted file mode 100644
index 594667fd0142..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.7
+++ /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.0.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd5f793b1d3cb7d03596d77bbde88171
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.1.0 b/metadata/md5-cache/net-misc/dhcpcd-7.1.0
new file mode 100644
index 000000000000..39a7ab340322
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=6
+HOMEPAGE=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.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=737dea6eddbed4496a886c4c35587b90
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.2 b/metadata/md5-cache/net-misc/electrum-3.3.2
deleted file mode 100644
index cc7b2aa3a1ec..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.2
+++ /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(-)] >=sys-apps/sed-4
-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/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.2/Electrum-3.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d672b2538639616e61708c3f11fc3463
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.3 b/metadata/md5-cache/net-misc/electrum-3.3.3
new file mode 100644
index 000000000000..f2fbc1bb2ae4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-3.3.3
@@ -0,0 +1,14 @@
+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(-)] >=sys-apps/sed-4
+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	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e520d98d5bd7e11e3c00d4581be1416c
diff --git a/metadata/md5-cache/net-misc/exabgp-3.4.26-r1 b/metadata/md5-cache/net-misc/exabgp-3.4.26-r1
new file mode 100644
index 000000000000..ac5586f6ebe2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/exabgp-3.4.26-r1
@@ -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=The BGP swiss army knife of networking
+EAPI=7
+HOMEPAGE=https://github.com/Exa-Networks/exabgp
+IUSE=python_targets_python2_7
+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/Exa-Networks/exabgp/archive/3.4.26.tar.gz -> exabgp-3.4.26.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=93680416a7ee26d6713526a47fcb40d9
diff --git a/metadata/md5-cache/net-misc/gcap-0.1.1-r1 b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
index d423aa1d4eb4..35a875a95585 100644
--- a/metadata/md5-cache/net-misc/gcap-0.1.1-r1
+++ b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-perl/Getopt-ArgvFile dev-perl/XML-DOM virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gcap/gcap_0.1.1.orig.tar.gz -> gcap-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a22e22b0c654a34570ec94e8e3384006
diff --git a/metadata/md5-cache/net-misc/gerbera-1.3.0 b/metadata/md5-cache/net-misc/gerbera-1.3.0
new file mode 100644
index 000000000000..2ebbb0801d53
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gerbera-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=UPnP Media Server (Based on MediaTomb)
+EAPI=6
+HOMEPAGE=https://github.com/gerbera/gerbera
+IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/gerbera/gerbera/archive/v1.3.0.tar.gz -> gerbera-1.3.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=02db15b7743cc78b0d7228050f3be545
diff --git a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1 b/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
deleted file mode 100644
index 9669f1322741..000000000000
--- a/metadata/md5-cache/net-misc/gns3-gui-1.5.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=Graphical Network Simulator
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=net-misc/gns3-converter-1.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ~net-misc/gns3-server-1.5.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-gui/archive/v1.5.3.1.tar.gz -> gns3-gui-1.5.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48f06070bd9a3e97ce0ff6d6698d4298
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1 b/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
deleted file mode 100644
index fed376ca247b..000000000000
--- a/metadata/md5-cache/net-misc/gns3-gui-2.0.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Graphical Network Simulator
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~net-misc/gns3-server-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.0.3.tar.gz -> gns3-gui-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=da32c156c77b22efb32846a0cbe61da9
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1 b/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
deleted file mode 100644
index e5f4d199647d..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-1.5.3.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-1.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/aiohttp-cors-0.5.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/raven-5.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] virtual/python-typing[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/yarl-0.7.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.5.3.1.tar.gz -> gns3-server-1.5.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a41e572c684709b3d11f3e82287e5fbb
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2 b/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
deleted file mode 100644
index df7b5f350745..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.0.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 =dev-python/aiohttp-1.3.5*[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/aiohttp-cors-0.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/yarl-0.9.8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.0.3.tar.gz -> gns3-server-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=925663ed098b2610e005feee29ea95f3
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3 b/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
deleted file mode 100644
index a1711d0ca7ab..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-2.1.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-2.2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/aiohttp-cors-0.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/aiohttp-cors-0.5.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/raven-5.23.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prompt_toolkit[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.3.tar.gz -> gns3-server-2.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ee254ff018325d29985a9954e701e1a
diff --git a/metadata/md5-cache/net-misc/gwhois-20120626-r1 b/metadata/md5-cache/net-misc/gwhois-20120626-r1
new file mode 100644
index 000000000000..e31695643590
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gwhois-20120626-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Generic whois
+EAPI=7
+HOMEPAGE=https://julijane.de/gwhois/
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86
+LICENSE=GPL-2
+RDEPEND=www-client/lynx net-misc/curl dev-lang/perl:= dev-perl/libwww-perl dev-perl/Net-LibIDN
+SLOT=0
+SRC_URI=mirror://debian/pool/main/g/gwhois/gwhois_20120626-1.2.tar.gz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=3083272563cf24d9b07a0ee0df1b647b
diff --git a/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2 b/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2
deleted file mode 100644
index 9428743fa04e..000000000000
--- a/metadata/md5-cache/net-misc/hotot-0.9.8.15_p20150812-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=lightweight & open source microblogging client
-EAPI=5
-HOMEPAGE=http://hotot.org
-IUSE=chrome kde qt5 python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=|| ( chrome qt5 ) python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/lyricat/Hotot/tarball/452fc0924a98923b -> hotot-0.9.8.15_p20150812.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8042f1b6749fda2626d8ea5a3fe03692
diff --git a/metadata/md5-cache/net-misc/hotot-9999 b/metadata/md5-cache/net-misc/hotot-9999
deleted file mode 100644
index 87576960c2b7..000000000000
--- a/metadata/md5-cache/net-misc/hotot-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=lightweight & open source microblogging client
-EAPI=5
-HOMEPAGE=http://hotot.org
-IUSE=chrome kde qt5 python_targets_python2_7
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=|| ( chrome qt5 ) python_targets_python2_7
-SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cb6e1de8daf9e49475387fe5c5330f84
diff --git a/metadata/md5-cache/net-misc/htpdate-1.0.7 b/metadata/md5-cache/net-misc/htpdate-1.0.7
index 91f0e77419a7..ca9a997283e8 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.0.7
+++ b/metadata/md5-cache/net-misc/htpdate-1.0.7
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 sh x86 ~amd64-linux ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=405a6042d3fc0c56f26836e7ec73ef07
diff --git a/metadata/md5-cache/net-misc/iputils-20180629 b/metadata/md5-cache/net-misc/iputils-20180629
index 4c3c0446f7bf..009b8fb7f023 100644
--- a/metadata/md5-cache/net-misc/iputils-20180629
+++ b/metadata/md5-cache/net-misc/iputils-20180629
@@ -4,10 +4,10 @@ DESCRIPTION=Network monitoring tools including ping and ping6
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20180629.tar.gz -> iputils-20180629.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20180629.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dedf51544deb026952938990f29f585
+_md5_=f2cef65b462bfccc5fe0114881fcae73
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.0.1 b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
new file mode 100644
index 000000000000..f9b973fafb3f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
@@ -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.0.1/kafka_2.12-2.0.1.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.1.0 b/metadata/md5-cache/net-misc/kafka-bin-2.1.0
new file mode 100644
index 000000000000..dace0d457b03
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.1.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.1.0/kafka_2.12-2.1.0.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0 b/metadata/md5-cache/net-misc/nyx-2.1.0
new file mode 100644
index 000000000000..235a187aec06
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utility to monitor real time Tor status information
+EAPI=6
+HOMEPAGE=https://nyx.torproject.org
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=net-libs/stem net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/n/nyx/nyx-2.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd059e7da4af600f7ac5558383f9c4b4
diff --git a/metadata/md5-cache/net-misc/pen-0.34.1 b/metadata/md5-cache/net-misc/pen-0.34.1
new file mode 100644
index 000000000000..c85cc4af2dd3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pen-0.34.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=geoip? ( dev-libs/geoip ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=TCP Load Balancing Port Forwarder
+EAPI=7
+HOMEPAGE=http://siag.nu/pen/
+IUSE=geoip ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=geoip? ( dev-libs/geoip ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://siag.nu/pub/pen/pen-0.34.1.tar.gz
+_md5_=2b40a36d0f64daf382063ae95a3160b8
diff --git a/metadata/md5-cache/net-misc/putty-0.70 b/metadata/md5-cache/net-misc/putty-0.70
index 4cdfa8026272..097d8666366f 100644
--- a/metadata/md5-cache/net-misc/putty-0.70
+++ b/metadata/md5-cache/net-misc/putty-0.70
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 ) dev-lang/perl 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 >=sys-apps/sed-4
+DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 ) dev-lang/perl 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 >=sys-apps/sed-4
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=6
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
-IUSE=doc +gtk ipv6 kerberos
+IUSE=doc +gtk ipv6 gssapi
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
+RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/latest/putty-0.70.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e9f1e3dcd434403b28e813557da3589c
+_md5_=7dbb495a13c0c087d2ebd974cfbd3455
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index a78043b94f2a..9c14bf848be1 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 ) app-doc/halibut dev-lang/perl 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 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 ) app-doc/halibut dev-lang/perl 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 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A Free Telnet/SSH Client
 EAPI=6
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
-IUSE=doc +gtk ipv6 kerberos
+IUSE=doc +gtk ipv6 gssapi
 LICENSE=MIT
-RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) kerberos? ( virtual/krb5 )
+RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3686a07c77fe6664e96d0b584b7bac0e
+_md5_=1732114d41396c212e81218553a82efb
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
new file mode 100644
index 000000000000..7a85979fe905
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install preinst setup
+DEPEND=>=dev-lang/erlang-19.3[ssl,smp] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 <dev-lang/elixir-1.7.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=7
+HOMEPAGE=http://www.rabbitmq.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MPL-1.1
+RDEPEND=>=dev-lang/erlang-19.3[ssl,smp]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.10/rabbitmq-server-3.7.10.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e504d4c9ab6810eb9d1d4dec5fd2fa58
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.4-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.4-r1
new file mode 100644
index 000000000000..9ec1493e87c5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.4-r1
@@ -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? ( net-libs/libgssglue ) 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? ( net-libs/libgssglue ) 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.4/rdesktop-1.8.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=19606cf889cd23230c6a0a67b3f90123
diff --git a/metadata/md5-cache/net-misc/remmina-1.3.1 b/metadata/md5-cache/net-misc/remmina-1.3.1
new file mode 100644
index 000000000000..f7ce64009deb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=6
+HOMEPAGE=https://remmina.org/
+IUSE=ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2 ) gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.3.1/Remmina-v1.3.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4971c34c778de7ca40934559fdaccfc8
diff --git a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r2 b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r2
index c1f88ffbafa2..d29518227748 100644
--- a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r2
+++ b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0 net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt java? ( virtual/jdk )
+DEPEND=sys-libs/zlib:0= virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0= net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt java? ( virtual/jdk )
 DESCRIPTION=VNC viewer that adds encryption security to VNC connections
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.karlrunge.com/x11vnc/ssvnc.html
 IUSE=java
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0 net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
+RDEPEND=sys-libs/zlib:0= virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0= net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/ssvnc/ssvnc-1.0.29.src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c3e42e95dd334104f15d0dc36ca2c37
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=26022aff4e2ae069db1504abc31c42a2
diff --git a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2 b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
index 2f641642b9ec..e2b4e4686c70 100644
--- a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
+++ b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/wakeonlan-0.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cedfce795a5cff8ac93dee98f9719be
diff --git a/metadata/md5-cache/net-misc/whois-5.4.1 b/metadata/md5-cache/net-misc/whois-5.4.1
new file mode 100644
index 000000000000..4658aa88bec9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=improved Whois Client
+EAPI=6
+HOMEPAGE=https://www.linux.it/~md/software/
+IUSE=iconv idn nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.4.1.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=802fee63fde3e5c76dd927faa6764f18
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.01.24 b/metadata/md5-cache/net-misc/youtube-dl-2019.01.24
deleted file mode 100644
index ee454b106205..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.01.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] )
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2019.01.24/youtube-dl-2019.01.24.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=eac856de9b1fa9f2fe19983f47290c84
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.01.27 b/metadata/md5-cache/net-misc/youtube-dl-2019.01.27
new file mode 100644
index 000000000000..6d162c16b37b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.01.27
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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_4 python_targets_python3_5 python_targets_python3_6
+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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2019.01.27/youtube-dl-2019.01.27.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b6a3f6d4317e621c41548a23eb01d2ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.01.30.1 b/metadata/md5-cache/net-misc/youtube-dl-2019.01.30.1
new file mode 100644
index 000000000000..9fbf8aa69f6f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.01.30.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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_4 python_targets_python3_5 python_targets_python3_6
+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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2019.01.30.1/youtube-dl-2019.01.30.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b6a3f6d4317e621c41548a23eb01d2ea
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index c3635e6890dc..3b51f3519ca9 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -1,13 +1,14 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=959a74d131cb1b01107c41a76b2658cd
+_md5_=2cd7b18656421c1bdb6dd2e4a5d04983
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 4e7c969d4ae3..d04692291eaf 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/rawdog-2.22-r1 b/metadata/md5-cache/net-news/rawdog-2.22-r1
index 2ab8de134ef0..c4bd5b447f3d 100644
--- a/metadata/md5-cache/net-news/rawdog-2.22-r1
+++ b/metadata/md5-cache/net-news/rawdog-2.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Rawdog, RSS Aggregator Without Delusions Of Grandeur
 EAPI=6
 HOMEPAGE=http://offog.org/code/rawdog.html https://pypi.org/project/rawdog/
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/feedparser[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.22.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4d8c5de6fb650f5f8320209fc6fe40f1
+_md5_=8c9893582ee4b1eb2030c31e9df795c4
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index c0ddff66395a..e632921e9758 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.5 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.5
deleted file mode 100644
index b31ea56e4175..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-2.3.5
+++ /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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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.5/SABnzbd-2.3.5-src.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0dff35b1fc26c371ed3f05e9d9a0048c
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-2.3.7 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.7
new file mode 100644
index 000000000000..80aec89ba0d1
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-2.3.7
@@ -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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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_4(-),-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	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1ac119833da74edf106ce5a39377c722
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index ed2763ba4b30..316ba1f32b22 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/gtk-gnutella-1.1.13 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
index c0798d12160c..5da290240a45 100644
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.13.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f70ae24c44422c7634263cc49cb37c41
+_md5_=9fccdcfa70a2fad8244ba12757e15656
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.14 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.14
index 2b90ff54ec18..859b99bc5a65 100644
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.14
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.14
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.14.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=dc3c4883638872dbd958d9baef14da84
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a091bd7f0aa44b927a210809dc297072
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.4 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.4
deleted file mode 100644
index 907511bf7952..000000000000
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=BitTorrent client in C++ and Qt
-EAPI=6
-HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
-IUSE=+dbus debug webui +X
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=dbus? ( X )
-SLOT=0
-SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.4.tar.gz -> qbittorrent-4.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ad2e4aa886e36a5fa1113f2b802b052c
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.4-r1 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.4-r1
new file mode 100644
index 000000000000..5140a4d121d7
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=6
+HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+IUSE=+dbus debug webui +X
+KEYWORDS=amd64 ~arm ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=dbus? ( X )
+SLOT=0
+SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.4.tar.gz -> qbittorrent-4.1.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=124328ee4513ece574e8fd908e5d0296
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.5 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.5
deleted file mode 100644
index 449b34121fe1..000000000000
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=BitTorrent client in C++ and Qt
-EAPI=6
-HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
-IUSE=+dbus debug webui +X
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=dbus? ( X )
-SLOT=0
-SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.5.tar.gz -> qbittorrent-4.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d01c25580e963fe9cb1b0293dda0e43
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.1.5-r1 b/metadata/md5-cache/net-p2p/qbittorrent-4.1.5-r1
new file mode 100644
index 000000000000..eb4f0ab4d093
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.1.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=6
+HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+IUSE=+dbus debug webui +X
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=dbus? ( X )
+SLOT=0
+SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.1.5.tar.gz -> qbittorrent-4.1.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=407c5a73562f76b4511c7f464884cbf0
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index 2fe922449546..8ac8daf8155b 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm unpack
-DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=BitTorrent client in C++ and Qt
 EAPI=6
 HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
 IUSE=+dbus debug webui +X
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 =net-libs/libtorrent-rasterbar-1.1*:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=dbus? ( X )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd55a32881a7951b2158bad5a8bac2ef
+_md5_=3baa2dca4baf1fdb01da22f50412a246
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12 b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
index 3fccbb777fbe..4e2b3be2ea34 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.5.12
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.5.12-1_i386.deb )
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=630950300abc8cdddaaf066acc01d470
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
index 81a8c932cad1..e3b9de7d7b1a 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_i386.deb )
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c83c801efb884bbf6beec0f7c1b81713
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index e18e5b4533f5..dc08dbc111ae 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/cups-filters-1.20.4 b/metadata/md5-cache/net-print/cups-filters-1.20.4
index 8239380e94d5..86532b77084e 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.20.4
+++ b/metadata/md5-cache/net-print/cups-filters-1.20.4
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.20.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9037e65e964987e14f06ecf7756bebb
+_md5_=fd3cdac79555a67c281c03875972edc6
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
index d327196af3bc..17ddaa13996e 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b8b74b64129d02c18373ebf71a8afba
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index ac9605442f63..e8c62beb8b08 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=82d6121e1a84efe9d2b5ca1bad03073e
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.18.12 b/metadata/md5-cache/net-print/hplip-plugin-3.18.12
index dc1838d1d51d..34b619a5cfda 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.18.12
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.18.12
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.18.12 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.18.12-plugin.run
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=5f99c03594b23c5e7bc95346ed542b84
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.18.6 b/metadata/md5-cache/net-print/hplip-plugin-3.18.6
index f17e13bac948..cc5df523c64f 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.18.6
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.18.6
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.18.6 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.18.6-plugin.run
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=085cfe9561e7fe5a8ebc3082a18dd411
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 06db85ab32ee..b070d37a5448 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/haproxy-1.5.14 b/metadata/md5-cache/net-proxy/haproxy-1.5.14
deleted file mode 100644
index 9f09a2e4534a..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.5.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=5
-HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.5/src/haproxy-1.5.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0f96da9d9e51a7fc5e3a20ed13c782c8
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.5.19-r2 b/metadata/md5-cache/net-proxy/haproxy-1.5.19-r2
deleted file mode 100644
index b39db37477ca..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.5.19-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=5
-HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.5/src/haproxy-1.5.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=10e1aba580a34ab1b6059ba1797e56f3
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.3 b/metadata/md5-cache/net-proxy/haproxy-1.9.3
new file mode 100644
index 000000000000..63c815cc4862
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.9/src/haproxy-1.9.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0c6227bd9b6ec285c14c921f908c39d6
diff --git a/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r7 b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r7
index e5b24a6881b0..49e7e74f2c60 100644
--- a/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r7
+++ b/metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r7
@@ -5,7 +5,7 @@ DESCRIPTION=Proxy cache for Gentoo packages
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/http-replicator
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ppc ~sparc ~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_python2_7(-)] sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/http-replicator/http-replicator_4.0alpha2.tgz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a6c01ad2a208532dfe81b0566a5d6b3f
+_md5_=2e02ee1ba591549bfbb7b7d4f6b07f50
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.10.1 b/metadata/md5-cache/net-proxy/mitmproxy-0.10.1
deleted file mode 100644
index 9e07eef9ce3a..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.10*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =www-servers/pathod-0.10*[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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=5
-HOMEPAGE=http://mitmproxy.org/
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.10*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.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=http://mitmproxy.org/download/mitmproxy-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43d1ab172a27a1cf8dbfc10db6d285d1
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.11.1 b/metadata/md5-cache/net-proxy/mitmproxy-0.11.1
deleted file mode 100644
index d2ffe2494d6f..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-3.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.11*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =www-servers/pathod-0.11*[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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=5
-HOMEPAGE=http://mitmproxy.org/
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-3.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.11*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.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=http://mitmproxy.org/download/mitmproxy-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fec0579164b924cbdd0b095af18a1f8d
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-0.11.3 b/metadata/md5-cache/net-proxy/mitmproxy-0.11.3
deleted file mode 100644
index de22a5705eb5..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-0.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-3.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.11*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =www-servers/pathod-0.11*[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=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=5
-HOMEPAGE=http://mitmproxy.org/
-IUSE=doc examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/pillow-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-3.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/netlib-0.11*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/pyasn1-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.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=http://mitmproxy.org/download/mitmproxy-0.11.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2b04f3af5572acc6719e87232daf4e8d
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4 b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
index bbd322f11100..5748cc07b126 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
+++ b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
@@ -5,11 +5,11 @@ DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
 EAPI=7
 HOMEPAGE=https://mitmproxy.org/
 IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v4.0.4.tar.gz -> mitmproxy-4.0.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a905b15a1aa184e62ffa5e0ddb24c50b
+_md5_=4b391283c1ffbc3618337dbae8fa4240
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 1b29833989e2..63905545cba0 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/i2pd-2.23.0 b/metadata/md5-cache/net-vpn/i2pd-2.23.0
new file mode 100644
index 000000000000..e2a8fdb844a1
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2pd-2.23.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
+EAPI=6
+HOMEPAGE=https://github.com/PurpleI2P/i2pd
+IUSE=cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) upnp? ( net-libs/miniupnpc ) )
+SLOT=0
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.23.0.tar.gz -> i2pd-2.23.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8589850854a95383a1a0fde328075813
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index d116897f49df..4a1a3bd8888f 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/sdrplay-2.13.1-r1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
index 5695a479bce0..f705b528479a 100644
--- a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+++ b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 virtual/udev
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d039fa2929056ba9469f001cdbc9bcbb
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.10 b/metadata/md5-cache/net-wireless/unifi-5.10.10
new file mode 100644
index 000000000000..8792312e8a4f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.10.10
@@ -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.10-20316752b4/UniFi.unix.zip -> unifi-5.10.10.zip
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=7924aa0191b373d3d65243785f978200
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.11 b/metadata/md5-cache/net-wireless/unifi-5.10.11
new file mode 100644
index 000000000000..363d34b1a5e2
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.10.11
@@ -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.11-6e1800b9b9/UniFi.unix.zip -> unifi-5.10.11.zip
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=baa03b267bef312bbaea879858ad2db5
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.5-r1 b/metadata/md5-cache/net-wireless/unifi-5.10.5-r1
deleted file mode 100644
index 241f4f3b1cb2..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.10.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-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.5-6ba4d1bfe5/UniFi.unix.zip -> unifi-5.10.5.zip
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d52155e974f46af967f028b308677688
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
index 4089cd4a246f..353a4bfbb808 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af6588dbe547af2059a999fc9bd7b594
diff --git a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0 b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
index 8d4940675e83..5121f571bc2f 100644
--- a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
+++ b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a11b47061c044be19143c30ef915ff6
diff --git a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0 b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
index dd85bf01885f..d02d0cbaf9a4 100644
--- a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
+++ b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=161840910429112ddab666e3a9470647
diff --git a/metadata/md5-cache/perl-core/Digest-1.170.0-r1 b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
index 689715046e3f..8c052ffbba44 100644
--- a/metadata/md5-cache/perl-core/Digest-1.170.0-r1
+++ b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e07b18bdefc6387c83697a504cb1ad0
diff --git a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0 b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
index 773f12e5eac3..c6e9d8f493e3 100644
--- a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
+++ b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.53.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d882be9a1e5386fb7099422947e8ddf
diff --git a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0 b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
index e260e8701aac..b7e93a37fc76 100644
--- a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
+++ b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA-5.88.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e0ccce3440ddd474ba9b90c7100c0fb
diff --git a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0 b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
index 99002c5ba0cb..74526f0ff20f 100644
--- a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+++ b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Dumpvalue-1.17.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9bfad902c981b8be5abbf5582ae0271
diff --git a/metadata/md5-cache/perl-core/Encode-2.730.0 b/metadata/md5-cache/perl-core/Encode-2.730.0
index b2453d183fdb..a3a6aa08c903 100644
--- a/metadata/md5-cache/perl-core/Encode-2.730.0
+++ b/metadata/md5-cache/perl-core/Encode-2.730.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.73.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=41f8814ca07f7dd75095fdfa7b361766
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1 b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
index 18550d85e519..2d8f557e3bce 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
+++ b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60d0cd1ad41821f811c0d96b6def0a1a
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0 b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
index 74a7cdda84e5..fb0e777a1f06 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!=perl-core/ExtUtils-MakeMaker-7.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=707e6f2e90d00d7d14ad53498028e284
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1 b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
index 33a7c0be4643..771e973ab549 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2304.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d836fa573adc2a5c207a7de6c5cf011a
diff --git a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0 b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
index f8bb06a9982f..d7875aba0dd9 100644
--- a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
+++ b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.42.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b9576305c2e8db3af75f0278aa59e9a6
diff --git a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0 b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
index 891a27f69e2b..ec84dfbd35f9 100644
--- a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+++ b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-Tiny-0.043.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de17efc86f0566b80059c6fb1868b3b2
diff --git a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0 b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
index b713395ed2ea..02b4cbfdd73b 100644
--- a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
+++ b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.10.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81a8e096a86dcdbe83a68cdb8fac3d09
diff --git a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1 b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
index d4163a4fef31..70e736fdc4b3 100644
--- a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
+++ b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ca829d41c95a354777341174cdd2921
diff --git a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1 b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
index 3448217b2307..a18a9de14070 100644
--- a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
+++ b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MIME-Base64-3.14.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7120014832f2cf56e37353b654c422a3
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index ea2b16e1a10c..43c853d11918 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/perl-core/Math-Complex-1.590.0 b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
index 8743751399cf..eb93db86049e 100644
--- a/metadata/md5-cache/perl-core/Math-Complex-1.590.0
+++ b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cdfb1fd4a58fa1e666c19c5fe8c6d35f
diff --git a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1 b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
index f03447e650ad..ae681f0b790c 100644
--- a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
+++ b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aedd9da39c49171398338899531667a
diff --git a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1 b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
index aa8680c77dbb..5f7d32674489 100644
--- a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
+++ b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Module-Loaded-0.08.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=efefd80ddaa8b891c803dbd4d70df348
diff --git a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26 b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
index 0987ba3ad29c..353f296b8055 100644
--- a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
+++ b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000026.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2dd8db4608d14537d80b958442a399f
diff --git a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1 b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
index 48a725413d11..4f44788d0846 100644
--- a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
+++ b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Locale-Maketext-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Params-Check-0.38.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ca28431917d471f2cec71f1a59b82ed
diff --git a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0 b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
index 16d2a320e544..99d56ffe4b1a 100644
--- a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
+++ b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.28.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b68581178dc25f95e8f7babc5b4385e2
diff --git a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1 b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
index db72dcd8f619..f9852e5ac841 100644
--- a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
+++ b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.33.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3d4194f75c364d6fbdd176f575fb625
diff --git a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0 b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
index a967da3c6e6b..372d6dc1c43e 100644
--- a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+++ b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.02.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b8eb6b4da22fd254f266b9abe6dcdd9
diff --git a/metadata/md5-cache/perl-core/Test-1.260.0 b/metadata/md5-cache/perl-core/Test-1.260.0
index 1829151255cb..83e8dc0e73ee 100644
--- a/metadata/md5-cache/perl-core/Test-1.260.0
+++ b/metadata/md5-cache/perl-core/Test-1.260.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f7730dd1c045dbed8fab79b4a0e62e6c
diff --git a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1 b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
index bd2dff73500b..b202f9ec1717 100644
--- a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
+++ b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Text-Balanced-2.02.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a76277c69562e3a0a3c90f0f0600129f
diff --git a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0 b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
index 72789b9e621d..d20599886f59 100644
--- a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
+++ b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.29.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2f7d80e3e125275772b55cdc93dff2ca
diff --git a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1 b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
index 9ef6c36e25cb..f00b744a1656 100644
--- a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
+++ b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cd615944af609302f1fcbc7d846f8b01
diff --git a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1 b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
index f5dcf8dcd402..640c1e87bdc5 100644
--- a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
+++ b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-threads-shared virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=095c00df143188f225a087ad94e8534e
diff --git a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1 b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
index d94547070461..3e0a6e53e359 100644
--- a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
+++ b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Time-HiRes-1.9726.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf81bbb2fd9f67f915cffce452307bce
diff --git a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1 b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
index ad14b2ac7812..689799962e4f 100644
--- a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
+++ b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ac118998f6214e74b025b3d03e20696
diff --git a/metadata/md5-cache/perl-core/Unicode-Collate-1.140.0 b/metadata/md5-cache/perl-core/Unicode-Collate-1.140.0
index 3cc306226dfd..31aa42f4a911 100644
--- a/metadata/md5-cache/perl-core/Unicode-Collate-1.140.0
+++ b/metadata/md5-cache/perl-core/Unicode-Collate-1.140.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.14.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36eb3e6fd1827ac3f2ff745686b15a9c
diff --git a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0 b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
index e46c2ea497e4..8f751f75219e 100644
--- a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
+++ b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KH/KHW/Unicode-Normalize-1.25.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e47c61518b80af4a8f6ac8af82b86f4
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
index 7975f63f5048..9785add7e670 100644
--- a/metadata/md5-cache/perl-core/libnet-1.270.0
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e843ad61d232318b8df76dabb92c6e1
diff --git a/metadata/md5-cache/perl-core/parent-0.228-r1 b/metadata/md5-cache/perl-core/parent-0.228-r1
index 249aa6cc47ba..19e2e1f656f8 100644
--- a/metadata/md5-cache/perl-core/parent-0.228-r1
+++ b/metadata/md5-cache/perl-core/parent-0.228-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8de14c26dd105ad5343a1ab16bf7c673
diff --git a/metadata/md5-cache/perl-core/podlators-2.5.3 b/metadata/md5-cache/perl-core/podlators-2.5.3
index 69c526b8b7df..b4c8a99ec274 100644
--- a/metadata/md5-cache/perl-core/podlators-2.5.3
+++ b/metadata/md5-cache/perl-core/podlators-2.5.3
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.8.8-r8 >=virtual/perl-Pod-Simple-3.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7c668a0b06fdc02d1ea8ac54bbad0a3
diff --git a/metadata/md5-cache/perl-core/version-0.990.800 b/metadata/md5-cache/perl-core/version-0.990.800
index c5984f12443c..8479f7494b60 100644
--- a/metadata/md5-cache/perl-core/version-0.990.800
+++ b/metadata/md5-cache/perl-core/version-0.990.800
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9908.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54f778cb860e363f97d2ca973071c386
diff --git a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1 b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
index c87ba5b77bc2..04a470172a12 100644
--- a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
+++ b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<sci-biology/GBrowse-2.44-r1 >=sci-biology/bioperl-1.6.9 >=dev-perl/Bio-Graphics-2.09 >=dev-perl/GD-2.07 >=dev-perl/CGI-Session-4.02 dev-perl/IO-String dev-perl/JSON dev-perl/libwww-perl dev-perl/Statistics-Descriptive !minimal? ( dev-perl/Bio-Das >=dev-perl/Bio-SamTools-1.20 dev-perl/Crypt-SSLeay dev-perl/DB_File-Lock dev-perl/DBI mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-perl/FCGI dev-perl/File-NFSLock dev-perl/GD-SVG dev-perl/Net-OpenID-Consumer dev-perl/Net-SMTP-SSL ) dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GBrowse-2.48.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=bccaeef3292f6df307fc14fb5a2a74b2
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index f7b416e8ec91..88118b07904c 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/bioperl-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-1.6.9
index 9cf427fb60d7..7861bae42071 100644
--- a/metadata/md5-cache/sci-biology/bioperl-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-1.6.9
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/libwww-perl !minimal? ( dev-perl/Algorithm-Munkres dev-perl/Arr
 REQUIRED_USE=minimal? ( !graphviz )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-1.6.901.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be22a76392a6e5c121e4b6d388045faa
diff --git a/metadata/md5-cache/sci-biology/bioperl-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-9999-r1
index 360d07021fea..f7a7c5b04381 100644
--- a/metadata/md5-cache/sci-biology/bioperl-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-9999-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 PDEPEND=!minimal? ( dev-perl/Bio-ASN1-EntrezGene ) db? ( >=sci-biology/bioperl-db-9999 ) network? ( >=sci-biology/bioperl-network-9999 ) run? ( >=sci-biology/bioperl-run-9999 )
 RDEPEND=dev-perl/Data-Stag dev-perl/libwww-perl !minimal? ( dev-perl/Ace dev-perl/Bio-ASN1-EntrezGene dev-perl/Spreadsheet-ParseExcel dev-perl/Spreadsheet-WriteExcel >=dev-perl/XML-SAX-0.15 dev-perl/Graph dev-perl/SOAP-Lite dev-perl/Array-Compare dev-perl/SVG dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-Twig >=dev-perl/HTML-Parser-3.60 >=dev-perl/XML-Writer-0.4 dev-perl/Clone dev-perl/XML-DOM dev-perl/Set-Scalar dev-perl/XML-XPath dev-perl/XML-DOM-XPath dev-perl/Algorithm-Munkres dev-perl/Data-Stag dev-perl/Math-Random dev-perl/PostScript dev-perl/Convert-Binary-C dev-perl/SVG-Graph ) graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=210415961127105f0fc625670ba9e423
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
index f3a8a6f9744d..c1d60e3e03e2 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 dev-perl/DBD-mysql dev-perl/DBI sci-biology/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-DB-1.006900.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2470d7ecf1b6ff1902a8d74057748480
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
index 850a7243a90d..068144797ad2 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.bioperl.org/
 LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 dev-perl/DBI sci-biology/biosql dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd4229be06b3975302e9e37ca35601d2
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
index 5d25b154268b..e3a6cd5a62d2 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sci-biology/bioperl-1.6.9 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Network-1.006900.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb366a6a0c6cf3c12320c2d6d3551abe
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
index d810f39b286c..9527c8afb842 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=025cd5fa89be402f3296160dbf755c8b
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
index ecbfce2a9e3d..0b9c304a6e42 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 !minimal? ( dev-perl/Algorithm-Diff dev-perl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Run-1.006900.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9caec4e5b47cbf306a1689903f2a018a
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
index 5c5f8b1fdf2a..afa012f8d004 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 !minimal? ( dev-perl/Algorithm-Diff dev-perl/XML-Twig dev-perl/IO-String dev-perl/IPC-Run ) dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	249c1a0962573f4ce2c28f0d5b6b35d4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26abe4f8477c1a1c22bd8515484ce1c1
diff --git a/metadata/md5-cache/sci-biology/diya-1.0_rc4 b/metadata/md5-cache/sci-biology/diya-1.0_rc4
index decebedec217..5239f8918742 100644
--- a/metadata/md5-cache/sci-biology/diya-1.0_rc4
+++ b/metadata/md5-cache/sci-biology/diya-1.0_rc4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-biology/bioperl dev-perl/Data-Utilities dev-perl/XML-Simple !minimal? ( sci-biology/mummer sci-biology/glimmer sci-biology/trnascan-se sci-biology/infernal ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/diyg/files/diya/diya-1.0/diya-1.0-rc4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d4639d7c08c43e2c2208492508fd56c
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
index bffba541b275..b03f7a2136a1 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? (
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-2.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e58c830b49ced05ae9960fcc2dead13
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
index 2639f5e239d8..35a060c0746b 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl media-libs/gd doc? ( dev-texlive/texlive-latex ) python? (
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.1.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2a6486af275e75c6365ab7eeba1e0bd
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index fdece3784929..972cb30b96e2 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/gpxsee-7.1 b/metadata/md5-cache/sci-geosciences/gpxsee-7.1
deleted file mode 100644
index e73a62c274a5..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
-EAPI=6
-HOMEPAGE=http://www.gpxsee.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5
-SLOT=0
-SRC_URI=https://github.com/tumic0/GPXSee/archive/7.1.tar.gz -> gpxsee-7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2afab3540eeb6a92a776511198258a93
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.1-r1 b/metadata/md5-cache/sci-geosciences/gpxsee-7.1-r1
new file mode 100644
index 000000000000..0de8a09a7c65
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=6
+HOMEPAGE=http://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=https://github.com/tumic0/GPXSee/archive/7.1.tar.gz -> gpxsee-7.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=07217e6a866c2b91b2542450f310ce0f
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1
deleted file mode 100644
index 06a3fdb0f44a..000000000000
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.11.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=GPS mapping utility
-EAPI=6
-HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib
-SLOT=0
-SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.11.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b9fb8faf06a56c7f8ee71a2b67bb286c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 765cb773e959..8209e754636b 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/gdal-2.3.1 b/metadata/md5-cache/sci-libs/gdal-2.3.1
index ed0b2ff0ad74..9a77b61d410c 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=6
 HOMEPAGE=https://www.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_4 python_targets_python3_5 python_targets_python3_6 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_4 python_targets_python3_5 python_targets_python3_6 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4229f49ec5e44617623f6072488193a9
+_md5_=6572836d1c8bd266ba91eeae05a2e85a
diff --git a/metadata/md5-cache/sci-libs/scipy-0.19.1 b/metadata/md5-cache/sci-libs/scipy-0.19.1
index 082402333c81..69f200972808 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.19.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.19.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=6
 HOMEPAGE=https://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-0.19.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.19.1/scipy-html-0.19.1.zip -> scipy-0.19.1-html.zip https://docs.scipy.org/doc/scipy-0.19.1/scipy-ref-0.19.1.pdf -> scipy-0.19.1-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dddc3fb3476fb48300856903e4e2ca4c
+_md5_=6019636c2583848931fcee8c96d2d503
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index 5dae36025334..2850d07ec9b3 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=6
 HOMEPAGE=https://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.1.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.1.0/scipy-html-1.1.0.zip -> scipy-1.1.0-html.zip https://docs.scipy.org/doc/scipy-1.1.0/scipy-ref-1.1.0.pdf -> scipy-1.1.0-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b7af1779539d72fda1c0c50e8f043c85
+_md5_=851dab382a7e960f2ecaa5e7c5a0fb82
diff --git a/metadata/md5-cache/sci-libs/scipy-9999 b/metadata/md5-cache/sci-libs/scipy-9999
index f7be459798a2..b76d5233963a 100644
--- a/metadata/md5-cache/sci-libs/scipy-9999
+++ b/metadata/md5-cache/sci-libs/scipy-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.23.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.23.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=6
 HOMEPAGE=https://www.scipy.org/
-IUSE=sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=sparse test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=95787c99856f9bb76c2c47e5d84e19b4
+_md5_=8637ab32cedb0aa4b35236d7566e8680
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index d2ef395f23f7..a921ef36b4f8 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/octave-4.2.2 b/metadata/md5-cache/sci-mathematics/octave-4.2.2
index f0e9c3c3bf8f..0b82e972d967 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.2.2
+++ b/metadata/md5-cache/sci-mathematics/octave-4.2.2
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncu
 SLOT=0/4.2.2
 SRC_URI=mirror://gnu/octave/octave-4.2.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f175a4d194d7b46f0d1f20a2d1c6c42b
+_md5_=658f13fb48285d1b5b67449c50d8e9da
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.4.1 b/metadata/md5-cache/sci-mathematics/octave-4.4.1
index 6f6bd94f9c1c..0b79dab56dbb 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.4.1
+++ b/metadata/md5-cache/sci-mathematics/octave-4.4.1
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncu
 SLOT=0/4.4.1
 SRC_URI=mirror://gnu/octave/octave-4.4.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=297cdfaf1eb6a369340054ad5479894f
+_md5_=7c853ec328615729c67a9ed55e457278
diff --git a/metadata/md5-cache/sci-mathematics/pspp-0.10.1 b/metadata/md5-cache/sci-mathematics/pspp-0.10.1
deleted file mode 100644
index 8a61ca42f18b..000000000000
--- a/metadata/md5-cache/sci-mathematics/pspp-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] ) virtual/pkgconfig doc? ( virtual/latex-base )
-DESCRIPTION=Program for statistical analysis of sampled data
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
-IUSE=cairo doc emacs examples gtk ncurses nls perl postgres static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] )
-SLOT=0/0.10.1
-SRC_URI=mirror://gnu/pspp/pspp-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2603348fe0725ff5d86425bcbc8909d5
diff --git a/metadata/md5-cache/sci-mathematics/pspp-0.10.2 b/metadata/md5-cache/sci-mathematics/pspp-0.10.2
deleted file mode 100644
index 9c255db33da5..000000000000
--- a/metadata/md5-cache/sci-mathematics/pspp-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] ) virtual/pkgconfig doc? ( virtual/latex-base )
-DESCRIPTION=Program for statistical analysis of sampled data
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
-IUSE=cairo doc emacs examples gtk ncurses nls perl postgres static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] )
-SLOT=0/0.10.2
-SRC_URI=mirror://gnu/pspp/pspp-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=100bec8bf9cd17821f07bf1685f3f4d8
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 6234e716edbb..603a64851630 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/cernlib-2006-r7 b/metadata/md5-cache/sci-physics/cernlib-2006-r7
index 2a9e6fa41b5b..8d08c1fbc117 100644
--- a/metadata/md5-cache/sci-physics/cernlib-2006-r7
+++ b/metadata/md5-cache/sci-physics/cernlib-2006-r7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran x11-misc/imake x11-misc/makedepend virtual/pkgconfig virtual/fortran
+DEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran net-libs/libnsl x11-misc/imake x11-misc/makedepend virtual/pkgconfig virtual/fortran
 DESCRIPTION=CERN program library for High Energy Physics
 EAPI=5
 HOMEPAGE=https://cernlib.web.cern.ch/cernlib/
 KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2 BSD
-RDEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran virtual/fortran
+RDEPEND=x11-libs/motif:0 virtual/lapack dev-lang/cfortran net-libs/libnsl virtual/fortran
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3.orig.tar.gz mirror://debian/pool/main/c/cernlib/cernlib_20061220+dfsg3-4.3.debian.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f3f947be5e879e4b61551e958e8bfb
+_md5_=b0fec758e5ae33a5bd8bee4b48c5a158
diff --git a/metadata/md5-cache/sci-physics/root-6.14.08-r1 b/metadata/md5-cache/sci-physics/root-6.14.08-r1
index 132c5cdf3de1..45b77ec5b2db 100644
--- a/metadata/md5-cache/sci-physics/root-6.14.08-r1
+++ b/metadata/md5-cache/sci-physics/root-6.14.08-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix?
 SLOT=6.14/08
 SRC_URI=https://root.cern/download/root_v6.14.08.source.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=baa170c0d36bc24de1c2788938cb5edb
+_md5_=826cbf4c80f6e0ee71ca570dccad8b3b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f50708ea8629..fe83fec31a48 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/debianutils-4.8.4 b/metadata/md5-cache/sys-apps/debianutils-4.8.4
deleted file mode 100644
index a1ac647c4b49..000000000000
--- a/metadata/md5-cache/sys-apps/debianutils-4.8.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A selection of tools from Debian
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
-IUSE=+installkernel static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=BSD GPL-2 SMAIL
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d59bf33a7f8ac4cb3f118e32409d34c
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.8.6.1 b/metadata/md5-cache/sys-apps/debianutils-4.8.6.1
new file mode 100644
index 000000000000..871cbd9a8a51
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/debianutils-4.8.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A selection of tools from Debian
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
+IUSE=+installkernel static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=BSD GPL-2 SMAIL
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.6.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=35c5e0eb1aabc3aaa9e1dfb9fb9f1382
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.4 b/metadata/md5-cache/sys-apps/groff-1.22.4
index ed64b9d65047..8ed156b6f24e 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.4
+++ b/metadata/md5-cache/sys-apps/groff-1.22.4
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz mirror://gnu-alpha/groff/groff-1.22.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c6cf1fd0bfde2fe71bf66f6f0d5798db
+_md5_=ca405dd47f5472f612c9fa60abbbaae5
diff --git a/metadata/md5-cache/sys-apps/lsd-0.11.1-r1 b/metadata/md5-cache/sys-apps/lsd-0.11.1-r1
deleted file mode 100644
index dd80c4aafcda..000000000000
--- a/metadata/md5-cache/sys-apps/lsd-0.11.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.30.1 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=test debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/Peltoche/lsd/archive/0.11.1.tar.gz -> lsd-0.11.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/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.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.8.1/download -> users-0.8.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/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_=31765cc41f4a89071416e89600d4d1cc
diff --git a/metadata/md5-cache/sys-apps/lsd-0.12.0 b/metadata/md5-cache/sys-apps/lsd-0.12.0
new file mode 100644
index 000000000000..16816ec64def
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lsd-0.12.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.30.1 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=test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/Peltoche/lsd/archive/0.12.0.tar.gz -> lsd-0.12.0.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/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.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.8.1/download -> users-0.8.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/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_=d1d2f52af661d6d8c5d92d8aecb60dc7
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.57 b/metadata/md5-cache/sys-apps/portage-2.3.57
deleted file mode 100644
index f8f627df97a4..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.57
+++ /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_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) 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_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.57.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.57.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9518fcada09b46e6ff554eb91a5f8eb2
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.59-r1 b/metadata/md5-cache/sys-apps/portage-2.3.59-r1
new file mode 100644
index 000000000000..a70b17ac8bcf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.59-r1
@@ -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_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) 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_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.59.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.59.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=56ab816b4c90e4303516ce8e22049300
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1 b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
index 8cb908f0eb98..aa1e84dbb73a 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a search tool that combines the usability of ag with the raw speed o
 EAPI=6
 HOMEPAGE=https://github.com/BurntSushi/ripgrep
 IUSE=+man pcre debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.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/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bytecount/0.3.2/download -> bytecount-0.3.2.crate https://crates.io/api/v1/crates/byteorder/1.2.6/download -> byteorder-1.2.6.crate https://crates.io/api/v1/crates/cc/1.0.24/download -> cc-1.0.24.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/crossbeam-channel/0.2.4/download -> crossbeam-channel-0.2.4.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.5.2/download -> crossbeam-epoch-0.5.2.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/encoding_rs/0.8.6/download -> encoding_rs-0.8.6.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.2/download -> encoding_rs_io-0.1.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.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/globset/0.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/grep/0.2.2/download -> grep-0.2.2.crate https://crates.io/api/v1/crates/grep-cli/0.1.1/download -> grep-cli-0.1.1.crate https://crates.io/api/v1/crates/grep-matcher/0.1.1/download -> grep-matcher-0.1.1.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.1/download -> grep-pcre2-0.1.1.crate https://crates.io/api/v1/crates/grep-printer/0.1.1/download -> grep-printer-0.1.1.crate https://crates.io/api/v1/crates/grep-regex/0.1.1/download -> grep-regex-0.1.1.crate https://crates.io/api/v1/crates/grep-searcher/0.1.1/download -> grep-searcher-0.1.1.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.2/download -> itoa-0.4.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/libc/0.2.43/download -> libc-0.2.43.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/memchr/2.0.2/download -> memchr-2.0.2.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.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/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.0/download -> parking_lot_core-0.3.0.crate https://crates.io/api/v1/crates/pcre2/0.1.0/download -> pcre2-0.1.0.crate https://crates.io/api/v1/crates/pcre2-sys/0.1.1/download -> pcre2-sys-0.1.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.18/download -> proc-macro2-0.4.18.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/ripgrep/0.10.0/download -> ripgrep-0.10.0.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.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/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/serde/1.0.77/download -> serde-1.0.77.crate https://crates.io/api/v1/crates/serde_derive/1.0.77/download -> serde_derive-1.0.77.crate https://crates.io/api/v1/crates/serde_json/1.0.27/download -> serde_json-1.0.27.crate https://crates.io/api/v1/crates/simd/0.2.2/download -> simd-0.2.2.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.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.15.1/download -> syn-0.15.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/1.0.3/download -> termcolor-1.0.3.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/ucd-util/0.1.1/download -> ucd-util-0.1.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/unreachable/1.0.0/download -> unreachable-1.0.0.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/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.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-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
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=11916f58812ace4295a023dbbf69f9df
+_md5_=ade8b47400faa087cb919bbe515ee76e
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1 b/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
index 27c4fc2c07ab..f1a665b3a532 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=User space utilities for the zSeries (s390) Linux kernel and device
 EAPI=7
 HOMEPAGE=https://www.ibm.com/developerworks/linux/linux390/s390-tools.html
 IUSE=fuse ncurses pfm snmp zlib
-KEYWORDS=-* ~s390
+KEYWORDS=-* s390
 LICENSE=GPL-2 MIT
 RDEPEND=fuse? ( sys-fs/fuse:0= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.4.0.tar.gz -> s390-tools-2.4.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=ec13e23f3ef5c83ac2d1f2551841b92e
+_md5_=b004dfd8663954af9b276581d6368729
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r2 b/metadata/md5-cache/sys-apps/systemd-239-r2
index c133a4d27432..c4a96aa20c7c 100644
--- a/metadata/md5-cache/sys-apps/systemd-239-r2
+++ b/metadata/md5-cache/sys-apps/systemd-239-r2
@@ -13,4 +13,4 @@ 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-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52ea33b58876055c9ab0a347d735b833
+_md5_=b3254fa1dd31ae3c6673bfc5ae4cb606
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r3 b/metadata/md5-cache/sys-apps/systemd-239-r3
index 3999cffdf643..e8f0314490a4 100644
--- a/metadata/md5-cache/sys-apps/systemd-239-r3
+++ b/metadata/md5-cache/sys-apps/systemd-239-r3
@@ -4,7 +4,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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
@@ -13,4 +13,4 @@ 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	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61e0e9ae3d1e53b529ce9fcf7db1c3a4
+_md5_=16108a0ee44dbb58a11c2f1bb81ae4ef
diff --git a/metadata/md5-cache/sys-apps/systemd-240-r3 b/metadata/md5-cache/sys-apps/systemd-240-r3
index a93364b8d3f5..be490fb4b722 100644
--- a/metadata/md5-cache/sys-apps/systemd-240-r3
+++ b/metadata/md5-cache/sys-apps/systemd-240-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v240/systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=2cccc5b7e294f525b6ba3d713aeddd56
+_md5_=7d3d6a20a0ff5ca75eaafe622ec1284c
diff --git a/metadata/md5-cache/sys-apps/systemd-240-r4 b/metadata/md5-cache/sys-apps/systemd-240-r4
index 71fa3428f564..2bf678a50696 100644
--- a/metadata/md5-cache/sys-apps/systemd-240-r4
+++ b/metadata/md5-cache/sys-apps/systemd-240-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v240/systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=046736cff7f268b408e2b2d2f8792c99
+_md5_=b708c74c1d2821c06305b9affb685566
diff --git a/metadata/md5-cache/sys-apps/systemd-241_rc1 b/metadata/md5-cache/sys-apps/systemd-241_rc1
new file mode 100644
index 000000000000..b58180f6e23f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-241_rc1
@@ -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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +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_ppc_32 abi_ppc_64 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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/v241-rc1/systemd-241-rc1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bd48546e6185d27fd1274904542be96e
diff --git a/metadata/md5-cache/sys-apps/systemd-241_rc2 b/metadata/md5-cache/sys-apps/systemd-241_rc2
new file mode 100644
index 000000000000..d5e0e04c8623
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-241_rc2
@@ -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 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +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_ppc_32 abi_ppc_64 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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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/v241-rc2/systemd-241-rc2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bd48546e6185d27fd1274904542be96e
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 6996c6383ac8..244190b3fadd 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bfb08141af852c3c6ae63f410cea1883
+_md5_=bd48546e6185d27fd1274904542be96e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.88-r9 b/metadata/md5-cache/sys-apps/sysvinit-2.88-r9
deleted file mode 100644
index 5dde504b2bf1..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.88-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-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.88dsf.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8dac3e2136e8153e3178294cbc54d4e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.91-r1 b/metadata/md5-cache/sys-apps/sysvinit-2.91-r1
index 516484fa2d0c..d37f83c0a7c6 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-2.91-r1
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.91-r1
@@ -4,10 +4,10 @@ DESCRIPTION=/sbin/init - parent of all processes
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
 IUSE=selinux ibm static kernel_FreeBSD
-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=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.91.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c74817404ebd266df24a0825378a836
+_md5_=2f2bbf8efb6ef887310a73c3424a592b
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.92 b/metadata/md5-cache/sys-apps/sysvinit-2.92
deleted file mode 100644
index de6b174d3c9b..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-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.92.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d114bac207346136cc5594a7e49c9ab
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33-r1 b/metadata/md5-cache/sys-apps/util-linux-2.33-r1
index 93474cb9154b..f4dcb2a3002c 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.33-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33-r1
@@ -4,11 +4,11 @@ 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_4 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~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 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_ppc_32(-)?,abi_ppc_64(-)?,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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22a08c66483109ed1813f60e2c73cf98
+_md5_=98ed00f86a78461b184cb629c8a995d6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 9b06d99b9ce5..731481189e3f 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-239.3 b/metadata/md5-cache/sys-auth/elogind-239.3
index 869bbd5faa04..180451139cd6 100644
--- a/metadata/md5-cache/sys-auth/elogind-239.3
+++ b/metadata/md5-cache/sys-auth/elogind-239.3
@@ -4,11 +4,11 @@ DESCRIPTION=The systemd project's logind, extracted to a standalone package
 EAPI=6
 HOMEPAGE=https://github.com/elogind/elogind
 IUSE=+acl debug doc +pam +policykit selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=CC0-1.0 LGPL-2.1+ public-domain
 PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v239.3.tar.gz -> elogind-239.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=342703f9d18284e0b9dafa9b441f462c
+_md5_=278b7f91fc2cb6e81fa92f75d1df7f39
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 3519324d5efb..efc77709c5f0 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/cinder-12.0.5 b/metadata/md5-cache/sys-cluster/cinder-12.0.5
new file mode 100644
index 000000000000..33fd5ce2df2f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-12.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=6
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rtslib-fb-2.1.43[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/rtslib-fb-2.1.60[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/rtslib-fb-2.1.61[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/rtslib-fb-2.1.64[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-12.0.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d90b44155ab7fb6e6c76cb2fee4db7cd
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.33.1 b/metadata/md5-cache/sys-cluster/minikube-0.33.1
new file mode 100644
index 000000000000..d8555879099b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/minikube-0.33.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) libvirt? ( app-emulation/libvirt[qemu] ) >=dev-lang/go-1.9
+DESCRIPTION=Single Node Kubernetes Cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+IUSE=hardened libvirt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=sys-cluster/kubectl-1.10.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/minikube/archive/v0.33.1.tar.gz -> minikube-0.33.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=15e5095227e84658790bff6dd70939f2
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 60810f8b0638..21f51080e0fd 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/autogen-5.18.16 b/metadata/md5-cache/sys-devel/autogen-5.18.16
index 84190e309c06..c4008505f411 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.16
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.16
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2.0:= dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.16/autogen-5.18.16.tar.xz https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589 -> autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8d377d3d643d240460e2dbef5a4cdbb7
+_md5_=ecfccf7bb1946f93295649b44870a84e
diff --git a/metadata/md5-cache/sys-devel/binutils-2.25.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
index b24506836ced..c6b9fd91d22a 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.25.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
 SLOT=2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.25.1-patches-1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2620a73e812a3571d5ae12f3c99a619d
diff --git a/metadata/md5-cache/sys-devel/binutils-2.26.1 b/metadata/md5-cache/sys-devel/binutils-2.26.1
index d91c6f741842..6e9836c85f02 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.26.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.26.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.26.1
 SRC_URI=mirror://gnu/binutils/binutils-2.26.1.tar.bz2 mirror://gentoo/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.26.1-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.27-r1 b/metadata/md5-cache/sys-devel/binutils-2.27-r1
index c1ae18b379d4..194827b0c61d 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.27-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.27-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.27-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.27-patches-1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22bf9ba2542cb6513941873b9fdfd6b4
diff --git a/metadata/md5-cache/sys-devel/binutils-2.28.1 b/metadata/md5-cache/sys-devel/binutils-2.28.1
index 2355492c316d..6db734c9faa6 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.28.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=748753349c21446e54e161c7c90e1313
diff --git a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
index 5d9ae788c32a..ea4f2822b098 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=63caa4f6c6d10749dde5b4a4e97e3820
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2.6 b/metadata/md5-cache/sys-devel/binutils-apple-3.2.6
new file mode 100644
index 000000000000..00b333aee95f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-apple-3.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
+DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.6
+EAPI=6
+HOMEPAGE=http://www.opensource.apple.com/darwinsource/
+IUSE=test
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=APSL-2
+RDEPEND=sys-devel/binutils-config
+RESTRICT=test
+SLOT=3
+SRC_URI=https://opensource.apple.com/tarballs/ld64/ld64-97.17.tar.gz https://opensource.apple.com/tarballs/cctools/cctools-795.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-132.13.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-3.2.6-r0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a1f551f69805bf59a9659ce76285bba8
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
index 0b9012f21dc8..6e200e25fd9f 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.25.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
 SLOT=2.25.1
 SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.25.1-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.25.1-patches-1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=faf68591e084ac41b42c9f420c7685b6
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
index e61a4442ca6b..936ab62df298 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.26.1
 SRC_URI=mirror://gnu/binutils/binutils-2.26.1.tar.bz2 mirror://gentoo/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.26.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.26.1-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0cd6f8a52610c7ad4a8db0d1e0bbf6ae
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.27 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
index 8a439df949a1..e0e41f02f8ef 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.27
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.27
 SRC_URI=mirror://gnu/binutils/binutils-2.27.tar.bz2 mirror://gentoo/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.27-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.27-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=23217789675b39ef377be7f996e78555
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
index a053febf4c0e..97311910c371 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28
 SRC_URI=mirror://gnu/binutils/binutils-2.28.tar.bz2 mirror://gentoo/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28-patches-1.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28-patches-1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6a05fb20ef45b058aae9bd3127680f72
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
index 995e7b2b70b5..9cb002c7e51f 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.28.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3137c45cb0ff34c6ea36699bd0c0224c
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
index 1fe9725df5d8..8afb617f89ec 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29
 SRC_URI=mirror://gnu/binutils/binutils-2.29.tar.bz2 mirror://gentoo/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3137c45cb0ff34c6ea36699bd0c0224c
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
index 20197e2df48b..3656f4c553de 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29-patches-1.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f3a4b5b240d93491f92e5233f3331669
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
index 99c9d1f07b02..0f22f8b906b5 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	47dbfe6edd65926c21ffc659f55a281b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c8658314da9477b12013499054069cb7
diff --git a/metadata/md5-cache/sys-devel/bison-3.2.3 b/metadata/md5-cache/sys-devel/bison-3.2.3
deleted file mode 100644
index 6255930f71d9..000000000000
--- a/metadata/md5-cache/sys-devel/bison-3.2.3
+++ /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.2.3.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.2.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.2.3-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7053aeb208798903f07818f076c2f36
diff --git a/metadata/md5-cache/sys-devel/bison-3.3.1 b/metadata/md5-cache/sys-devel/bison-3.3.1
new file mode 100644
index 000000000000..48f5a6bfdc5f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bison-3.3.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=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	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=70a5c49d407474a7642c150210d7bd92
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
index c7be2786f384..07be7a2d7c2d 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f6d2084dc99bff7f3d53d2e39bfeedaa
diff --git a/metadata/md5-cache/sys-devel/gdb-8.2.1 b/metadata/md5-cache/sys-devel/gdb-8.2.1
index 57a818c20d8a..01849073b0fe 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.2.1
+++ b/metadata/md5-cache/sys-devel/gdb-8.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-8.2.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.2.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gdb-8.1-patches-1.tar.xz mirror://gentoo/gdb-8.1-patches-1.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=76eccc01df5782de22483b04a03c95a0
+_md5_=b5c01df59b6d57f7c6080e77328f2550
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
index 9f035e5b5035..1628f31806ad 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3559211bfcee71be69aa69309fc0c357
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
index dc826d4ce99d..ff82a924a030 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e35b065feb538e9a1629c032ac240f12
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r5 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
index a6f6e11d985f..d2e456a9c794 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6a2dc049a729a974df190f4ab9bc33b9
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index ca1e4ccc400f..7b97121a19ae 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -7,5 +7,5 @@ IUSE=vanilla
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab42b440535e7d58d643388d89d91d81
diff --git a/metadata/md5-cache/sys-devel/prelink-20151030 b/metadata/md5-cache/sys-devel/prelink-20151030
index 6f01ce8d5f9c..730ddbd3c728 100644
--- a/metadata/md5-cache/sys-devel/prelink-20151030
+++ b/metadata/md5-cache/sys-devel/prelink-20151030
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/elfutils-0.100[static-libs(+)] selinux? ( sys-libs/libselinux
 SLOT=0
 SRC_URI=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/snapshot/prelink-cross-20151030.tar.bz2 doc? ( https://people.redhat.com/jakub/prelink/prelink.pdf )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6c83a2f6371d3fb046e904193f449e9
+_md5_=d37e95bdc2e28b33553905ccd674b9b7
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.0 b/metadata/md5-cache/sys-devel/sparse-0.6.0
new file mode 100644
index 000000000000..3030604e9b88
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/sparse-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
+DESCRIPTION=C semantic parser
+EAPI=7
+HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
+IUSE=gtk llvm test xml
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+SLOT=0
+SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.6.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=20b93d662ded25279860674c0bb662fb
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 55682127e5b8..fe77c65d7039 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install test unpack
+DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
 DESCRIPTION=C semantic parser
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
 IUSE=gtk llvm test xml
 LICENSE=MIT
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b3888f15d3c2f0b8af84f6b91b9dee27
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=20b93d662ded25279860674c0bb662fb
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 222ae18b8bb1..9e08b3b0e57c 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/nvidia-firmware-325.15 b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
index 8b9ab5401096..d2db5fa01ed8 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run https://raw.github.com/imirkin/re-vp2/845a51ab607df85fc0ed01f0b5b6d57850e37662/extract_firmware.py -> nvidia_extract_firmware-325.15.py
-_eclasses_=unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=e9a298b84792cfed5e533f7806aaec35
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32 b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
index e01c1b46bc4a..7344df980f44 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run https://raw.github.com/imirkin/re-vp2/96641bfebb2547402b2145fcf0e3116410f0da87/extract_firmware.py -> nvidia_extract_firmware-340.32.py
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a565209d9bcec4155e5bd5616c5f022c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 06a23558dde6..90a96c5236bd 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/ddrescue-1.21-r1 b/metadata/md5-cache/sys-fs/ddrescue-1.21-r1
index 302945dc2274..1c89e7850763 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.21-r1
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.21-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.21.tar.lz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c2037c14fcf9ed37ce646960b6e490d
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.22-r1 b/metadata/md5-cache/sys-fs/ddrescue-1.22-r1
index 1be7ea4d43ad..06e60172bbbd 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.22-r1
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.22-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.22.tar.lz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd08fc3ee249345691a6bcc93aecb640
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.23 b/metadata/md5-cache/sys-fs/ddrescue-1.23
index 79ae580ce2d3..84125bf31de0 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.23
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.23
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.23.tar.lz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0d3e04b75f549087b10958c112c86bd
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.44.5 b/metadata/md5-cache/sys-fs/e2fsprogs-1.44.5
index 0e55c7635aad..be85ccd8c23f 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.44.5
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.44.5
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.44.5 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.44.5.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.5/e2fsprogs-1.44.5.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	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d01bfbeee4d3408e6f9c7d1b9dc6ae7a
+_md5_=95401686535a666d7ef88ab43b6342e7
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.8 b/metadata/md5-cache/sys-fs/fuse-2.9.8
index c52733d45be9..17aeff508911 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.8
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=6
 HOMEPAGE=https://github.com/libfuse/libfuse
 IUSE=examples kernel_linux kernel_FreeBSD static-libs kernel_linux
-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
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=sys-fs/fuse-common
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=8d4c7484b3f07477ec288158d1e5d6eb
+_md5_=b43ebb924216d40debb0f0c8ff94bd04
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 11f2b038be30..d81732636348 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.6
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/
 DESCRIPTION=Common files for multiple slots of sys-fs/fuse
 EAPI=6
 HOMEPAGE=https://github.com/libfuse/libfuse
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.6/fuse-3.2.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cec9640770b1e7205154f8d1e7db1f1
+_md5_=ebd559c3cc72f46e699cf47a1dfeb0aa
diff --git a/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1 b/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
index c773d21234f0..12760780af6c 100644
--- a/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
+++ b/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:* ) crypt? ( dev-libs/openssl:0= ) lzo? ( dev-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/lessfs/lessfs/lessfs-1.7.0/lessfs-1.7.0.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=183ca41132413e1de56f5918619bd871
+_md5_=7c29bac4c4a3d7cc01364e5dadaad422
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index 00bce861befd..fc2c4d6dfe8b 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f17be813122ebd8c7c08193ae0dcfdc5
+_md5_=6eea47095a9ad21cbe4bb47772b56341
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index 921946b5f6ad..904db9f4cd73 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -12,4 +12,4 @@ 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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f09fed9291bf4fd82dd351d9423d2ed2
+_md5_=201c5d4a368afcb2f2077f0e27f64436
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index d95fcd3dc956..89d6dd68b811 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1fe9ac47b1fd7965e1dcbabb3b6ea025
+_md5_=c96d26bd85614bb07812c4efbfce24a3
diff --git a/metadata/md5-cache/sys-fs/udev-240-r2 b/metadata/md5-cache/sys-fs/udev-240-r2
index a71809e1fb58..9b49253b1ce5 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r2
+++ b/metadata/md5-cache/sys-fs/udev-240-r2
@@ -12,4 +12,4 @@ 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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9028353dce435ceb5e371ab291f59d10
+_md5_=e5731b746f2a3b1b47cddbcecb7bd3f2
diff --git a/metadata/md5-cache/sys-fs/udev-240-r3 b/metadata/md5-cache/sys-fs/udev-240-r3
index 5fbfad2c57a6..693b879be3c1 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r3
+++ b/metadata/md5-cache/sys-fs/udev-240-r3
@@ -12,4 +12,4 @@ 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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=16e90b6690ed589836470c9e5307f33b
+_md5_=2f52045509fd6779fe7919e381c091d0
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc1 b/metadata/md5-cache/sys-fs/udev-241_rc1
new file mode 100644
index 000000000000..55a9f124aa8d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-241_rc1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf >=dev-util/intltool-0.50 >=dev-util/meson-0.40.0 dev-util/ninja >=sys-apps/coreutils-8.16 virtual/os-headers virtual/pkgconfig >=sys-kernel/linux-headers-3.9 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
+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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc2 b/metadata/md5-cache/sys-fs/udev-241_rc2
new file mode 100644
index 000000000000..2d9b879846a9
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-241_rc2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd dev-util/gperf >=dev-util/intltool-0.50 >=dev-util/meson-0.40.0 dev-util/ninja >=sys-apps/coreutils-8.16 virtual/os-headers virtual/pkgconfig >=sys-kernel/linux-headers-3.9 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
+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	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index da224cc4af3a..7180c42e352f 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a5e6b0eb4faf2f8d9acc6f1756a359a8
+_md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 2c99836eeb67..b5469e9537eb 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/dracut-049-r1 b/metadata/md5-cache/sys-kernel/dracut-049-r1
new file mode 100644
index 000000000000..a6beae6c2776
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-049-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=>=sys-apps/kmod-23
+DESCRIPTION=Generic initramfs generation tool
+EAPI=7
+HOMEPAGE=https://dracut.wiki.kernel.org
+IUSE=selinux kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/dracutdevs/dracut/archive/049.tar.gz -> dracut-049.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fb9375991ac2adf596f98b8ad43ccece
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 9eba19394f06..cbad9a1bc1ed 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,4 +10,4 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=46f5422ca776a9f8d31a0423d02b8d42
+_md5_=24281344e798c994dc5b556872706586
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.96 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.96
new file mode 100644
index 000000000000..ec126fc4553d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.96
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( 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.96
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1ffb26d84d4fd66fce93e5deef27f431
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.97 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.97
new file mode 100644
index 000000000000..f36e2eb2a6fc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.97
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( 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.97
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bf2185698c6751429ae146807867ef96
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.18
new file mode 100644
index 000000000000..54127a7a9d3c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.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 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 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.19.18
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5637d03b85f8ecd7a586223116f774e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.19
new file mode 100644
index 000000000000..302384d4152d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.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 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 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.19.19
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a7decb05e9f5f079b58f75de14897957
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.5
new file mode 100644
index 000000000000..24c0890c95c5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.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 4.20 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.20.5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ffe00c75b7caf47ec211adce6bcedde1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.6
new file mode 100644
index 000000000000..ac26eec7ca72
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.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 4.20 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.20.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz 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_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=601ff7c23e8ffe7fd235dcf65a56cb59
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.172 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.172
new file mode 100644
index 000000000000..e276b979fed8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.172
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( 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.172
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-173.base.tar.xz mirror://gentoo/genpatches-4.4-173.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-173.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=459b488b1da7d6cb3fefbd1f255ec248
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.153 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.153
new file mode 100644
index 000000000000..8f2f90df268c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.153
@@ -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.153
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-156.base.tar.xz mirror://gentoo/genpatches-4.9-156.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-156.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fd2976c51dfdfac5d9fbd95f4d498f4c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.154 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.154
new file mode 100644
index 000000000000..0ee41d91e89d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.154
@@ -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.154
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-157.base.tar.xz mirror://gentoo/genpatches-4.9-157.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-157.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4e8b2819a3b2beeb241a323d4cc0329d
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.0_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.0_rc4
new file mode 100644
index 000000000000..9d2c48615ebf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.0_rc4
@@ -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 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=5.0_rc4
+SRC_URI=https://git.kernel.org/torvalds/p/v5.0-rc4/v4.20 -> patch-5.0-rc4.patch mirror://kernel/linux/kernel/v5.x/linux-4.20.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=22e86ad51190b32656b78cd52b4fff7e
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 bb24296f5ea2..acc06c2ad685 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-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=!!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	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1b8cb4a799d13c8eb187ef743142d133
+_md5_=303bb5894235370b68ed79c0a55f05ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.94 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.94
deleted file mode 100644
index be8674344579..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.94
+++ /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.14.94
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.94.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.96 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.96
new file mode 100644
index 000000000000..444feb228a7b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.96
@@ -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.14.96
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.96.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.17
deleted file mode 100644
index bdcc97e0d9c0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.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 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.19.17
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.17.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.18
new file mode 100644
index 000000000000..d32ac3d853fe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.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 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.19.18
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.4
deleted file mode 100644
index 5be4eb321a50..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.4
+++ /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.20.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.20.4.xz mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.5 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.5
new file mode 100644
index 000000000000..57324f255e9b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.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 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.20.5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.20.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.171 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.171
deleted file mode 100644
index 49afbf084c4b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.171
+++ /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.4.171
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.171.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.172 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.172
new file mode 100644
index 000000000000..b4c735b1dbd7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.172
@@ -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.4.172
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.172.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.151 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.151
deleted file mode 100644
index 3edce9b94f7d..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.151
+++ /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.151
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.151.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.153 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.153
new file mode 100644
index 000000000000..438133b2af40
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.153
@@ -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.153
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.153.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 7ffe70e2b62c..55bc324b91be 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/db-18.1.25 b/metadata/md5-cache/sys-libs/db-18.1.25
new file mode 100644
index 000000000000..bf7bc50beb09
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/db-18.1.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
+IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=AGPL-3
+RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=test? ( tcl )
+SLOT=18.1
+SRC_URI=https://download.oracle.com/otn/berkeley-db/db-18.1.25.tar.gz mirror://gentoo/db-18.1.25.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7c27ef0e653f39f28189f2e831e11063
diff --git a/metadata/md5-cache/sys-libs/db-6.1.29 b/metadata/md5-cache/sys-libs/db-6.1.29
deleted file mode 100644
index c71677dce2eb..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.1.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=test? ( tcl )
-SLOT=6.1
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.29.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ee148ca6e20a0f365e6103e08fec9aa
diff --git a/metadata/md5-cache/sys-libs/db-6.1.36 b/metadata/md5-cache/sys-libs/db-6.1.36
new file mode 100644
index 000000000000..bade2c495560
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/db-6.1.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
+IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=AGPL-3
+RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=test? ( tcl )
+SLOT=6.1
+SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.36.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=a4e362a8b457370a34a02a3dbbea3feb
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23 b/metadata/md5-cache/sys-libs/db-6.2.23
deleted file mode 100644
index 559eae14320d..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.2.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=test? ( tcl )
-SLOT=6.2
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=75ba9b56faef0cbb551c8c6db2b6fcbf
diff --git a/metadata/md5-cache/sys-libs/db-6.2.23-r1 b/metadata/md5-cache/sys-libs/db-6.2.23-r1
deleted file mode 100644
index 946e74965891..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.2.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=test? ( tcl )
-SLOT=6.2
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.23.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=759751774e3e4817e694975ebadad9c0
diff --git a/metadata/md5-cache/sys-libs/db-6.2.32 b/metadata/md5-cache/sys-libs/db-6.2.32
deleted file mode 100644
index 6296afe6e106..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.2.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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=Oracle Berkeley DB
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=test? ( tcl )
-SLOT=6.2
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db	95648c4206d867f20f80219c283da12a	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7ecb6b78626afa3b0605d5f9dc2ca710
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5
index a6681dff02dc..c9ceb0e1b9ea 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.44.5
@@ -4,10 +4,10 @@ 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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.44.5.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.44.5/e2fsprogs-1.44.5.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4c838dbb0ea2b360793df3162d7ddc6d
+_md5_=55fc5a95601829ac2912b25d1012776d
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.1 b/metadata/md5-cache/sys-libs/freeipmi-1.6.1
deleted file mode 100644
index 2d6d3f8e36d0..000000000000
--- a/metadata/md5-cache/sys-libs/freeipmi-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=dev-libs/libgcrypt:0 virtual/os-headers
-DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/freeipmi/
-IUSE=debug nagios
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
-SLOT=0
-SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5193037d18c0a8c08c61e31799f4efe1
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.3 b/metadata/md5-cache/sys-libs/freeipmi-1.6.3
new file mode 100644
index 000000000000..ccbcf54e919a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install test
+DEPEND=dev-libs/libgcrypt:0= virtual/os-headers
+DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/freeipmi/
+IUSE=debug nagios
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
+SLOT=0
+SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.3.tar.gz
+_md5_=2dbbc2eaf4af8fb7125f950427b92606
diff --git a/metadata/md5-cache/sys-libs/glibc-2.21-r2 b/metadata/md5-cache/sys-libs/glibc-2.21-r2
index 5d9252342385..de4fecac1fa8 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.21-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.21-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.21-patches-7.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c2150cc01fad9ba36da4d56861f08049
diff --git a/metadata/md5-cache/sys-libs/glibc-2.22-r4 b/metadata/md5-cache/sys-libs/glibc-2.22-r4
index 9a3707e397c8..80d30b7f471e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.22-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.22-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.22-patches-13.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=314f44bd56dcafe6b5891c7f4c3a4094
diff --git a/metadata/md5-cache/sys-libs/glibc-2.23-r4 b/metadata/md5-cache/sys-libs/glibc-2.23-r4
index 56ce5e0352c7..5976de65d2a2 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.23-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.23-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.23-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9b3a334bbd3d6992795cf1c883a5767c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4
index 40e4d1e12e77..904db006898d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.24-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.24-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=36c80b1f5798debe5a5cb207889f0888
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index 7f051c58617e..640ca84a06ec 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d79e920063ca7e9c46ac4d783fe0ddb3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r7 b/metadata/md5-cache/sys-libs/glibc-2.26-r7
index 3f6f44c3b2d6..9e3eddeefa46 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r7
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	345562ab0c975808685b2d4d85707f60	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	toolchain-glibc	f1f3f049bc82f3378a2af4d7f0377c3a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ca59658c30ddbe09096012b12c17b7be
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.2 b/metadata/md5-cache/sys-libs/ldb-1.4.2
deleted file mode 100644
index 6b5e33f34bd1..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3
-RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0/1.4.2
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=7ca8e45f324f4883a3d0740774076853
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.4 b/metadata/md5-cache/sys-libs/ldb-1.4.4
new file mode 100644
index 000000000000..ddf65ecef8f1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-1.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=An LDAP-like embedded database
+EAPI=6
+HOMEPAGE=https://ldb.samba.org
+IUSE=doc +ldap +lmdb +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0/1.4.4
+SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=5a77788269ae8bbec4e1d08bd4a880ea
diff --git a/metadata/md5-cache/sys-libs/ldb-1.5.1 b/metadata/md5-cache/sys-libs/ldb-1.5.1
deleted file mode 100644
index 09f78c86fe60..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3
-RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0/1.5.1
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=ec3154387b84d834752811bc6c3bd69a
diff --git a/metadata/md5-cache/sys-libs/ldb-1.5.2 b/metadata/md5-cache/sys-libs/ldb-1.5.2
index 3b5f0618c92d..5cce98acbb44 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.5.2
+++ b/metadata/md5-cache/sys-libs/ldb-1.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc +ldap +lmdb +python python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-3
-RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.17[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.38[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0/1.5.2
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=5c185b98b683e004af638e035b770db5
+_md5_=9947d85345d08d0aea88b714013f4f88
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.20 b/metadata/md5-cache/sys-libs/libblockdev-2.20
index 7d237ff3e7c6..4a2c6f6315bc 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.20
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.20
@@ -5,11 +5,11 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 IUSE=bcache +cryptsetup dmraid doc escrow lvm kbd test vdo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,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_4 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_4? ( python_targets_python3_4 ) 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 ) escrow? ( cryptsetup )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/archive/2.20-1.tar.gz -> libblockdev-2.20-1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5ce2df23f611e84f19b8775bc1f33a48
+_md5_=6af6e06537ce3fc7ae749aa4c9b3ef41
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.2.1-r3 b/metadata/md5-cache/sys-libs/libunwind-1.2.1-r3
new file mode 100644
index 000000000000..c405902fd197
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libunwind-1.2.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libatomic? ( dev-libs/libatomic_ops[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-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=Portable and efficient API to determine the call-chain of a program
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
+IUSE=debug debug-frame doc libatomic lzma +static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://nongnu/libunwind/libunwind-1.2.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6bbdebaf47ffbdee505a627c4d7c01fa
diff --git a/metadata/md5-cache/sys-libs/lwp-2.8 b/metadata/md5-cache/sys-libs/lwp-2.8
index 938b256c866e..7824b2d9c6f0 100644
--- a/metadata/md5-cache/sys-libs/lwp-2.8
+++ b/metadata/md5-cache/sys-libs/lwp-2.8
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Light-weight process library (used by Coda)
 EAPI=6
 HOMEPAGE=http://www.coda.cs.cmu.edu/
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=1
 SRC_URI=http://www.coda.cs.cmu.edu/pub/lwp/src/lwp-2.8.tar.xz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=53dd9c2150408079d0a93d478761cbed
+_md5_=ace400d74ba32be87340306593193ad7
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.19 b/metadata/md5-cache/sys-libs/musl-1.1.19
deleted file mode 100644
index 646babf6a136..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
-EAPI=6
-HOMEPAGE=http://www.musl-libc.org/
-IUSE=headers-only
-KEYWORDS=-* amd64 arm arm64 ~mips ppc x86
-LICENSE=MIT LGPL-2 GPL-2
-SLOT=0
-SRC_URI=http://www.musl-libc.org/releases/musl-1.1.19.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9248f3b6b94d5bf4e80066bf613cadd0
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.20 b/metadata/md5-cache/sys-libs/musl-1.1.20
deleted file mode 100644
index d52c7a319538..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
-EAPI=6
-HOMEPAGE=http://www.musl-libc.org/
-IUSE=headers-only
-KEYWORDS=-* amd64 ~arm ~arm64 ~mips ~ppc x86
-LICENSE=MIT LGPL-2 GPL-2
-SLOT=0
-SRC_URI=http://www.musl-libc.org/releases/musl-1.1.20.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b17d15033ec9edecf559fd77aed19cb
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.21 b/metadata/md5-cache/sys-libs/musl-1.1.21
new file mode 100644
index 000000000000..f3ee617079c4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/musl-1.1.21
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst setup
+DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
+EAPI=6
+HOMEPAGE=http://www.musl-libc.org/
+IUSE=headers-only
+KEYWORDS=-* amd64 ~arm ~arm64 ~mips ~ppc x86
+LICENSE=MIT LGPL-2 GPL-2
+SLOT=0
+SRC_URI=http://www.musl-libc.org/releases/musl-1.1.21.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b85dcfbfc52e15d2daeb369f5d64350
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index a73404aff6e5..0796046994b3 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -8,4 +8,4 @@ LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edc1503a7bdbd37d866bab4075a0299e
+_md5_=eace87bc3b8caab1eb0fcb6e00c467bd
diff --git a/metadata/md5-cache/sys-libs/readline-7.0_p5 b/metadata/md5-cache/sys-libs/readline-7.0_p5
index a576863cb20a..4e049e877fac 100644
--- a/metadata/md5-cache/sys-libs/readline-7.0_p5
+++ b/metadata/md5-cache/sys-libs/readline-7.0_p5
@@ -4,10 +4,10 @@ DESCRIPTION=Another cute console display library
 EAPI=6
 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/7
 SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-004 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-005 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-004 mirror://gnu/readline/readline-7.0-patches/readline70-005
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4f8f292b1dd506e912c9f21fff9b663
+_md5_=1dd59f1d265b6bdb9079a2e0842de711
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.15 b/metadata/md5-cache/sys-libs/talloc-2.1.15
index bdd693553243..7966e7e098c5 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.15
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.15
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.15.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=c469ae4d7c974352586eba99189e69d2
+_md5_=62fe4001c4206bb9598d01d6a4ff5539
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 7e6e743a8ce7..73c49e1d4499 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/audit-2.8.4 b/metadata/md5-cache/sys-process/audit-2.8.4
index 59e728dff4cf..e49b40f15e95 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.4
+++ b/metadata/md5-cache/sys-process/audit-2.8.4
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
-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+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-2.8.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2f286ba2d8b06cabc1f5e6732d2a6464
+_md5_=87786228857e0ff8ea07e602445ed46e
diff --git a/metadata/md5-cache/sys-process/supervise-scripts-4.0-r1 b/metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
new file mode 100644
index 000000000000..0d0ce6f4aa9f
--- /dev/null
+++ b/metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/daemontools
+DESCRIPTION=Starting and stopping daemontools managed services
+EAPI=7
+HOMEPAGE=http://untroubled.org/supervise-scripts/
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/daemontools
+SLOT=0
+SRC_URI=http://untroubled.org/supervise-scripts/archive/supervise-scripts-4.0.tar.gz
+_md5_=e22af581cee0ee7823b506a82f72c6bf
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 49f4afde39cc..c078f44456ad 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r4 b/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r4
index 94b6c4eb6004..472c11194830 100644
--- a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r4
+++ b/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r4
@@ -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.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_=c2fc3474ad2cdec337eb07da727dd822
+_md5_=ed34aff6692cdaab1ef7b48372c76020
diff --git a/metadata/md5-cache/virtual/python-futures-1 b/metadata/md5-cache/virtual/python-futures-1
new file mode 100644
index 000000000000..e0243cc41bda
--- /dev/null
+++ b/metadata/md5-cache/virtual/python-futures-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for the Python concurrent.futures module
+EAPI=7
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/futures[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/futures[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fd9fe5eabd187031341313b098f2c81a
diff --git a/metadata/md5-cache/virtual/python-greenlet-1.0 b/metadata/md5-cache/virtual/python-greenlet-1.0
index 951cecb47a3f..ee75b7a3a205 100644
--- a/metadata/md5-cache/virtual/python-greenlet-1.0
+++ b/metadata/md5-cache/virtual/python-greenlet-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python greenlet module
 EAPI=6
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 arm arm64 -hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 -hppa ~mips ppc ppc64 s390 x86
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=81d88fb65d05332df9c5290b6b92e831
+_md5_=45f3f184e20f491c5c2e7f979d53cc5e
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 1f388ae8131e..9987da93793f 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/libapreq2-2.13-r1 b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
index 444040baf3e4..cad7294bf545 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.13-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.13.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30bf1d6ae5e8d435290aafc0b7cffaaf
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.10.10 b/metadata/md5-cache/www-apache/mod_h2-1.10.10
deleted file mode 100644
index c5574955f572..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-1.10.10
+++ /dev/null
@@ -1,13 +0,0 @@
-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*
-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.10.10/mod_http2-1.10.10.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de
-_md5_=a3ece310a2dcd91523e4c4cd93aed8e0
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.11.3 b/metadata/md5-cache/www-apache/mod_h2-1.11.3
deleted file mode 100644
index 638230c41ca6..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-1.11.3
+++ /dev/null
@@ -1,13 +0,0 @@
-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.11.3/mod_http2-1.11.3.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d83bf078b99365887f6cfaed0ad86ca9
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.11.4 b/metadata/md5-cache/www-apache/mod_h2-1.11.4
deleted file mode 100644
index 2661041550ae..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-1.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-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.11.4/mod_http2-1.11.4.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d83bf078b99365887f6cfaed0ad86ca9
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.12.0 b/metadata/md5-cache/www-apache/mod_h2-1.12.0
deleted file mode 100644
index 82c0ac5fffff..000000000000
--- a/metadata/md5-cache/www-apache/mod_h2-1.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.12.0/mod_http2-1.12.0.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.12.2 b/metadata/md5-cache/www-apache/mod_h2-1.12.2
new file mode 100644
index 000000000000..2cd75f1620db
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.12.2
@@ -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.12.2/mod_http2-1.12.2.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.10 b/metadata/md5-cache/www-apache/mod_perl-2.0.10
index 527c6948f8c1..f0d895ea6090 100644
--- a/metadata/md5-cache/www-apache/mod_perl-2.0.10
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -10,5 +10,5 @@ PDEPEND=>=dev-perl/Apache-Reload-0.130.0 >=dev-perl/Apache-SizeLimit-0.970.0
 RDEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.400.0 >=www-servers/apache-2.0.47 >=dev-libs/apr-util-1.4 !ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=1
 SRC_URI=mirror://apache/perl/mod_perl-2.0.10.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a10cf207f8509b3c3c768fbeed1d2edc
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.12 b/metadata/md5-cache/www-apache/mod_qos-11.12
deleted file mode 100644
index cc57da673b39..000000000000
--- a/metadata/md5-cache/www-apache/mod_qos-11.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND==www-servers/apache-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
-DESCRIPTION=A QOS module for the apache webserver
-EAPI=5
-HOMEPAGE=http://mod-qos.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre dev-libs/openssl:0 media-libs/libpng:0= sys-libs/zlib =www-servers/apache-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.12.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1ebaeb5e3331309a94114bc9833c9594
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.61 b/metadata/md5-cache/www-apache/mod_qos-11.61
new file mode 100644
index 000000000000..f79a1d230d72
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_qos-11.61
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND==www-servers/apache-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
+DESCRIPTION=A QOS module for the apache webserver
+EAPI=5
+HOMEPAGE=http://mod-qos.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
+SLOT=0
+SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.61.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=92418ea9644a530a3ac886e799bb770f
diff --git a/metadata/md5-cache/www-apache/passenger-5.3.2 b/metadata/md5-cache/www-apache/passenger-5.3.2
deleted file mode 100644
index d627be60cd1c..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.3.2.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b10632f4263a70f30b449ad389aa87bd
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.0 b/metadata/md5-cache/www-apache/passenger-6.0.0
deleted file mode 100644
index 2b8567f1d28e..000000000000
--- a/metadata/md5-cache/www-apache/passenger-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.0.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	99ea75c9f08fd38989951c554dfa56ea	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5420563f6bc0de2495cd263576915b11
diff --git a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1 b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
index dabf924805ce..eab1b32a3c33 100644
--- a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
+++ b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://apachegallery.dk/download/Apache-Gallery-1.0RC3.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
 _md5_=103a76f4e76ab5ab94953f578b8acbe6
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d04490f77de2..91c8032459f8 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/cgp-1_p20180620-r1 b/metadata/md5-cache/www-apps/cgp-1_p20180620-r1
deleted file mode 100644
index 7bb35b9f7ca7..000000000000
--- a/metadata/md5-cache/www-apps/cgp-1_p20180620-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A graphical web-based front-end for visualizing RRD collected by collectd
-EAPI=7
-HOMEPAGE=https://github.com/pommi/CGP
-IUSE=vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-2.0 GPL-2+ GPL-3 MIT
-RDEPEND=dev-lang/php[json] net-analyzer/rrdtool[graph] virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=1_p20180620-r1
-SRC_URI=https://github.com/pommi/CGP/archive/1920ca24a067ac157a6bd8f3c017f4c6244ae245.tar.gz -> cgp-1_p20180620.tar.gz
-_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=61e522bdb9e59f17295659c7e0f36b57
diff --git a/metadata/md5-cache/www-apps/cgp-1_p20181209 b/metadata/md5-cache/www-apps/cgp-1_p20181209
new file mode 100644
index 000000000000..187df302762c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/cgp-1_p20181209
@@ -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=A graphical web-based front-end for visualizing RRD collected by collectd
+EAPI=6
+HOMEPAGE=https://github.com/pommi/CGP
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-2.0 GPL-2+ GPL-3 MIT
+RDEPEND=dev-lang/php[json] net-analyzer/rrdtool[graph] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=1_p20181209
+SRC_URI=https://github.com/pommi/CGP/archive/72acfcbffd51da1e77a56517618da68252485ed6.tar.gz -> cgp-1_p20181209.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=1f63e5c8d84b801b1b0eb7b8e2cc1f85
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20170111 b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
index 18269fa43f5e..75adb97d0ec0 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20170111
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
@@ -9,5 +9,5 @@ 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.20170111.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5900076182bfc66a8a1276c1eff19677
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20171001 b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
index ddeab8ba8774..002f68591969 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20171001
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
@@ -9,5 +9,5 @@ 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.20171001.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d29b71778eb90d89b012402c1e1cfd65
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 2e106aced478..60e4ec5cecfc 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/firefox-60.5.0 b/metadata/md5-cache/www-client/firefox-60.5.0
new file mode 100644
index 000000000000..7038c28ce9f0
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-60.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.4 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( dev-lang/python: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-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils clang? ( >=sys-devel/llvm-4.0.1[gold] >=sys-devel/lld-4.0.1 ) pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( virtual/cargo virtual/rust ) elibc_musl? ( virtual/cargo virtual/rust ) >=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= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0: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 ) ) >=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
+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 ~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.4 >=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= ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0: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.5.0esr/linux-i686/xpi/ach.xpi -> firefox-60.5.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/af.xpi -> firefox-60.5.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/an.xpi -> firefox-60.5.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ar.xpi -> firefox-60.5.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/as.xpi -> firefox-60.5.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ast.xpi -> firefox-60.5.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/az.xpi -> firefox-60.5.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bg.xpi -> firefox-60.5.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.5.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.5.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/br.xpi -> firefox-60.5.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/bs.xpi -> firefox-60.5.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ca.xpi -> firefox-60.5.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cak.xpi -> firefox-60.5.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cs.xpi -> firefox-60.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/cy.xpi -> firefox-60.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/da.xpi -> firefox-60.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/de.xpi -> firefox-60.5.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/dsb.xpi -> firefox-60.5.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/el.xpi -> firefox-60.5.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.5.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.5.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/eo.xpi -> firefox-60.5.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.5.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.5.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.5.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.5.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/et.xpi -> firefox-60.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/eu.xpi -> firefox-60.5.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fa.xpi -> firefox-60.5.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ff.xpi -> firefox-60.5.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fi.xpi -> firefox-60.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fr.xpi -> firefox-60.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gd.xpi -> firefox-60.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gl.xpi -> firefox-60.5.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gn.xpi -> firefox-60.5.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.5.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/he.xpi -> firefox-60.5.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.5.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hr.xpi -> firefox-60.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hu.xpi -> firefox-60.5.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.5.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/id.xpi -> firefox-60.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/is.xpi -> firefox-60.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/it.xpi -> firefox-60.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ja.xpi -> firefox-60.5.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ka.xpi -> firefox-60.5.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kab.xpi -> firefox-60.5.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kk.xpi -> firefox-60.5.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/km.xpi -> firefox-60.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/kn.xpi -> firefox-60.5.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ko.xpi -> firefox-60.5.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lij.xpi -> firefox-60.5.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lt.xpi -> firefox-60.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/lv.xpi -> firefox-60.5.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mai.xpi -> firefox-60.5.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mk.xpi -> firefox-60.5.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ml.xpi -> firefox-60.5.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/mr.xpi -> firefox-60.5.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ms.xpi -> firefox-60.5.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.5.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nl.xpi -> firefox-60.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.5.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/or.xpi -> firefox-60.5.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pl.xpi -> firefox-60.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/rm.xpi -> firefox-60.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ro.xpi -> firefox-60.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ru.xpi -> firefox-60.5.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/si.xpi -> firefox-60.5.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sk.xpi -> firefox-60.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sl.xpi -> firefox-60.5.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/son.xpi -> firefox-60.5.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sq.xpi -> firefox-60.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sr.xpi -> firefox-60.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.5.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/ta.xpi -> firefox-60.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/te.xpi -> firefox-60.5.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/th.xpi -> firefox-60.5.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/tr.xpi -> firefox-60.5.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/uk.xpi -> firefox-60.5.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/uz.xpi -> firefox-60.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/vi.xpi -> firefox-60.5.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/xh.xpi -> firefox-60.5.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.5.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.5.0esr/source/firefox-60.5.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.5-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.5-patches-01.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozconfig-v6.60	b0c9597a272886ddb9681889887b2322	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ff1e75d0b1bb93373a0042f40ab218dc
diff --git a/metadata/md5-cache/www-client/firefox-65.0 b/metadata/md5-cache/www-client/firefox-65.0
new file mode 100644
index 000000000000..414010e2224e
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-65.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.41 >=dev-libs/nspr-4.19 >=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/gtk+-3.4.0:3 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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.25.3:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.1: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.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 clang? ( >=sys-devel/llvm-4.0.1[gold] >=sys-devel/lld-4.0.1 ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.30.0 >=virtual/rust-1.30.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 ) >=sys-apps/sed-4 virtual/pkgconfig || ( 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 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +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.41 >=dev-libs/nspr-4.19 >=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/gtk+-3.4.0:3 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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) system-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.25.3:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.1: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/65.0/linux-i686/xpi/ach.xpi -> firefox-65.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/af.xpi -> firefox-65.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/an.xpi -> firefox-65.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ar.xpi -> firefox-65.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/as.xpi -> firefox-65.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ast.xpi -> firefox-65.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/az.xpi -> firefox-65.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/bg.xpi -> firefox-65.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/bn-BD.xpi -> firefox-65.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/bn-IN.xpi -> firefox-65.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/br.xpi -> firefox-65.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/bs.xpi -> firefox-65.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ca.xpi -> firefox-65.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/cak.xpi -> firefox-65.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/cs.xpi -> firefox-65.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/cy.xpi -> firefox-65.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/da.xpi -> firefox-65.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/de.xpi -> firefox-65.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/dsb.xpi -> firefox-65.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/el.xpi -> firefox-65.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/en-GB.xpi -> firefox-65.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/en-ZA.xpi -> firefox-65.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/eo.xpi -> firefox-65.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/es-AR.xpi -> firefox-65.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/es-CL.xpi -> firefox-65.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/es-ES.xpi -> firefox-65.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/es-MX.xpi -> firefox-65.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/et.xpi -> firefox-65.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/eu.xpi -> firefox-65.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/fa.xpi -> firefox-65.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ff.xpi -> firefox-65.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/fi.xpi -> firefox-65.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/fr.xpi -> firefox-65.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/fy-NL.xpi -> firefox-65.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ga-IE.xpi -> firefox-65.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/gd.xpi -> firefox-65.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/gl.xpi -> firefox-65.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/gn.xpi -> firefox-65.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/gu-IN.xpi -> firefox-65.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/he.xpi -> firefox-65.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/hi-IN.xpi -> firefox-65.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/hr.xpi -> firefox-65.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/hsb.xpi -> firefox-65.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/hu.xpi -> firefox-65.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/hy-AM.xpi -> firefox-65.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/id.xpi -> firefox-65.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/is.xpi -> firefox-65.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/it.xpi -> firefox-65.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ja.xpi -> firefox-65.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ka.xpi -> firefox-65.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/kab.xpi -> firefox-65.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/kk.xpi -> firefox-65.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/km.xpi -> firefox-65.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/kn.xpi -> firefox-65.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ko.xpi -> firefox-65.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/lij.xpi -> firefox-65.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/lt.xpi -> firefox-65.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/lv.xpi -> firefox-65.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/mai.xpi -> firefox-65.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/mk.xpi -> firefox-65.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ml.xpi -> firefox-65.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/mr.xpi -> firefox-65.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ms.xpi -> firefox-65.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/nb-NO.xpi -> firefox-65.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/nl.xpi -> firefox-65.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/nn-NO.xpi -> firefox-65.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/or.xpi -> firefox-65.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/pa-IN.xpi -> firefox-65.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/pl.xpi -> firefox-65.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/pt-BR.xpi -> firefox-65.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/pt-PT.xpi -> firefox-65.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/rm.xpi -> firefox-65.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ro.xpi -> firefox-65.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ru.xpi -> firefox-65.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/si.xpi -> firefox-65.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/sk.xpi -> firefox-65.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/sl.xpi -> firefox-65.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/son.xpi -> firefox-65.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/sq.xpi -> firefox-65.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/sr.xpi -> firefox-65.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/sv-SE.xpi -> firefox-65.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/ta.xpi -> firefox-65.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/te.xpi -> firefox-65.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/th.xpi -> firefox-65.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/tr.xpi -> firefox-65.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/uk.xpi -> firefox-65.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/uz.xpi -> firefox-65.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/vi.xpi -> firefox-65.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/xh.xpi -> firefox-65.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/zh-CN.xpi -> firefox-65.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xpi/zh-TW.xpi -> firefox-65.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/65.0/source/firefox-65.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-65.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-65.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-65.0-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-65.0-patches-01.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5ece25bb04c11a214978e86640551e7b
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.5.0 b/metadata/md5-cache/www-client/firefox-bin-60.5.0
new file mode 100644
index 000000000000..217741002184
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-60.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ach.xpi -> firefox-60.5.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/af.xpi -> firefox-60.5.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/an.xpi -> firefox-60.5.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ar.xpi -> firefox-60.5.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/as.xpi -> firefox-60.5.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ast.xpi -> firefox-60.5.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/az.xpi -> firefox-60.5.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/bg.xpi -> firefox-60.5.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.5.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.5.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/br.xpi -> firefox-60.5.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/bs.xpi -> firefox-60.5.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ca.xpi -> firefox-60.5.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/cs.xpi -> firefox-60.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/cy.xpi -> firefox-60.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/da.xpi -> firefox-60.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/de.xpi -> firefox-60.5.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/el.xpi -> firefox-60.5.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/en-GB.xpi -> firefox-60.5.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.5.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/eo.xpi -> firefox-60.5.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/es-AR.xpi -> firefox-60.5.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/es-CL.xpi -> firefox-60.5.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/es-ES.xpi -> firefox-60.5.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/es-MX.xpi -> firefox-60.5.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/et.xpi -> firefox-60.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/eu.xpi -> firefox-60.5.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/fa.xpi -> firefox-60.5.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/fi.xpi -> firefox-60.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/fr.xpi -> firefox-60.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/gd.xpi -> firefox-60.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/gl.xpi -> firefox-60.5.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.5.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/he.xpi -> firefox-60.5.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.5.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/hr.xpi -> firefox-60.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/hsb.xpi -> firefox-60.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/hu.xpi -> firefox-60.5.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.5.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/id.xpi -> firefox-60.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/is.xpi -> firefox-60.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/it.xpi -> firefox-60.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ja.xpi -> firefox-60.5.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/kk.xpi -> firefox-60.5.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/km.xpi -> firefox-60.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/kn.xpi -> firefox-60.5.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ko.xpi -> firefox-60.5.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/lt.xpi -> firefox-60.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/lv.xpi -> firefox-60.5.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/mai.xpi -> firefox-60.5.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/mk.xpi -> firefox-60.5.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ml.xpi -> firefox-60.5.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/mr.xpi -> firefox-60.5.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ms.xpi -> firefox-60.5.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.5.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/nl.xpi -> firefox-60.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.5.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/or.xpi -> firefox-60.5.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/pl.xpi -> firefox-60.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/rm.xpi -> firefox-60.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ro.xpi -> firefox-60.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ru.xpi -> firefox-60.5.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/si.xpi -> firefox-60.5.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/sk.xpi -> firefox-60.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/sl.xpi -> firefox-60.5.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/son.xpi -> firefox-60.5.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/sq.xpi -> firefox-60.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/sr.xpi -> firefox-60.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.5.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/ta.xpi -> firefox-60.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/te.xpi -> firefox-60.5.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/th.xpi -> firefox-60.5.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/tr.xpi -> firefox-60.5.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/uk.xpi -> firefox-60.5.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/uz.xpi -> firefox-60.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/vi.xpi -> firefox-60.5.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/xh.xpi -> firefox-60.5.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.5.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.5.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.5.0esr/linux-x86_64/en-US/firefox-60.5.0esr.tar.bz2 -> firefox-bin_x86_64-60.5.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.5.0esr/linux-i686/en-US/firefox-60.5.0esr.tar.bz2 -> firefox-bin_i686-60.5.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e7c46f1f3d7af036cb9f28bdf436398b
diff --git a/metadata/md5-cache/www-client/firefox-bin-65.0 b/metadata/md5-cache/www-client/firefox-bin-65.0
new file mode 100644
index 000000000000..25ba190b3889
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-65.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ach.xpi -> firefox-65.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/af.xpi -> firefox-65.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/an.xpi -> firefox-65.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ar.xpi -> firefox-65.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/as.xpi -> firefox-65.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ast.xpi -> firefox-65.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/az.xpi -> firefox-65.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/bg.xpi -> firefox-65.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/bn-BD.xpi -> firefox-65.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/bn-IN.xpi -> firefox-65.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/br.xpi -> firefox-65.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/bs.xpi -> firefox-65.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ca.xpi -> firefox-65.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/cs.xpi -> firefox-65.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/cy.xpi -> firefox-65.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/da.xpi -> firefox-65.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/de.xpi -> firefox-65.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/el.xpi -> firefox-65.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/en-GB.xpi -> firefox-65.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/en-ZA.xpi -> firefox-65.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/eo.xpi -> firefox-65.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/es-AR.xpi -> firefox-65.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/es-CL.xpi -> firefox-65.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/es-ES.xpi -> firefox-65.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/es-MX.xpi -> firefox-65.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/et.xpi -> firefox-65.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/eu.xpi -> firefox-65.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/fa.xpi -> firefox-65.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/fi.xpi -> firefox-65.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/fr.xpi -> firefox-65.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/fy-NL.xpi -> firefox-65.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ga-IE.xpi -> firefox-65.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/gd.xpi -> firefox-65.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/gl.xpi -> firefox-65.0-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/gu-IN.xpi -> firefox-65.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/he.xpi -> firefox-65.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/hi-IN.xpi -> firefox-65.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/hr.xpi -> firefox-65.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/hsb.xpi -> firefox-65.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/hu.xpi -> firefox-65.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/hy-AM.xpi -> firefox-65.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/id.xpi -> firefox-65.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/is.xpi -> firefox-65.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/it.xpi -> firefox-65.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ja.xpi -> firefox-65.0-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/kk.xpi -> firefox-65.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/km.xpi -> firefox-65.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/kn.xpi -> firefox-65.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ko.xpi -> firefox-65.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/lt.xpi -> firefox-65.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/lv.xpi -> firefox-65.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/mai.xpi -> firefox-65.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/mk.xpi -> firefox-65.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ml.xpi -> firefox-65.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/mr.xpi -> firefox-65.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ms.xpi -> firefox-65.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/nb-NO.xpi -> firefox-65.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/nl.xpi -> firefox-65.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/nn-NO.xpi -> firefox-65.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/or.xpi -> firefox-65.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/pa-IN.xpi -> firefox-65.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/pl.xpi -> firefox-65.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/pt-BR.xpi -> firefox-65.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/pt-PT.xpi -> firefox-65.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/rm.xpi -> firefox-65.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ro.xpi -> firefox-65.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ru.xpi -> firefox-65.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/si.xpi -> firefox-65.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/sk.xpi -> firefox-65.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/sl.xpi -> firefox-65.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/son.xpi -> firefox-65.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/sq.xpi -> firefox-65.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/sr.xpi -> firefox-65.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/sv-SE.xpi -> firefox-65.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/ta.xpi -> firefox-65.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/te.xpi -> firefox-65.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/th.xpi -> firefox-65.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/tr.xpi -> firefox-65.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/uk.xpi -> firefox-65.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/uz.xpi -> firefox-65.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/vi.xpi -> firefox-65.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/xh.xpi -> firefox-65.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/zh-CN.xpi -> firefox-65.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//65.0/linux-i686/xpi/zh-TW.xpi -> firefox-65.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/65.0/linux-x86_64/en-US/firefox-65.0.tar.bz2 -> firefox-bin_x86_64-65.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/65.0/linux-i686/en-US/firefox-65.0.tar.bz2 -> firefox-bin_i686-65.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e863b77a75b7475e385dcba66a6ded33
diff --git a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98 b/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
index 36b9cff4d2a4..04b36af93333 100644
--- a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
+++ b/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_71.0.3578.98-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6104cc386ab4b1682bb66c5962f8dd94
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.64 b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.64
deleted file mode 100644
index b30040ab9044..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.64
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=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_72.0.3626.64-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71 b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71
new file mode 100644
index 000000000000..c7435d64ffa2
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=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_72.0.3626.71-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3673.0 b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3673.0
deleted file mode 100644
index 2cfddc930694..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3673.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=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_73.0.3673.0-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0 b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0
new file mode 100644
index 000000000000..10b6998e0936
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=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_73.0.3679.0-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/links-2.18 b/metadata/md5-cache/www-client/links-2.18
new file mode 100644
index 000000000000..f601ecde9a2f
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) >=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-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=6
+HOMEPAGE=http://links.twibright.com/
+IUSE=bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X 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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.18.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ab38178a0c14c93423abae3e5298a2d1
diff --git a/metadata/md5-cache/www-client/opera-57.0.3098.116 b/metadata/md5-cache/www-client/opera-57.0.3098.116
deleted file mode 100644
index b12be8938a6b..000000000000
--- a/metadata/md5-cache/www-client/opera-57.0.3098.116
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=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-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/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download2.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download3.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download4.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eba038b7c78ffdc2e401b966a6f94363
diff --git a/metadata/md5-cache/www-client/opera-58.0.3135.47 b/metadata/md5-cache/www-client/opera-58.0.3135.47
index 02d4fcf5326c..d4f831fd3406 100644
--- a/metadata/md5-cache/www-client/opera-58.0.3135.47
+++ b/metadata/md5-cache/www-client/opera-58.0.3135.47
@@ -9,5 +9,5 @@ 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/58.0.3135.47/linux/opera-stable_58.0.3135.47_amd64.deb https://download2.operacdn.com/pub/opera/desktop/58.0.3135.47/linux/opera-stable_58.0.3135.47_amd64.deb https://download3.operacdn.com/pub/opera/desktop/58.0.3135.47/linux/opera-stable_58.0.3135.47_amd64.deb https://download4.operacdn.com/pub/opera/desktop/58.0.3135.47/linux/opera-stable_58.0.3135.47_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eba038b7c78ffdc2e401b966a6f94363
diff --git a/metadata/md5-cache/www-client/opera-58.0.3135.53 b/metadata/md5-cache/www-client/opera-58.0.3135.53
new file mode 100644
index 000000000000..1f3cba6cca89
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-58.0.3135.53
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=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-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/58.0.3135.53/linux/opera-stable_58.0.3135.53_amd64.deb https://download2.operacdn.com/pub/opera/desktop/58.0.3135.53/linux/opera-stable_58.0.3135.53_amd64.deb https://download3.operacdn.com/pub/opera/desktop/58.0.3135.53/linux/opera-stable_58.0.3135.53_amd64.deb https://download4.operacdn.com/pub/opera/desktop/58.0.3135.53/linux/opera-stable_58.0.3135.53_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eba038b7c78ffdc2e401b966a6f94363
diff --git a/metadata/md5-cache/www-client/opera-beta-58.0.3135.37 b/metadata/md5-cache/www-client/opera-beta-58.0.3135.37
index 636a0a82cf0c..290b3dc02cc0 100644
--- a/metadata/md5-cache/www-client/opera-beta-58.0.3135.37
+++ b/metadata/md5-cache/www-client/opera-beta-58.0.3135.37
@@ -9,5 +9,5 @@ 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/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download2.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download3.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download4.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-beta-58.0.3135.45 b/metadata/md5-cache/www-client/opera-beta-58.0.3135.45
index a1eb1c1aabd4..b5e6f7feace8 100644
--- a/metadata/md5-cache/www-client/opera-beta-58.0.3135.45
+++ b/metadata/md5-cache/www-client/opera-beta-58.0.3135.45
@@ -9,5 +9,5 @@ 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/58.0.3135.45/linux/opera-beta_58.0.3135.45_amd64.deb https://download2.operacdn.com/pub/opera-beta/58.0.3135.45/linux/opera-beta_58.0.3135.45_amd64.deb https://download3.operacdn.com/pub/opera-beta/58.0.3135.45/linux/opera-beta_58.0.3135.45_amd64.deb https://download4.operacdn.com/pub/opera-beta/58.0.3135.45/linux/opera-beta_58.0.3135.45_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3206.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3206.0
deleted file mode 100644
index fe4ffe28baeb..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-59.0.3206.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=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/59.0.3206.0/linux/opera-developer_59.0.3206.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3206.0/linux/opera-developer_59.0.3206.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3206.0/linux/opera-developer_59.0.3206.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3206.0/linux/opera-developer_59.0.3206.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3209.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3209.0
index bf72a7aa0905..0ba7231bcf8d 100644
--- a/metadata/md5-cache/www-client/opera-developer-59.0.3209.0
+++ b/metadata/md5-cache/www-client/opera-developer-59.0.3209.0
@@ -9,5 +9,5 @@ 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/59.0.3209.0/linux/opera-developer_59.0.3209.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3209.0/linux/opera-developer_59.0.3209.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3209.0/linux/opera-developer_59.0.3209.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3209.0/linux/opera-developer_59.0.3209.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3211.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3211.0
new file mode 100644
index 000000000000..43ff6a7dad91
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-59.0.3211.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=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/59.0.3211.0/linux/opera-developer_59.0.3211.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3211.0/linux/opera-developer_59.0.3211.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3211.0/linux/opera-developer_59.0.3211.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3211.0/linux/opera-developer_59.0.3211.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/qupzilla-2.2.5 b/metadata/md5-cache/www-client/qupzilla-2.2.5
deleted file mode 100644
index d8e65ab9fb81..000000000000
--- a/metadata/md5-cache/www-client/qupzilla-2.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtdeclarative-5.8:5[widgets] >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5[ssl] >=dev-qt/qtprintsupport-5.8:5 >=dev-qt/qtsql-5.8:5[sqlite] >=dev-qt/qtwebchannel-5.8:5 >=dev-qt/qtwebengine-5.8:5[widgets] >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtx11extras-5.8:5 x11-libs/libxcb:= dbus? ( >=dev-qt/qtdbus-5.8:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( kde-frameworks/kwallet:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) >=dev-qt/linguist-tools-5.8:5 >=dev-qt/qtconcurrent-5.8:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A cross-platform web browser using QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qupzilla.com/
-IUSE=dbus debug gnome-keyring kwallet libressl nonblockdialogs
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-5.8:5 >=dev-qt/qtdeclarative-5.8:5[widgets] >=dev-qt/qtgui-5.8:5 >=dev-qt/qtnetwork-5.8:5[ssl] >=dev-qt/qtprintsupport-5.8:5 >=dev-qt/qtsql-5.8:5[sqlite] >=dev-qt/qtwebchannel-5.8:5 >=dev-qt/qtwebengine-5.8:5[widgets] >=dev-qt/qtwidgets-5.8:5 >=dev-qt/qtx11extras-5.8:5 x11-libs/libxcb:= dbus? ( >=dev-qt/qtdbus-5.8:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( kde-frameworks/kwallet:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) >=dev-qt/qtsvg-5.8:5
-SLOT=0
-SRC_URI=https://github.com/QupZilla/qupzilla/releases/download/v2.2.5/QupZilla-2.2.5.tar.xz https://github.com/QupZilla/qupzilla-plugins/archive/80fea7df7765fdf9c9c64fdb667052b25f1c0a22.tar.gz -> qupzilla-plugins-2017.03.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=87046ff380eb39ea754bf3c166ee178c
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.5.1 b/metadata/md5-cache/www-client/qutebrowser-1.5.1
deleted file mode 100644
index ab80309805c2..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,multimedia,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.5.1/qutebrowser-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9228c0924e728db5ab8f921a069240cf
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.5.2 b/metadata/md5-cache/www-client/qutebrowser-1.5.2
deleted file mode 100644
index 74b979b8024d..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,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(-)] python_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.5.2/qutebrowser-1.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8c10348d67b7a139580f3eb86c2cff6
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.5.2-r1 b/metadata/md5-cache/www-client/qutebrowser-1.5.2-r1
new file mode 100644
index 000000000000..6aa07f871253
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.5.2-r1
@@ -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(-)] >=sys-apps/sed-4
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,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.5.2/qutebrowser-1.5.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1256e3623f9140cf4a2564c7c2fce59f
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index bd697bdbf02c..7035d60c57c1 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
 IUSE=test python_targets_python3_5 python_targets_python3_6
 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(-)] python_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(-)]
+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
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8c10348d67b7a139580f3eb86c2cff6
+_md5_=1256e3623f9140cf4a2564c7c2fce59f
diff --git a/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1 b/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
index 81fbe01e6949..a7d3361fb9f5 100644
--- a/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
+++ b/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_amd64.deb -> vivaldi-2.2.1388.37_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_armhf.deb -> vivaldi-2.2.1388.37_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_i386.deb -> vivaldi-2.2.1388.37_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18196e51fa06eec0da4d76ccd0d8daee
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1430.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1430.4_p1
deleted file mode 100644
index 8b4991072de1..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1430.4_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A browser for our friends
-EAPI=5
-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.3.1430.4-1_amd64.deb -> vivaldi-snapshot-2.3.1430.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1430.4-1_arm64.deb -> vivaldi-snapshot-2.3.1430.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1430.4-1_armhf.deb -> vivaldi-snapshot-2.3.1430.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1430.4-1_i386.deb -> vivaldi-snapshot-2.3.1430.4_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1435.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1435.4_p1
deleted file mode 100644
index 7c405a999cd3..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1435.4_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A browser for our friends
-EAPI=5
-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.3.1435.4-1_amd64.deb -> vivaldi-snapshot-2.3.1435.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1435.4-1_arm64.deb -> vivaldi-snapshot-2.3.1435.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1435.4-1_armhf.deb -> vivaldi-snapshot-2.3.1435.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1435.4-1_i386.deb -> vivaldi-snapshot-2.3.1435.4_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.30_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.30_p1
new file mode 100644
index 000000000000..e5387769e836
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.30_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+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.3.1440.30-1_amd64.deb -> vivaldi-snapshot-2.3.1440.30_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.30-1_arm64.deb -> vivaldi-snapshot-2.3.1440.30_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.30-1_armhf.deb -> vivaldi-snapshot-2.3.1440.30_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.30-1_i386.deb -> vivaldi-snapshot-2.3.1440.30_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.4_p1
new file mode 100644
index 000000000000..adc82c995afd
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1440.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+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.3.1440.4-1_amd64.deb -> vivaldi-snapshot-2.3.1440.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.4-1_arm64.deb -> vivaldi-snapshot-2.3.1440.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.4-1_armhf.deb -> vivaldi-snapshot-2.3.1440.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1440.4-1_i386.deb -> vivaldi-snapshot-2.3.1440.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 5ce579835b85..a5a3590ba4c4 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.14 b/metadata/md5-cache/www-misc/urlwatch-2.14
deleted file mode 100644
index 89c7429c95b0..000000000000
--- a/metadata/md5-cache/www-misc/urlwatch-2.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] test? ( 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/keyring[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/lxml[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/minidb[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/pyyaml[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/requests[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/nose[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/pycodestyle[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(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A tool for monitoring webpages for updates
-EAPI=7
-HOMEPAGE=https://thp.io/2008/urlwatch/
-IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=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/keyring[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/lxml[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/minidb[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/pyyaml[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/requests[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(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.14.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=093d33367597b299323b66e89f43d4d5
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.16 b/metadata/md5-cache/www-misc/urlwatch-2.16
new file mode 100644
index 000000000000..d1b127e05d03
--- /dev/null
+++ b/metadata/md5-cache/www-misc/urlwatch-2.16
@@ -0,0 +1,14 @@
+BDEPEND=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(-)] test? ( 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/cssselect[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/keyring[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/lxml[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/minidb[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/pyyaml[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/requests[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/nose[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/pycodestyle[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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A tool for monitoring webpages for updates
+EAPI=7
+HOMEPAGE=https://thp.io/2008/urlwatch/
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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/cssselect[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/keyring[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/lxml[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/minidb[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/pyyaml[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/requests[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.16.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cb2e70a0f0c1e636cda094de7313c285
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index adf9b09d4748..74d6100414ae 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-71.0.3578.98 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
index ba97b15f2856..c2234196eac9 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
@@ -9,5 +9,5 @@ RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chro
 RESTRICT=bindist mirror strip
 SLOT=stable
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_71.0.3578.98-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=963150373d6cf0defcd68312e710eea7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.64_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.64_beta
deleted file mode 100644
index b97541e99428..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.64_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_72.0.3626.64-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.71_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.71_beta
new file mode 100644
index 000000000000..8048646b8169
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.71_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_72.0.3626.71-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3673.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3673.0_alpha
deleted file mode 100644
index 55deb24d6493..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3673.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_73.0.3673.0-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3679.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3679.0_alpha
new file mode 100644
index 000000000000..62e951ff2b52
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3679.0_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_73.0.3679.0-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
index cfd0fe14033a..8b4b3cad9b62 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9a6df4ae3ad01f47f93c1ed623addcc9
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
index b11a3a68c660..7c6596aff80c 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bf0a9de61e7618063fab1134c8a4ae8a
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-9999 b/metadata/md5-cache/www-plugins/google-talkplugin-9999
index 6ef9cb519b1f..220a1dd862c7 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-9999
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-9999
@@ -8,5 +8,5 @@ LICENSE=Google-TOS openssl BSD
 RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-libs/glib:2 sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/pango sys-apps/lsb-release selinux? ( sec-policy/selinux-googletalk ) libnotify? ( x11-libs/libnotify )
 RESTRICT=strip mirror
 SLOT=0
-_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bf0a9de61e7618063fab1134c8a4ae8a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index fae7a5f65b95..2c59871004e0 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/lighttpd-1.4.53 b/metadata/md5-cache/www-servers/lighttpd-1.4.53
new file mode 100644
index 000000000000..47793f82cbfc
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.53
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libgamin 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=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=7
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
+REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3f8a394fcf23a893259947fdcb5f34ba
diff --git a/metadata/md5-cache/www-servers/pathod-0.10 b/metadata/md5-cache/www-servers/pathod-0.10
deleted file mode 100644
index a0a708628462..000000000000
--- a/metadata/md5-cache/www-servers/pathod-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/netlib-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
-EAPI=5
-HOMEPAGE=http://pathod.net/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/netlib-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_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/p/pathod/pathod-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b0618805bd8bc38997184d54e9888331
diff --git a/metadata/md5-cache/www-servers/pathod-0.11.1 b/metadata/md5-cache/www-servers/pathod-0.11.1
deleted file mode 100644
index 5ca7a8c12802..000000000000
--- a/metadata/md5-cache/www-servers/pathod-0.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/netlib-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
-EAPI=5
-HOMEPAGE=http://pathod.net/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/netlib-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_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/p/pathod/pathod-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57d4778ef921218e1e216fa5ac89384d
diff --git a/metadata/md5-cache/www-servers/pathod-0.12.0 b/metadata/md5-cache/www-servers/pathod-0.12.0
deleted file mode 100644
index e8991ea02579..000000000000
--- a/metadata/md5-cache/www-servers/pathod-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/netlib-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
-EAPI=5
-HOMEPAGE=http://pathod.net/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/netlib-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_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/p/pathod/pathod-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e10bc8f654f0f1b2764e75e6ae18cea3
diff --git a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1 b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
index f1edef80df17..63e0b388d029 100644
--- a/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
+++ b/metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A FCGI spawner for lighttpd and cherokee and other webservers
 EAPI=7
 HOMEPAGE=http://redmine.lighttpd.net/projects/spawn-fcgi
 IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86
 LICENSE=BSD GPL-2
 RDEPEND=!<=www-servers/lighttpd-1.4.20 !<=www-servers/cherokee-0.98.1
 SLOT=0
 SRC_URI=http://www.lighttpd.net/download/spawn-fcgi-1.6.4.tar.xz
-_md5_=029596f0c277a461280f606667e18888
+_md5_=f5801c16ce96958527bdbebd22f942fd
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 6409c9c5c58f..ca672f1c7346 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/xcursorgen-1.0.7 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7
index 94ee1afd03d6..bcc9247e49f4 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.7
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0= >=app-portage/el
 DESCRIPTION=create an X cursor file from a collection of PNG images
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
-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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcursorgen-1.0.7.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=e3222114377f8d2c6b0274c87ab342d9
+_md5_=a5915f298fd728ef8108719ea6601742
diff --git a/metadata/md5-cache/x11-apps/xinit-1.4.0-r1 b/metadata/md5-cache/x11-apps/xinit-1.4.0-r1
index af9d264e48b8..493bc3a025fa 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.4.0-r1
+++ b/metadata/md5-cache/x11-apps/xinit-1.4.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=X Window System initializer
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=+minimal
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT GPL-2
 PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xinit-1.4.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=366929358905cac50e8d814afcd3be90
+_md5_=ce2084ac92b0c9c73206e9d2e4219806
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index d4bbb0ab5273..e11ffd09fe3f 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/nvidia-drivers-340.107 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
index 9f2601c9aa17..1eb9dc53c2db 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.107/NVIDIA-FreeBSD-x86_64-340.107.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.107/NVIDIA-FreeBSD-x86-340.107.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b61a78e369fd9a9cf3827cb5a65112ee
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
index 6384f2738dbb..5e15b5c6d1c3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.87/NVIDIA-FreeBSD-x86_64-390.87.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.87/NVIDIA-Linux-armv7l-gnueabihf-390.87.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.87/NVIDIA-FreeBSD-x86-390.87.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.87/NVIDIA-Linux-x86-390.87.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.87.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=83b00e2a57274b7d19ec74b2d637ce22
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
index 00129676af7e..423472da6ecc 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/410
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/410.93/NVIDIA-FreeBSD-x86_64-410.93.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/410.93/NVIDIA-Linux-x86_64-410.93.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.93.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9afe4a0196acfe3f64e4aa6a9bcf03f5
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
deleted file mode 100644
index f5d951fe66e2..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~amd64-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/415
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.25/NVIDIA-FreeBSD-x86_64-415.25.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.25/NVIDIA-Linux-x86_64-415.25.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.25.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fafb3ab75b8c4454678ae4991c4074ab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
index 09626a883932..c4d66659f007 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
@@ -4,12 +4,12 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~amd64-fbsd
+KEYWORDS=-* amd64 ~amd64-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/415
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.27/NVIDIA-FreeBSD-x86_64-415.27.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.27/NVIDIA-Linux-x86_64-415.27.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.27.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d9ac9817fe1b428c51fb5298d7c7afcc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=fafb3ab75b8c4454678ae4991c4074ab
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
index c8a1af138a44..0204b75e9b9a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Matrox video driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=dri
-KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mga-2.0.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=cc7b065d026cb6fbad093e26869d7861
+_md5_=246ef410b278f4bb22c2764dba92c569
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16
new file mode 100644
index 000000000000..3b30513518d3
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= >=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 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 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DESCRIPTION=Accelerated Open Source driver for nVidia cards
+EAPI=5
+HOMEPAGE=https://nouveau.freedesktop.org/wiki/
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-nouveau-1.0.16.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=48fea0ee273187426318297061bc10ca
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 329a3035d7b2..e6bfe06dfed2 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/cairo-1.16.0-r2 b/metadata/md5-cache/x11-libs/cairo-1.16.0-r2
index a03f671110b0..f59c54a7a969 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.16.0-r2
+++ b/metadata/md5-cache/x11-libs/cairo-1.16.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=6
 HOMEPAGE=https://www.cairographics.org
 IUSE=X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=gles2? ( !opengl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=119637070f972192f559c53f6620860b
+_md5_=5ed8afe9a28011d35fe0d7e85cbb70ff
diff --git a/metadata/md5-cache/x11-libs/pixman-0.36.0 b/metadata/md5-cache/x11-libs/pixman-0.36.0
index 8befd2ad5d2e..d5ad8fb059e0 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.36.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.36.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=altivec loongson2f cpu_flags_arm_iwmmxt 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.36.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=bac3825bc724e780a19d04eef17526af
+_md5_=554565699cb7b4dd1fb1a359b8d203e7
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e6109b5103fa..224fd33e8783 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/xtermcontrol-3.6 b/metadata/md5-cache/x11-misc/xtermcontrol-3.6
index 467a47dc793c..1110fc9b5f66 100644
--- a/metadata/md5-cache/x11-misc/xtermcontrol-3.6
+++ b/metadata/md5-cache/x11-misc/xtermcontrol-3.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=xtermcontrol enables dynamic control of XFree86 xterm properties
 EAPI=6
 HOMEPAGE=https://www.thrysoee.dk/xtermcontrol/
-KEYWORDS=~alpha amd64 ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.thrysoee.dk/xtermcontrol/xtermcontrol-3.6.tar.gz
-_md5_=6b63411abfa160bed62e78a0c6a10e21
+_md5_=b96a2a63549dea2521de77462ab28717
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index a282ea1dd577..04f1621cd33c 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/guake-3.3.2 b/metadata/md5-cache/x11-terms/guake-3.3.2
index f94737e27757..d80e91177872 100644
--- a/metadata/md5-cache/x11-terms/guake-3.3.2
+++ b/metadata/md5-cache/x11-terms/guake-3.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Drop-down terminal for GNOME
 EAPI=6
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
 IUSE=utempter python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/keybinder:3 dev-python/dbus-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_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_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_4(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libnotify x11-libs/vte:2.91 utempter? ( sys-libs/libutempter ) 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_4(-),-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=mirror://pypi/G/Guake/Guake-3.3.2.tar.gz -> guake-3.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=12ea8221391ad82a316fc550abdaa46b
+_md5_=7baac94560cbe209bab16ccbfb2f32ae
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r4 b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
new file mode 100644
index 000000000000..59eeabe11d15
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-misc/imake app-text/rman x11-base/xorg-proto x11-libs/libX11 x11-misc/gccmakedep
+DESCRIPTION=Terminal to display (multiple) log files on the root window
+EAPI=7
+HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
+IUSE=kde debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXext x11-libs/libX11
+SLOT=0
+SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=78c5d46bd130e84e64889bc01c2d4758
diff --git a/metadata/md5-cache/x11-terms/xterm-337 b/metadata/md5-cache/x11-terms/xterm-337
index e881b48b31e4..fedfa824fe15 100644
--- a/metadata/md5-cache/x11-terms/xterm-337
+++ b/metadata/md5-cache/x11-terms/xterm-337
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
 IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-337.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f9f623da270d201e676eac1e05577dd4
+_md5_=30d5ae213ca377599647c61e6d362543
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index bdaa470b17a3..addba69c27a6 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/ubuntu-wallpapers-18.04.1 b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.04.1
deleted file mode 100644
index ae5a28548d8e..000000000000
--- a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.04.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=Ubuntu wallpapers
-EAPI=6
-HOMEPAGE=https://launchpad.net/ubuntu/+source/ubuntu-wallpapers
-KEYWORDS=amd64 arm x86
-LICENSE=CC-BY-SA-3.0
-SLOT=0
-SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-wallpapers/ubuntu-wallpapers_18.04.1.orig.tar.gz
-_md5_=3f3ed64fbd541b1ab30ff034ae642bbf
diff --git a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.10.2 b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.10.2
index 062cf404c96c..68cc7922b512 100644
--- a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.10.2
+++ b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-18.10.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Ubuntu wallpapers
 EAPI=7
 HOMEPAGE=https://launchpad.net/ubuntu/+source/ubuntu-wallpapers
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-wallpapers/ubuntu-wallpapers_18.10.2.orig.tar.gz
-_md5_=235ffd2361de1a62ef050253cebdfc49
+_md5_=b9e106b7b931acb54c9c2bada18f190c
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index cc7d1b558f38..933ccf59f42b 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/sawfish-1.12.0 b/metadata/md5-cache/x11-wm/sawfish-1.12.0
index 7d5cfa1925fe..d6f65ef0cbdd 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.0
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible window manager using a Lisp-based scripting language
 EAPI=6
 HOMEPAGE=http://sawfish.wikia.com/
 IUSE=emacs kde nls xinerama
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( virtual/emacs !app-emacs/sawfish ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/pangox-compat x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/sawfish/sawfish_1.12.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5ea10787570335be7cec4da302fe000
+_md5_=e94cab959399cbcb1a48ebc5b3f59e40
diff --git a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1 b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
index 7a62a20695a9..3a0330cfeead 100644
--- a/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
+++ b/metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=window manager selector tool
 EAPI=6
 HOMEPAGE=https://ordiluc.net/selectwm
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
 SLOT=2
 SRC_URI=https://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3032d1f2fc81196157f9ff48a4a70e5c
+_md5_=6e30cdacfc3583f0ac4f769a98fcda3b
diff --git a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r1 b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r1
deleted file mode 100644
index 8dc1afb339c9..000000000000
--- a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay ) app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=one of many TWM descendants and implements a Virtual Desktop
-EAPI=2
-HOMEPAGE=http://www.vtwm.org/
-IUSE=rplay
-KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )
-SLOT=0
-SRC_URI=http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91b4b26996ca7242e3dae6bea6ac733f
diff --git a/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2 b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
new file mode 100644
index 000000000000..63146254f942
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay ) app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto x11-misc/imake
+DESCRIPTION=TWM descendant that implements a Virtual Desktop
+EAPI=7
+HOMEPAGE=http://www.vtwm.org/
+IUSE=rplay
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )
+SLOT=0
+SRC_URI=http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=efc011b4f70e57f6bda5368bb8c040a4
diff --git a/metadata/md5-cache/x11-wm/xpra-2.4.3 b/metadata/md5-cache/x11-wm/xpra-2.4.3
new file mode 100644
index 000000000000..ea5c2a16695d
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xpra-2.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) libav? ( media-video/libav:0=[x264,x265] ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python2_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=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
+EAPI=6
+HOMEPAGE=http://xpra.org/ http://xpra.org/src/
+IUSE=+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 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/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) libav? ( media-video/libav:0=[x264,x265] ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) pillow? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[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(-)] virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://xpra.org/src/xpra-2.4.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dd4aec62e668841e42b4fd920e744774
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 63c1f7ef8f72..f5f3b13fc596 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.16 b/metadata/md5-cache/xfce-base/thunar-1.6.16
new file mode 100644
index 000000000000..d54f63dece22
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=+dbus exif libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+REQUIRED_USE=trash-panel-plugin? ( dbus )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.16.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=09d2db20869d12b1787bad1ab6d3cbc4
diff --git a/metadata/md5-cache/xfce-base/thunar-1.7.2 b/metadata/md5-cache/xfce-base/thunar-1.7.2
deleted file mode 100644
index ec28b60583a3..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.7.2
+++ /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.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/1.7/Thunar-1.7.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=78fb0cc52ffd3c2d7d52b57bc842edf2
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.1 b/metadata/md5-cache/xfce-base/thunar-1.8.1
deleted file mode 100644
index 41f93827d267..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.8.1
+++ /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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.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.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9030e464e68ed3b767e798cb703a6fed
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.3 b/metadata/md5-cache/xfce-base/thunar-1.8.3
new file mode 100644
index 000000000000..5c295ec376af
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.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.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0eb056cbee0842a011da7becd6f87664
diff --git a/metadata/md5-cache/xfce-base/thunar-1.8.4 b/metadata/md5-cache/xfce-base/thunar-1.8.4
new file mode 100644
index 000000000000..282fbd0e7b35
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.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	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0eb056cbee0842a011da7becd6f87664
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index eabeb502fa3d..33dfcc72f99b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2019-01-25T07:08:47Z
+TIMESTAMP 2019-01-31T15:08:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxKtf9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlxTD3lfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYPBAArBmreayajdVqgIHBRYI2TIx3hIVsTfW9sg+sZLNZb0NrtEkhtvFyMLsB
-FsLo2+A6t1ereDUleS4/+g1cbeNn+pHiL7fbka52Mo38Tt9OhM19vXLd78E30xXO
-Avbst37Qe1z2QMojjzneVGfD2d05xgLAsu6nq08rW6HVVLiFKe4ir40m0N2vNCj3
-SdPUI6TyZKlRhus1Wm0jk4qBsfzq2H3PIIIQFb/EZRfrwKoQ/VebV04qIsqXzosU
-3AR01b+TgGeYrrV2DBaMXRqtU9v4wf+qmxkd3Nxnsja4A3TfmgRNUC8HQDD2vK3r
-btgWmaXBY54xxKWRlFmQf8DTH6nwGP712jt0G2tMQP+5w0T8KFlWWdgPXX0dOr3J
-07nUrDj3PivEIUc75/yDcEjd8N2Yi6Gape3uFabgV7SKN5OgTJ4hHgZtSzXCrCLg
-l2dvPgTn7y1UaZF19QZZlfU4vcIp1PyNhYi3vtn1HbnzH97y4AUX+69dlzG1yOmn
-kF1CUx4allHbVPPF8cOm+QsG9W9mPtMoNb2gCQKJO5jSiNy250p3YWQGqxt6WKGo
-YvLtWv8QtuWxohCoGEzSA2SYEicJIHbuXMUVbaZYD62IFOPOyzyRurdC7EjnL5PM
-xrgW/lo4FcTEd70N4tEpRbq1NhwIAl6/jV6+m2tA3aaJtMnhpow=
-=7y3i
+klCHEQ/8CMgcflFmOj9cQHeVmep8fV+Qc8TBYQc6N4+tgQWo/Yk+LBrIVtz+ydRf
+hu/ViNpK+MYY3abTKUa4IrnhN1Soz7ob32D3SMLsMFy/krLiSLhxn6cRR8QxIj/v
+3mCjF8fT0as4Kyz9M+0MVrcs8DoAjYt9UsaM0vzuq99a/r5SYbvO8b5b3q/MvF29
+Ht7WC86BUdcD/1ubO2Gp+wo/xQPbwdBR5z1Z8ekbJrJEqLzvTv3fIgcLf2ELPUkA
+3D/6eN6JgDiKGIKctaihLwSLx9MwBYXtsoWRuRN6E2kPG8jdKc3+RiXn7uDBGvcB
+ziEMtneMvRF3cuUIeEUiej1QNsoFMwB8TOraC/kVawL9NWSOaPwt+TEGWdd2f23P
+ZlZACIexC8X/PiGnOB+nrsOYgMRIOmJZeKkS1tq9j4Z9vBpn4fnFCB2DxeIevWPJ
+W7HdjbRQvW3WuW9Ld7C5i2d/pHPeOrQ3N8aZfyT12aaoKSPlNkULV93CFblSqFS+
+RYRTZ9lvPznb4smR4iOcBcXvd5ZhIJQ/eePgySBaFhBZkaMdY5CLds8d/NgW8/Rv
+7blUtHtfTrJyH2sn8BmL4yOBREfV3nSmKm2+XvtM+D85psA3vZ3h5r1kx8U14rzE
+HF7CBtQ5u8cxemWE7BNfjWp1OGZoiYIh5qECue6a8FFJxNN+fN8=
+=4orN
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8276aae1c4a8..fb883f84af51 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 25 Jan 2019 07:08:44 +0000
+Thu, 31 Jan 2019 15:08:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b271ba453863..cd52007c4c45 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jan 25 07:08:43 UTC 2019
+Thu Jan 31 15:08:37 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 86a533274f1c..4801bd9060e2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 25 Jan 2019 07:15:01 +0000
+Thu, 31 Jan 2019 15:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c4ad097be30c..9e4d00e7efd6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9cc6c29be1d45345e3259e4c04f6673f0d4e711a 1548397916 2019-01-25T06:31:56+00:00
+c7025a2de55c10db0b7dc891b08a2be829cabdf3 1548945366 2019-01-31T14:36:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2cb59cdb2ed1..cb81af169f96 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1548399901 Fri 25 Jan 2019 07:05:01 AM UTC
+1548947101 Thu 31 Jan 2019 03:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8276aae1c4a8..fb883f84af51 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 25 Jan 2019 07:08:44 +0000
+Thu, 31 Jan 2019 15:08:38 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2b32979ad3f1..1e4fd71fc4ba 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 222354e2460b..857d2466dd5b 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,5 +3,5 @@ DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c65928
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
 EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249
-EBUILD nagios-plugins-2.2.1-r3.ebuild 3118 BLAKE2B e8559ab89bf0391a3b49ccccb5289053cec7aaa212ae4efe9215bac0a1ba3aee75cbf387de50826500511696fb4a47112cadaa7764aeea57a23702f014835324 SHA512 1a831d6868998d0a065e4a91e180116655b52db08ea21a04c5b443fe45f5ab7f1b7f23a6f6eeed22cea3ceeffc8be3fde32282733ce991a485f05a7ca7289576
+EBUILD nagios-plugins-2.2.1-r3.ebuild 3117 BLAKE2B 02b59f5f96bac525180b90d714becad1427a989cb2b62d105ba896cca0e174b0216032bd96f406ada9bb592ff171a617a7493e0b02f9d27f339255d964549006 SHA512 0a05a987bca4ba9f5e2f22f911eefab193453bb93605527780983b9e424fd13515405bdcac2b2a8757b0da7e596c2eed9c9b63fbb17225116437356c3fe69aea
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
index b67ad27f6923..df82bfc3f848 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 49326111c644..5bfbf6881b53 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -1,6 +1,4 @@
-DIST netsniff-ng-0.6.0.tar.xz 554612 BLAKE2B f677c0988f9b8c59c536a278abf996bec9d30ac20b252aeccb577cf9a3ceb09855023285d98a5255864f17df746f67bffdc1dc7d5f51ae7a7ab678a6f64a06a0 SHA512 a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74
 DIST netsniff-ng-0.6.1.tar.xz 565956 BLAKE2B ed965ee91c3d4bb6f339f983ee67052633f1fb90da114e1086672342adeec06ca2fa1b70a210b6a7cd43baacf59ff2c2b7fa72c2ea3e9477ba12055d0f34f50e SHA512 a07f3d5f85c517e220db53ac3a93e6337e49cbc8d69b730261697e765e449fa25024782b2b4fac089288f8753471e2fca3162b55c3bb2a9fcbbb10b96391efc1
-EBUILD netsniff-ng-0.6.0.ebuild 1320 BLAKE2B 68cee00362c24a31186394df316e552d44c0786782fb8ba045d73b1f82b8cdb6fc0fbfb706bef130dc48d2bd4abf1f243b9d4bb084812f13860cac148a2f84aa SHA512 5dde5693a54ccf3a4aeb39dda5ff03eb3e966388e1e157c910c8bfabb9a7f0f75cb1e934361962ea8ece8101a39fe58ed9a5418069977c307c4caf85ab575f12
 EBUILD netsniff-ng-0.6.1.ebuild 1324 BLAKE2B 43e5ab2c4dd9b2b6b2241b11c423330c03d2055649fa6c363ffe53b91dc56bbfabc54b8bc394442cac48150fe97ebcc94a7f5821bef1eba371f654fd69e297e6 SHA512 6d297cfc26ea6f5f6a1cbb577cb9c593a68022cd4448112e40f93a56ab250820fed3071245459c9d5b1fa60372feb0bfe8e473ea33a9eb8285c190c67b2036ae
 EBUILD netsniff-ng-9999.ebuild 1321 BLAKE2B 6972fb2c40d19b2d4257ec0641ca6777e8ee236b0da9cf159da18279b6b9b3aa204148d4e4c75046bdec64c51089ebfba06d2b2f0e615ae9331c912c55c97284 SHA512 39e58aaa796dc1056a54b8f00bf6ffca0a2bc21b66d0b1c75d6b84251a44250d5e6858d84b5fd3c8dcabce5baf55896744c2a8f269328659aa68d650a3ff1fb5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
deleted file mode 100644
index a62b4469379c..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu:=
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CPPFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		-i Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
-
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 0acda6804fdd..d865c2df60f8 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,5 +1,3 @@
-DIST nikto-1.36.tar.gz 206921 BLAKE2B ed6cc343ddccd8d35a7df566c5facb91b31fa9ec1697bb962fb7a0fdf3bc396a95c60997267fdca929b6af2e599f1535a223bf04ccb53da485ce409f8bc4391f SHA512 e340eebc8323a689b1fe8358626f90d822f4eea4aaeba44c64f68c758fccdec7c3d5896b93739128b1b53429967d4e66ccb08b880066e0c63bed4e2748f94a45
 DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91
-EBUILD nikto-1.36.ebuild 1278 BLAKE2B 43c562d26e0c6bc9f5d1d70a7c3e16dc4f7e502eff73bf52f3519e3a6694c5b653d50a14cfcc677e0b9b6e33520304464680ad30b04d5609911d71b002fb6b08 SHA512 767bafd225f1f2628652939f703b930e4d4524686d580429d1fb51e8e564c816d84e23455e0f0e253d94d49a604fc29b99cd62a16405ae7d76a855d246c7f6a4
 EBUILD nikto-2.1.6_p20180122.ebuild 1219 BLAKE2B f8e7f956842f8025f3d778b1b1acb0a5e719a5bf8b835e987c50313eeb1d0701258607adfe0cfbf7dc6e843525094053026324c16387e3ad3f432fed29cb0fc2 SHA512 03a896addbd469b9d79a908b19d6f2ff7d51778b05f1b4940922accf0e1c36ee71d7c7ebda8d623844c3c2d8e4ebc3101d09f69337703b90ce493ffafe9d8d44
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/nikto/nikto-1.36.ebuild b/net-analyzer/nikto/nikto-1.36.ebuild
deleted file mode 100644
index 2656b333753a..000000000000
--- a/net-analyzer/nikto/nikto-1.36.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Web Server vulnerability scanner"
-HOMEPAGE="http://www.cirt.net/Nikto2"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-
-		 cp "${S}/docs/nikto-${PV}.man" "${WORKDIR}/${PN}.1"
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	doman "${WORKDIR}/${PN}.1"
-}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d36813ff47d7..d4e7dff9f8e8 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,8 +7,9 @@ AUX nmap-7.25-CXXFLAGS.patch 302 BLAKE2B 3a6689beb9750dbb2d35a779089c4f8dd772add
 AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7dc7b98f6991c75f13f2cdc0ca14e2527bd55cc88e33837012d4b1b24433a9f63b614cffedbf3da40ab73d9b6 SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
+AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276
 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 4517 BLAKE2B f75af2eebce015967a3d99714eb1a743f91ac10382b3934996c14c55ba8cd6e95ab5d15075701f82d159dbfe364154ad098b9bab1c87870bab3be86edab9e06d SHA512 5ebcbf15de1f26b964f08564833946807b16bf1141d2cc733a86a440efecb58f0c10da563f2f0d20b353e9b96e10993f6ccc38d7af70ed977aa8d30c5bd9ca24
-EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18
+EBUILD nmap-7.70.ebuild 4549 BLAKE2B 7923242126a368798da7c84e2f60fe719a27e452e0c067b15c704e70f6919fd62623cf4bfae1afd93714b0bf399b1c5dbfa6ee42fb8d94ca6b925febd853268b SHA512 33308a5492a447d3aa059a0f69cd339e20131f901b3fe19a668929a4a5840a5303361bf23002a32a67ed7699f70e82e19f430b89f5302776358b204286ba3519
+EBUILD nmap-9999.ebuild 4349 BLAKE2B 6b3b1ea837ac1e72e610aab1c22f83611a12793b05aec5ed6ce8d7558588ab39f4441be74f5498b2f45d177e5a8a3f7033d95ee1767a983ddf3a62b8c1113712 SHA512 1f7fcfd904567fb7d3ce1b75a3b871d7baa1b76c3b546b29953111468b51e433782825031a89fe1bdb0fce00b9beb1d7cde0ef307a678ac546325bb33ed147f9
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
new file mode 100644
index 000000000000..4b97bdf49049
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.70-time.patch
@@ -0,0 +1,40 @@
+--- a/nmap_error.cc
++++ b/nmap_error.cc
+@@ -135,6 +135,7 @@
+ #include "xml.h"
+ 
+ #include <errno.h>
++#include <time.h>
+ 
+ extern NmapOps o;
+ 
+--- a/nmap.cc
++++ b/nmap.cc
+@@ -161,6 +161,7 @@
+ #endif
+ 
+ #include <fcntl.h>
++#include <time.h>
+ 
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+--- a/osscan2.cc
++++ b/osscan2.cc
+@@ -147,6 +147,7 @@
+ 
+ #include <list>
+ #include <math.h>
++#include <time.h>
+ 
+ extern NmapOps o;
+ #ifdef WIN32
+--- a/output.cc
++++ b/output.cc
+@@ -153,6 +153,7 @@
+ #include "libnetutil/netutil.h"
+ 
+ #include <math.h>
++#include <time.h>
+ 
+ #include <set>
+ #include <vector>
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 692e3cb12908..e9bc260c7a9f 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.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
@@ -25,13 +25,11 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
-
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -66,6 +64,7 @@ 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/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index a54dd5819b11..c282246d4512 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-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
@@ -65,6 +65,7 @@ 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/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 9c2973cbc415..c3b835a5b38c 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,8 +1,3 @@
-DIST ripe.atlas.tools-1.2.1.tar.gz 83916 BLAKE2B f48ba56deaa282a2c801e49abc712c3b4cdca20ee37d40b57c6d7d2602f68f5cdf54fc53820484672039bce349a68567ba1a1ebb2eb74665f716868c279de7d7 SHA512 4c91d14f15e80e7e0ce4d6973e497bb48561314434d1521437311fb813197da7ba0a3e27f14cebe5a71d75baba37d2e5045b94d9e39699ef4a4e57aafb063ea7
-DIST ripe.atlas.tools-1.2.2.tar.gz 84242 BLAKE2B 2d5bf29716d67404b9b6752dffe0642444bc1ab771029dd2b27b8a2d2cec31f805eb67b96adfe0bbb5aca33c17cc2c838387f3736163b8b96e99274d5152418b SHA512 f76efc0412e21ae50c27ddb33b00274f9be6f6f8d2106eac4e76d8dcdc14f114efc0cae5ee961b56f10b302cee0afa0ea6b84b0df588ddaf9ff5e132f8db4f2c
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.1.ebuild 1271 BLAKE2B 4809fb479e42e30fba4bb025bc11453c1dc2134e1e1c2a71b267465cc0e2133beb4e63677ed81d332fe9663377e07cdebb223e2924c586b7cd7c66299fe292b6 SHA512 e30a9dabe7ec4947f310a97ac417fe81d0308f00906a4daa44df19d04c7bc084816df383f5b9a3a1c7c210b603514de27283f837d00c29e52c2acd66e9f82435
-EBUILD ripe-atlas-tools-1.2.2.ebuild 1269 BLAKE2B 19fe7a653a4c4af7b48fe51a9269ad7549104f8de882ace772657e0523ce16b78596fa7f5d1b0fd9da983350a71d2fca36d731786d2a92f1e7e5f649ccf2164a SHA512 248a50f7f8c599475e5da8db73c333952b646c41910ff0f2efba6289b955552f508ad9c888a3d3f17ac9ac2dbf3f9049febb488d89758f43b411da2031e06a48
 EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1303 BLAKE2B 4e4cead8479d1bafca52840400e0ef23e36e0ba205323f71c5fdb774c9e17a6c5bc498e486e57b45cd359f7c854afdef2183bbcf18ed29fd4471cc3a60a2dcdd SHA512 0fbb6e077ae0855fa070620a34b0c63f6a6a749b6e9cd871ecbd94a0ec4bd4d8ae3f6e28ccd4365b67c584c720fa33e1c9dfbdcdebaada5c1cbe74ec232e8c14
-EBUILD ripe-atlas-tools-1.2.3.ebuild 1301 BLAKE2B a8436a12f352d44d7d976dd82b0eb622500f2754c1f84fe175d1e98771c1fc427d13d3cbc5e2947771d9082bd38f62bb09d1b706d000c5b479f5069f5e357d7a SHA512 c7fd5df592c73ee30e4341fe4494f601a716c52538ab3d0f71294648a5e7668cd2261c5bc215d5a48ee2d26abe0018ae5b0bff92013aa4e6e6fed606d427d59a
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
deleted file mode 100644
index 283dfe597855..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
deleted file mode 100644
index 7bb832dcae2a..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
deleted file mode 100644
index c48c7717c1d8..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-DOCS=( CHANGES.rst README.rst )
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index 3ceb9f7a5b3e..fc19e1755a43 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,8 +1,6 @@
 AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093
 AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
-DIST thc-ipv6-3.0.tar.gz 667859 BLAKE2B 6fa4f697bf316c3b9730b58e35c3d8ac6910c0e063751037a0900aa459c128c5de9a07e4912025dd6eebb92061a7cc48a6e2e2a0b5d7d53b339e4d5416e4fdf7 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552
 DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
-EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616
 EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
deleted file mode 100644
index d4aee56ff488..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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="http://www.thc.org/releases/${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"
-	"${FILESDIR}"/${PN}-3.0-Makefile.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/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 3a90d1029f17..a48ec50e01af 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -3,5 +3,5 @@ DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 EBUILD traceroute-2.0.20.ebuild 937 BLAKE2B c725daf3511d8d24b2e3a49942944595529245483bcb981457911be9c6216dd1baaa3a13ef2bbb78c9647d6e232d3829e31739880cdff65666ea00f935f3fddc SHA512 7bdeef7eedc93e792e57e8c09d256e55bc0b7f9216035d174da66523119e57ae71eb5f9b8805a4421b0910a0a658c2412053f67999ed34d140e2b9d3c2a9cb5f
 EBUILD traceroute-2.0.22.ebuild 888 BLAKE2B af947b2e99b1d4d6ea9996c40b3aded90699a04583ee9fc56714650df3762812e7c7628ca611ded9f2d694fa30240ae9b8a03a85bf4fe574396597c0351b2fad SHA512 0c299339fa16328123c82428f339cb7b1b1ffb528d76fbe0795f10035eb4520c507901c67c32a68e08cf2d221dad56b68cb239f9dbecb99611c28f90f77a094c
-EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B f8b93f99eb075c220dbeb76eb62882908b7b590524c79875f5695fa74faaf44d3decb12b1b72501cb478078d10f812fa7dbbd9b2cc831cfc44e8ef7bd4deb57c SHA512 c68761f15837ade0255b549e789f66ae781e295fd095c44a46eb0785f65fac234ac35d80cd01ca265185c388946c278828531d99ecc05209dd3a54573de68479
+EBUILD traceroute-2.1.0.ebuild 872 BLAKE2B e606b1a54a6eb6b5d77ed524800c44853b6971951a02bd594f1ab17637b75a2fd2dfcf6e68ff8dfef157b5d46d352d1e04a594f45fc1617c2e41527017f35d32 SHA512 56b88be21f6bac9fe16e451a455da14635ba2797d9c94c7e5aa42207fc99ae3052fea4651177049d2149c9c62b8bf4a34bcfb6424abdefb3620586ca303dc47a
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 4378e4df6646..6500eda2ebfd 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${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 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 13c754707238..bca5cc753785 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index b457c30084c1..dfa40f0bfa5f 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -5,5 +5,5 @@ AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6
 DIST linux-atm-2.5.0.tar.gz 1036180 BLAKE2B d63aa1b9524f29d7d20e3e881864df9e395b56dcbe413d0eafa7448078f279f2ea193969b05b395b973037ccb7e44673f9c776fc2dce5b832de3e4796c8a5513 SHA512 48e9bf848318d6842584d19e2c896c906a5dc3d6cf362aab346c47dd258b28ad7bc0b6a7f90708b4c0069504b500cd88e3aed7f54ff803b0ed772e35bc2181b0
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
 EBUILD linux-atm-2.5.0.ebuild 1166 BLAKE2B 0cce0ad7c82250d4d1bca4b903c0ccd887f12a766c1c5c5035bbadcd6be373899c92b8c012de71ccf129f598db873cfeaf2059e0185efef59298b344bf1ca296 SHA512 095c77249b5c86f6a9ad045babd1e2922a7eace9adaf7f68a4de0943b099cf3d0a7088bd49e8010ba3b9e978f3021ff38ac4255d8e62e8f0dfe23beeb9dea2f1
-EBUILD linux-atm-2.5.2.ebuild 902 BLAKE2B 06dbc7d2bdf9a06afb871a41152c3ecf8f1d6ae1747f3f907881def237808c4466dd7f5837499e512574e1f0fb106726f35168921a02560d797c043c12ab40f2 SHA512 037baf66eb428347a43d292c1b4e3d6245debf0efe9d582549325723883f42057ba9771b7eeea04d40b7be0550bac903cdb97502382644d6633f601507f37966
+EBUILD linux-atm-2.5.2.ebuild 897 BLAKE2B f7dd56c4e7ab3b2d16b827a8c6a7689bd4035d9e603b6e1b98f6a0540b782454415f16a8e76cabf5a6bc9089c994715f4a6b8a6e51075808281b254d41b147cc SHA512 51c01bbd1c300469b2b8e06de3617c0f51df91207af131e4f416fc2168a083985d55c92b50d6aa3544bfe348960773b1f184a2a3df651a0431c3eb1e05490cf6
 MISC metadata.xml 303 BLAKE2B 064756eecade63aaa1040f2712c005a677f365f7c6e6bb5743c4cf8deb59bee599f42b3b38160e5e2a04402a9b2167e618b4f891cc80a30a3e48b2f7851813ac SHA512 86ae1e28bb9f9d2db0a9607d58dd8cb48f96e76c4aaf5e7027f9ae792ef41ca6ac8da92adf13a40c4bcc1bd2cbea67cd4535232116616f687011c777789bc79b
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index f1e9ca9f4203..ef9a98685f3a 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${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="static-libs"
 
 RDEPEND=""
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 4b37fe05eefe..b20a3e794afa 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -10,5 +10,5 @@ AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
 DIST mgetty1.1.37-Jun05.tar.gz 1057939 BLAKE2B de22751e72d72d19293794739c29ed115a6810cd7d57c07228526817120898ca597ba35afad36c324562c220ab67dd44655247ac46a2d6612c704557f3ec149d SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188
 EBUILD mgetty-1.1.37-r1.ebuild 4800 BLAKE2B bf3f72f94a27ead49b1fa58dd3d236aee0d4451e0458d170f831103c39c9f5e51739b588e4bef1b94202c692c1a88682b76a16477ac2be8e0db074dfb3b2a7ba SHA512 61a5de1af9f74ab59fd625d9b6723208abc1e24645f0e3da991b0a3abe43387c27d26e0436c7e56276f49d84b83252a14af1b9bbdd53369980d7898a586700c8
-EBUILD mgetty-1.2.1.ebuild 4676 BLAKE2B b68ef8cf64d702e64b7fd7f4379c83878f61a6d779b81328fba54887e00ee4a33b362a9e85807b2707f19da0b3bbdb6acee41fb537a3a3935f3a1a114b40d10c SHA512 a645a4a80d53a2b3fa2c18584d7d80f95477584e6c71380e90894bb5ec4b976234fc9f4d0f1c944d282e2aea722dc82059bca3915b25d9705510c048d2187b72
+EBUILD mgetty-1.2.1.ebuild 4671 BLAKE2B 10ea12e877d771ce6c07f2a7f418abe59dee61127c4eab5fb51e8434f9f8338a6a9e485412c3a7fbdf4d056e007c195a469abbb3896d44f2eecc78e7f22581ec SHA512 de4986da4265922f9b67e4a2d1df5051872372f734b571fe48330fe18b2d8d7b040c353e7a2c36a1f1676c99f923a66fcab8c92b21fc7d3545b2b01cb138f4ac
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index 722dd95e2c05..9b6afd970118 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-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=6
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="+fax fidonet"
 
 pkg_setup() {
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 18e5ac8aaf65..8e026eca603a 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 608c9ec5f1aa..d302381ec4e0 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -17,7 +17,7 @@ DIST bind-9.12.3_p1.tar.gz 8625693 BLAKE2B 1899e04e409d3dafe63494fb7a0d8b813a648
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.11.2_p1.ebuild 12446 BLAKE2B fe6955788d154964b51fa1fc891070dad6183da778f10d0fb9d0089032e3fe55b7aaf814aacff6de1685c447b44717827a765e47e347bd9c4d1e692e4aebbeb5 SHA512 10bd18014db1837d12398d1978c65a20595de1fed0227b5117c702cc749fbf5b19a37f236e4fe8907e7d50868e4d88fa28103b5c9e7a6c447836c9ddfa658862
 EBUILD bind-9.11.3-r1.ebuild 12181 BLAKE2B 8efe68cae507e1d58df6081419c9db121d7b5d9ef8345defbfb52323390b248b8d3864736df2b6a8dfa393c53534aab0e8b433f21444ec6869d745386e3987de SHA512 cde50f5355c5efc37600c2cae49eed83d296b8fd862fcb512acb8fd4838efd738d890e29d7664a820ac3a93cd23b3844b9357c4f3c0301843876598d8163e8d6
-EBUILD bind-9.11.4_p2.ebuild 12223 BLAKE2B 2fda6a7ddd2873e26fb7c2b2f496e744ab1ba55e51e2fbdc429239b1b67814969709f19658918cb55155bd5d57bef869220c4fc8cbce876ba4db17a2daed5810 SHA512 d9c21ba4a6c2f1c08fb8052bb6a2d54b3df4c6db68475800f2a1bd60d5534b81dd548b83a8c74429b28f635f53841f3a8458d59c039e77a904466735ac2de575
+EBUILD bind-9.11.4_p2.ebuild 12220 BLAKE2B 76cb827bbb59bc620e82d302e5262d209b443d9f428cc0458f1f07ccac3faab92992583636705191e4a1b24723a079f296d5e820d434d848bc780b4ec9e130eb SHA512 2c2c122fa820c75319d5225cc00237c44df462ce0acadfb08a32ba1aca8f332aada6f51aff6077b67937de144c95083bcdc0dd450b7423240f1e3959d7dbef6f
 EBUILD bind-9.12.2_p2-r1.ebuild 12356 BLAKE2B b6a6d19c733dbaefeb72e811d82f9720346219c9daee650b57645d2a21d6d6c61d1bb77266bd0f573eb63ab62a7c9631d1daaa98186e7018467fa0d7c062ecbc SHA512 3b19be7c8883c6b7e5ac4398d43f7da6643c88b376581ef9c20483306cc23e68dd46d6587bfe7ac2b0378f98b195369ad3459a70408f4f6659892fb39ff87a6b
 EBUILD bind-9.12.3_p1.ebuild 12175 BLAKE2B df76e16927d1de12d756dad7aa26e7fd4f61ef1b4ecfe211347e4cdfe9448b23bf299e284d0210d005286948e16e80d8567dd524be8440a6bcffdbd3091bc05c SHA512 0f27b94e5ae9de431c07321bec344a1a723eb03f07811ebae93a0bb3967d6a07bcb43010de903300834721db5816936ace56930aa7e6cd562568e0f0c126770c
 MISC metadata.xml 1352 BLAKE2B 89e5d161d824bd1b9a9e9c6ab49457b12d856a8eeb4dba9fb2f3ea987fb88ef708aca88d0d654aeba4ade9d49dc190f9d3e18f86e2c2c874e017aabe7ea8f079 SHA512 47171fcafd8b7b316166e8ba565cc3126ccf2cca4b447abffb7120c34f9ea22243539857d040bf17c509862a9d42d564ccbe151e533a4961516799c5d73d30ab
diff --git a/net-dns/bind/bind-9.11.4_p2.ebuild b/net-dns/bind/bind-9.11.4_p2.ebuild
index 0fb30791db38..d01ae4435027 100644
--- a/net-dns/bind/bind-9.11.4_p2.ebuild
+++ b/net-dns/bind/bind-9.11.4_p2.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 6bbb398b8522..1bad5acb22ef 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index fd5d5e42b914..6133c590408e 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -12,5 +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.ebuild 1989 BLAKE2B 3c1e318030d8287b0db2b2ebda3e528703ac73bdf146c147c5c7f8929e9339f9c4c6df08fc829a0ad55f4634b0910e8acfeeb9a31577ba6e61663839c6978a5f SHA512 627c70f4bb60fdbea3f57e676acfb84ed0a4779b6b98b352be766463ca2c564ebcd1a540719e2085b59b8b87fd8dfe7bb1cc6b6d91ec5fe4aac79f53c3c1c496
 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
new file mode 100644
index 000000000000..6578419d4fef
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="debug doc +gmp json +modern_kernel +readline"
+
+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="
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	doc? ( >=app-text/dblatex-0.3.7 )
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/v${PV}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern_kernel && kernel_is lt 3 18; then
+			eerror "The modern_kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc pdf-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local mksuffix=""
+	use modern_kernel && mksuffix="-mk"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	docinto /usr/share/doc/${PF}/skels
+	dodoc "${D}"/etc/nftables/*
+	rm -R "${D}"/etc/nftables
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT%/}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f ${save_file} ]]; then
+		touch ${save_file}
+	fi
+
+	elog "If you wish to enable the firewall rules on boot (on systemd) you"
+	elog "will need to enable the nftables-restore service."
+	elog "    'systemd_enable_service basic.target ${PN}-restore.service'"
+	elog
+	elog "If you are creating firewall rules before the next system restart "
+	elog "the nftables-restore service must be manually started in order to "
+	elog "save those rules on shutdown."
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9caf45b90479..218d0c181e88 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -16,11 +16,19 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.2.1.4.tar.bz2 554756 BLAKE2B cfbc917fb12049a0e8817c478fcccb93b02634ad9aebcd31a839f934e52890f6c20dc2a7d10742d4e10ac0adb1500d9e6445b43390db5bc28874e610b9c07939 SHA512 3682399ddc743c03965e0c0c26b5714e611d186bddf9169524268488cc4f2d6e9e9fb3b2a4c24408cc247ce7d32f793fb35090f85b73a645bb0dd0e99c671564
+DIST shorewall-5.2.2.tar.bz2 557248 BLAKE2B d4fface30ef1bbeefda716b00373e686db73bd29bd2597d3f9950c5f4b3208205be8f321e84749fb92313633f7a6a2a37a493e4a826790d82e6bc6a8dd18bbd3 SHA512 0c4c3e51c2517a56fda2335f433033c8db66fcb843484b928979627b213be4e24408deb1e49df56f9a96e6b9c2a95d74789f07a365d4c4e6f17db96915520598
 DIST shorewall-core-5.2.1.4.tar.bz2 78957 BLAKE2B 7310813f4c4ac57378ed9565b1aa32fc3db3bcf9e1dc6e6307a7c399465a051110262dcb78c6d465a6227beeadc1f5c4a82d204c1926f66bcecf5469dc44b5e3 SHA512 9418cb6ef14def2a1a2c7879c6364881d80245ff5a59996bb71d093c14e67c6ce1d462d0217f0ae8574e9a916d3796f945dbececbe6b9851f892022f29a389c9
+DIST shorewall-core-5.2.2.tar.bz2 68223 BLAKE2B 33bc2b8a2ec2f76a909ddd73199462a470ed631029cebae37ca4a43d64a217e6e20fe0aa4c3002a2a5d0d3894a23634f45b4d5ecd916b96db44d3abcbd2fee58 SHA512 607fee1d17bb777e95346867d4dfeac5063f353d6bac6bc6ea625841746bb66a9959cd436a7340c18258188771bddf916e004ba81f256f01699cfda9c909cf7d
 DIST shorewall-docs-html-5.2.1.4.tar.bz2 4303361 BLAKE2B 22f7a94d9cb0de5ee9903e8d05498a6a6de6ea643f2d08b709bf9f8dd516ba507f80ed11207973884905421443eedf56e3693b9e42f5f372515b957e2be8132c SHA512 44bb66feecac927de6fe1cdfba9247e9f01c982c3b105f7cd68348fee0803b9b7bd76e7551528e0b2d6ff8e65e6ebf8a05c26831871a98565374692d6405f34a
+DIST shorewall-docs-html-5.2.2.tar.bz2 4302493 BLAKE2B 49c8f44aaeb3d06330ea293fafb7535096355bd4a151d8b4dfbc476d1e92c785360474d1b86754247ccff1f7198fd7f6f8e17da608f41a76642e73cafbdea65b SHA512 ea7fa5f6df6413e33c5fa9f043973c70351c9c99fe8e6095ccbe3e5b6e4667c4f89907fc995ab252c6a1aee5652b496e96d4e38b898ddd41b9e220f4edefa93e
 DIST shorewall-init-5.2.1.4.tar.bz2 34088 BLAKE2B f285b04e448584fe1f9a5528b6ddb6e16cbedcfda51f9c9925228835b2b065c658e9314ecad23364dc4ee21579fa113fe5a1c5581ea3e7c310d12744de64798d SHA512 58044bbcd2f30aaecb3c02374ca21a51b6f5fee49e9cf9565444649d64e3babd3070a72eddaccb52224201064e8642f9bcd9979bde41c13bfe10438720911d24
+DIST shorewall-init-5.2.2.tar.bz2 33578 BLAKE2B d8eb427e482f01fc59412b08cd58dc2317157570b266e5950ee34d17d504d9dfd886ecbfc861bc83b445b44b2cf85831ec2462acd54c9be519263e340af0d827 SHA512 4aaee33f2f6944498c88938796e987f05e16f2a4a761b1ec14a293ffd293d688bf39f913c426168a7162f3b0dba6679dc0392d9248bd43f678dd42e9532afbbe
 DIST shorewall-lite-5.2.1.4.tar.bz2 39858 BLAKE2B dcaf1adfc20640c22cdca20e2b786ec4ad2736567c0c5eec6cd22a95f0b0c461b24826afa933eac7a1ecffd836da55b8053a1370623d73dd6434b91d59d63e36 SHA512 25712a264ee615b4b0ae038836636ea07f4fedca721759b3860912838ef1aee4535831ed4dd8abd670e082e9f59bd52ac00fb0fd1c5907786bb239e270d5fdf1
+DIST shorewall-lite-5.2.2.tar.bz2 39421 BLAKE2B 6d24b62c54eed028785b6eb581be4659c1110c5e7d85caf3382b814edce0046064798a1ffb5100f04bc48bbac877969913f03e19883c33563bc7dfdb0bc48a3d SHA512 e49ee3eee13a4fe801c5d86aa85747a9543882a49b40454dad62154f772dc47adea84e967a4ef30b8c4c3e9964a04c76a794a318affe8eaac6cc107b255cca4a
 DIST shorewall6-5.2.1.4.tar.bz2 191855 BLAKE2B 3967e715ca88c85fd05f0cce1d4836c2b7f17b7a7360698c269b109f54dfbac2c4d67958c3c8c2d8cb74b5117d7f8ac30dc9ab3c09d97243cffe21ef3005c7b7 SHA512 8b49f187b7141c3eedb02c64a17fe8fa3f01e4b40b33184c4b4c5914e65557595828f87f3e1534abb973320b7a1103b10296b6dfc316ea78f698aeb61a0d63a1
+DIST shorewall6-5.2.2.tar.bz2 191037 BLAKE2B d774ab42658e2636fc15bc9dc04510c3a3745c9ebe204a27707237c168b476ee4fc247fb55c17b99069348947db1760d23c9f61d70a78231d8928e86eb312560 SHA512 5cf83e8c3fd940a6573de04afd29e37e3aa5d6908fffa276ff338b6818d0200b3d1e556420fcdf6989fe27dbef6e26f5a513ea566d70acb9a7db4bf1c3e6faf4
 DIST shorewall6-lite-5.2.1.4.tar.bz2 39599 BLAKE2B cb0e2b45fecc4c126504f5caafcd291e919542cd08fb53d69f89c11d4bca784744e2c6eedc0e86a234bcfe7dd9baee46498de1600bdba4475be6a705c92faa54 SHA512 a994cc1a37174ac085d784c5638eb9c5713e6f191260857c7b288a5ba5c54e3d99e88fb31a5b887d3d637edbd2ba8c7711575ca323d616f49b7a0595431b6e13
+DIST shorewall6-lite-5.2.2.tar.bz2 39148 BLAKE2B bcb0cb1b23cb4a486faafcfee588e11a6a50f6d151039ef15f396838b828ed803589d205717ad868140cc7d468f9309ac23dd34d307bbd8640a7791728102c55 SHA512 10f96bc42f47adebc581579b28ab2edb79876dccbf0a8c27d46234ac8fb9af8cb03730851188576bdb24278e9b19cb3cdef91bb4873cab0ef82064d54eeb176f
 EBUILD shorewall-5.2.1.4.ebuild 17106 BLAKE2B b8b7c9102d95232a92437c39851ed621d32d53e69cd44f7a6030670dda3db5e66e1a9639e2a434411b4e735189c43cf2ee40b141413cbcd8eb6b9ef5a5b2648e SHA512 40ecf6a362deff9174783baaeb87f418e17af3bd85814b8a20ff898ea531ffb13bfde13e1abe4b276ce7db93972e430ecdc73c8f622331ce05938f301a5a7adf
+EBUILD shorewall-5.2.2.ebuild 17113 BLAKE2B 499f2ed1f9a15e00412508717f6ddc96a45d6e1d36966cf63928aaf4acdfe86b4163a7c25d32ddc7fd0e3ce35ca8fda1596eb18173ba5ee5eff1161af3afb9a3 SHA512 bc791ae04d55763bd44e5200130fffc3b193105ff5993c9e936bb6004c518a0ec7884eb5a5d8589a282980690dfac3164f17d6f3b8df15ad2eba9f1dd42a796d
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.2.ebuild b/net-firewall/shorewall/shorewall-5.2.2.ebuild
new file mode 100644
index 000000000000..b12b3712acbb
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.2.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	# kernel >=4.19 has unified NF_CONNTRACK module, bug 671176
+	if kernel_is -lt 4 19; then
+		if use ipv4 || use lite4; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+			local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+			local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+		fi
+
+		if use ipv6 || use lite6; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+			local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+			local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+		fi
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+	sed -i \
+		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
+		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
+	eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
+	popd &>/dev/null || die
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+
+		pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+
+		pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+
+		pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+
+		pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
+		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
+		popd &>/dev/null || die
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		popd &>/dev/null || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		keepdir /var/lib/shorewall
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		keepdir /var/lib/shorewall6
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		keepdir /var/lib/shorewall-lite
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		keepdir /var/lib/shorewall6-lite
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 8281c1c0cd96..165613d07bd2 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -13,5 +13,5 @@ AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f
 DIST ufw-0.34_pre805.tar.gz 335875 BLAKE2B a2b654fe35a299ffd9978ef14a8d5667f799b654b6285bc81756c8081d9f4417b2fa9c05a234351d42709c2c57ff624b4fe7bca8ffe4d13cd12436feead6e4da SHA512 b8bba3bb8c423070d6434d1df7274423edf3a356415f54c6448fa0ff2d13a4b2ac21c4bb627cba01d6955b04f793eeaf2fc535c6221e7de48f11bef745035263
 DIST ufw-0.35.tar.gz 375310 BLAKE2B 3babf22e860ead6970c1386b0ab9fc3de364ba3f5c8bc0237be4a9446358fe058d216e7928d16eed8a148fbee5b82fc1d9e3b358f357c2fac236ae6f6b942a01 SHA512 b36c82559910634505648f717d19eb5a0cb1ce739a804359087e74c966869d0375c4ed5811954b32d2b5b51866f6ae1bec62a4a464f226b2eecc56b096f303fc
 EBUILD ufw-0.34_pre805-r2.ebuild 5375 BLAKE2B 8f58b7a30d61112af687860824cca03eb9a692aadd14ed94c166da6f3f00482bb9d978c58d7dec3c606fa6cf0c85a93743f2038a9a63f9ca91adb763440e56cd SHA512 63d693768d88d6503cd50ce18bbdd048ed94f44d943e5d36e4523c0ee4918db37ba14616ecbd57df018d6144396285e1c34495813f456035c3a1bb42a6472951
-EBUILD ufw-0.35-r1.ebuild 5641 BLAKE2B 0472612b2f8b16b3e6321aea7f3101506bb4a1b0d2784b1785947869d3e0af6633ae51c196855620bba0147bbfe1f8f953db03340deff3aa628ef62bdb91f235 SHA512 094d8bb245be93148de7d5139fc161f0688dc1d57b4dd57476db4076b3b45b744105cf3b39de4243fe5eb0b77965535fa4f7d5a0cd86a301a368c962d789a393
+EBUILD ufw-0.35-r1.ebuild 5637 BLAKE2B 510db5eac08e6ebf38ed2226e9be799cd474929d91ffd39b99ec91a88be9c5bfded0699b7970c51a8558aa76362e1016500812bfb06b7b50c1e0bad7d42bf2cf SHA512 63b5f8bb520c1a509aefb282fab119aa6325d18c46d4b9ad681c91cdc2dddf340f05f93d48212766acb96fd86161ffa2e932d1fb2ba07cc36b35b400b4bc5c4a
 MISC metadata.xml 537 BLAKE2B df149a361c11a14c166588434c1ed7dcc264f51374d2088cdf24feb67c08f10f0f002e28482befa34bdd6f0202300194ac91913d7f49bb3f0d8d16e7777ac13b SHA512 0fa137bf55e1506664168d3e56387c989ce0c7d5a8a0f8c36ce596e5f95a449e3bc35114188b786ebe5fc60d750c4240fafb4ca761f2e29000c23f9c01b5addc
diff --git a/net-firewall/ufw/ufw-0.35-r1.ebuild b/net-firewall/ufw/ufw-0.35-r1.ebuild
index d5b5aa280a4d..f0c9b79e35ff 100644
--- a/net-firewall/ufw/ufw-0.35-r1.ebuild
+++ b/net-firewall/ufw/ufw-0.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=6
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/ufw/${PV}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="examples ipv6"
 
 DEPEND="sys-devel/gettext"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 625769f66f45..d3947c4c43f6 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index cf340fa2407b..87a58cbb1344 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -1,21 +1,13 @@
-DIST mc-2018.09.06.23.26.56.tar.gz 1724855 BLAKE2B 6a100fd117830db096afd6b44b268e9dbe25185eb7ede56e300c6a4ac34e70a87f9184c77d54d52eda3eaece32bb6664bbeaac834624bab36d8c66e1bc31805d SHA512 2eafb9f9043d4931011c6b50cda5f8e9f794d56095de1f1cb4fb8110e109830ea6067f33b386ae2b1e8a7012f005fc0d0b0580ef70e3673c049ce81522635dc2
-DIST mc-2018.09.10.23.39.12.tar.gz 1725434 BLAKE2B bee959661fae0fccc9af655f84fab3ae4c900978b2fcfaf63287f717221065fc382f41618511c511dbe18f405b3fadfbbb2a66f1ed4a4b1c4db5d40f45b24f07 SHA512 c1183ed1499c4b3e24cf6494bd8f3b35e4d7aa9fb32d85b55d0464ef10eea25e4dd98730363d3b4d36d7cf288d652b7c2cf5738d2d3b82062f1d6f567a511af5
-DIST mc-2018.09.26.00.42.43.tar.gz 1727396 BLAKE2B 6f446229619e9116d9e8f62fc21d82aa5325b1d10d3786232741cf072fab18e5bccf14b1d49118532db5f6b0b4c2a792f15c28979af058cc75355e92fde88132 SHA512 e6be63004c0600b6e85ebd09033ebf3b7237f9829114b8b4e86c418015a94f465c26287221ddcf6371d5d414d2c037dc21a6136e1f6c8f1c27e363e0c67a1854
-DIST mc-2018.10.16.23.25.25.tar.gz 1749339 BLAKE2B b712b5111582b513c10ab1a39a9d7d5f0100fb1f6beb5e899f5e838ecd4428de4f3eda420e7c288e93b44a384c86fe65255ae086cb5adb99ffe19f8f364c09df SHA512 6d44a17fb469b2770ed9b278dcb72c9a8f3e738a4dfa4b9af888469b4228401639b74fb4891dc504fabb3def7319c367ffefb16897f6ea1d39af71c408c86af5
-DIST mc-2018.11.06.01.12.20.tar.gz 1752016 BLAKE2B 0bd0291cc16915e2da15e79842e78fb1286c5c952ecf0dfb68ae8ff6fcf9309982685d1bfdd44b53475d94953d31ab91a3e81b0031b51aafe387a6cbd2ef5683 SHA512 52ff2747e810ac5a35c764af5548a469fa94ab4e3e7d1e92be0c5d505e212bd8a5fc849c0c651d323eacb6c14cf5bdaf4f070c70d09e9dd876d4a1997e89e1b1
-DIST mc-2018.11.30.01.52.08.tar.gz 1732768 BLAKE2B 22c7329dc808c7d4900e8d7b738cb8ef35c084735e5bba721b9e461da63ac3aab7d1ff7d357cb2298f29c7775aa3f6043712fd02589efe3d03001ee75bbe2b0a SHA512 03fe52563ac3bb60f75c3074f2d628948856cc59bcbadb629af9e7eb7361ed2419ebd3d6024f226676f8c12170ef04c5651e092270ccd35029c9920b6ed5e4a2
 DIST mc-2018.12.05.22.59.07.tar.gz 1732742 BLAKE2B 33cf0023d3350d739567cf9d402f3011b83ec74801b3811c249944de2c1d0e67ee43afa1327ed41c6f4e259bb7c55f7839f8f9241dec05d4ffbe5d4406c2d9c7 SHA512 82f9784ce50810390bb991816455373c91d08b5e0630f85754a3abc66cfcfc74665cf8f5877cde10893583f1f9911e458e1caac9bcbddbf7b727e7c9f5f57a71
 DIST mc-2018.12.12.19.02.22.tar.gz 1734072 BLAKE2B 23539e764308d91012ec7fde5531066f88cf654f5cb98d9424b7697610df5dd0b0257f3926fbe35370b28c96abcb82c00fe4061e6cfe8adf8a130800a2bb3bef SHA512 c0f65b1e438f72716ff04e755654d021de37852f5eb2d2a16954c6b6e6356b9f9a31ce018b791e71c7deced82acb0be32c2bf4e27b4d6bd3ce9df91ecaf155cf
 DIST mc-2018.12.19.22.58.03.tar.gz 1732775 BLAKE2B 300a514c3eca52ab9b136c1d6a01055593d40f2b207229fa9f32f2fa3b3dce30a28fd4e39dd97ca51ddf920a91d2b45ecf44e843d7de9f271896717391f7242c SHA512 9fe0afbd4bb39d609b6e6e67a159997dd6b9ee43cc741282d05e9a55d4c24aa56258ad2eee08991112aa89002ac8a4c0042505b979d5ac49cb3714fd810da354
 DIST mc-2019.01.10.00.38.22.tar.gz 1791858 BLAKE2B ae89c935634190e347be8c2f0a3dfff12872b4eca7aa17b79b5e05d7cb9be6fe39ff7b0ccbb6ddf5851ae3ee84a89eebf289d801340519e91470b3f5c60f7c37 SHA512 626e5adf5a3dcda0945e5fb37394097550f2976626da50e795b389d1d78545b1a2907c9b9fded5ce26823694e7e3981a69fa18ed00ae21d5c405c69c165ae1ce
-EBUILD mc-2018.09.06.23.26.56.ebuild 1178 BLAKE2B 30e3b7ef2c39f0d0e930b7a1127ef9544077add85260ebe73251edf81f681934e85fa1dcdb2bb131f41b14a5fa12c8f627e54ef408f7b23f2dcea4fb78e390ac SHA512 19111a0ca521095705c8f09df126aa50325f99488c968a415f60874f63f370eca0f8043803464ffe9ca9753b0e445a809a2ed41fdda1f8fddcf93b00ab4bad29
-EBUILD mc-2018.09.10.23.39.12.ebuild 1178 BLAKE2B 1828f65d44b115d8a52690dbbdd6d2a756aec8b4ddd5e7ca4da0dc5c678d336adac6b7f4d78fd9118abf3c4293b879e4e584e913d3e5e6a262a965b21ca8a342 SHA512 f456334d9eaf2d41a2b8ffa3c50933fa8e8ec624ad02885eb63a0abe3d726fb890ded0d57059180157ff4aeabaa4b3849ed43497a6dc39d8648bc217c5454ebb
-EBUILD mc-2018.09.26.00.42.43.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
-EBUILD mc-2018.10.16.23.25.25.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
-EBUILD mc-2018.11.06.01.12.20.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
-EBUILD mc-2018.11.30.01.52.08.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
+DIST mc-2019.01.24.01.40.23.tar.gz 1791330 BLAKE2B a3fb0cb2cc199f4fe21c7770d58a3278d6a89a90916bd604293a5845064e337d36a5ac2e565d785a440803b6deefd84f114115a8f06dfc38d234225daa66a55e SHA512 215f91a8f4f325ffb8714d92a8030c36ada5251df4b24cb1d9b82d7f8d6c0f1188dfc2fdc36b1dcf8d842a805ccba3965977908a01e39e7893e05b131eb3b9b9
+DIST mc-2019.01.30.19.57.22.tar.gz 1792065 BLAKE2B bb4a43549f5ff520c944a057fdecb80e892b03d9bdcce918613221357049e7ffcd77d51dce44b1253a3c912762749515d823cc8fe14a2dc8fb72060ff3943bd6 SHA512 14892985cdeba341c71bb93e41d468cae1f763fa7eb7489e0172a9bdb19e0f65efe41af0c2022e4c30c4018c6ee511bd992dc2b8906275c25896f084621ce96a
 EBUILD mc-2018.12.05.22.59.07.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2018.12.12.19.02.22.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2018.12.19.22.58.03.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2019.01.10.00.38.22.ebuild 1175 BLAKE2B 61b24bb99216fb058dd20fcd87259f67e60cd486c642cb31cd7e445d15ece2275c45001a834b591e4e1b9b4b113185a8f1ebc1dadf011c52de433d1edc731ab1 SHA512 7da8bd683173d5a4aca42cff1776909f85b3a7bb84e5445b28f78e2c8b2b77a34f3fac4f92c8a7629dfc6cdc3977fc053f7b2108a0ae4b19957e0a7bb68a0dd1
+EBUILD mc-2019.01.24.01.40.23.ebuild 1175 BLAKE2B 61b24bb99216fb058dd20fcd87259f67e60cd486c642cb31cd7e445d15ece2275c45001a834b591e4e1b9b4b113185a8f1ebc1dadf011c52de433d1edc731ab1 SHA512 7da8bd683173d5a4aca42cff1776909f85b3a7bb84e5445b28f78e2c8b2b77a34f3fac4f92c8a7629dfc6cdc3977fc053f7b2108a0ae4b19957e0a7bb68a0dd1
+EBUILD mc-2019.01.30.19.57.22.ebuild 1175 BLAKE2B 61b24bb99216fb058dd20fcd87259f67e60cd486c642cb31cd7e445d15ece2275c45001a834b591e4e1b9b4b113185a8f1ebc1dadf011c52de433d1edc731ab1 SHA512 7da8bd683173d5a4aca42cff1776909f85b3a7bb84e5445b28f78e2c8b2b77a34f3fac4f92c8a7629dfc6cdc3977fc053f7b2108a0ae4b19957e0a7bb68a0dd1
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2018.09.06.23.26.56.ebuild b/net-fs/mc/mc-2018.09.06.23.26.56.ebuild
deleted file mode 100644
index 086aa2bbe8f6..000000000000
--- a/net-fs/mc/mc-2018.09.06.23.26.56.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 eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="0d0638b398e69887b5d7c0abcfb32882fd37b1fd"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2018.09.10.23.39.12.ebuild b/net-fs/mc/mc-2018.09.10.23.39.12.ebuild
deleted file mode 100644
index 053a1e297056..000000000000
--- a/net-fs/mc/mc-2018.09.10.23.39.12.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 eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2018.09.26.00.42.43.ebuild b/net-fs/mc/mc-2018.09.26.00.42.43.ebuild
deleted file mode 100644
index 28574278fd8c..000000000000
--- a/net-fs/mc/mc-2018.09.26.00.42.43.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2018.10.16.23.25.25.ebuild b/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
deleted file mode 100644
index 28574278fd8c..000000000000
--- a/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2018.11.06.01.12.20.ebuild b/net-fs/mc/mc-2018.11.06.01.12.20.ebuild
deleted file mode 100644
index 28574278fd8c..000000000000
--- a/net-fs/mc/mc-2018.11.06.01.12.20.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2018.11.30.01.52.08.ebuild b/net-fs/mc/mc-2018.11.30.01.52.08.ebuild
deleted file mode 100644
index 28574278fd8c..000000000000
--- a/net-fs/mc/mc-2018.11.30.01.52.08.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
-
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-
-EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
-
-EGO_PN="github.com/minio/mc"
-
-DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
-HOMEPAGE="https://github.com/minio/mc"
-SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-misc/mc"
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MC_RELEASE="${MY_PV}"
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md docs
-	dobin mc
-	newbashcomp autocomplete/bash_autocomplete ${PN}
-	popd  || die
-}
diff --git a/net-fs/mc/mc-2019.01.24.01.40.23.ebuild b/net-fs/mc/mc-2019.01.24.01.40.23.ebuild
new file mode 100644
index 000000000000..7a3a66e507b5
--- /dev/null
+++ b/net-fs/mc/mc-2019.01.24.01.40.23.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MC_RELEASE="${MY_PV}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/mc/mc-2019.01.30.19.57.22.ebuild b/net-fs/mc/mc-2019.01.30.19.57.22.ebuild
new file mode 100644
index 000000000000..7a3a66e507b5
--- /dev/null
+++ b/net-fs/mc/mc-2019.01.30.19.57.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MC_RELEASE="${MY_PV}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 98c0b1ff17d9..9dbf8b243a9f 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,28 +1,18 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
-DIST minio-2018.10.18.00.28.58.tar.gz 9153624 BLAKE2B be2b9db53f0256bb7db1a1917003051ec0484d876702a54ea81ed38ae2853de296129a0ac1e5fbbf6e056bc5ac82e7ba389008001195f4b20daa8545275c9215 SHA512 64abcd10ade42f9bcecf498b2855426b8fbd2be428aa5aaa134295709849f8ebb57aede1d67a7302c7d05b8a861d5076a04ad126bc66d1fc9d4c45368e5e9cf1
-DIST minio-2018.10.25.01.27.03.tar.gz 9083869 BLAKE2B 8adc52a4557bde234c367b1a0d3a3ca5651700cdaca4c0cd3c1ff55d64ef7bb6f5dbb48eee9867eb7677293abdcd34e9469bd3980f7046934db17d1fa72229ea SHA512 8227a0b320877131b5822e077f3ee2cc03268de2c1f9a13dbc34f8ade8828b20afda964f1d389f311547750b8a7a613037042fe2a10f30610972a8d6eb4f40fd
-DIST minio-2018.11.06.01.01.02.tar.gz 9090585 BLAKE2B e7cfcdd0eb89fe1c65ceaa7893c2f2c5c4667bea689c2e42ec1f09969590ed06b2a5977015206ee18bb7a5481c9e82b4311c2719cae6df1fd2c3b5da87f9f1fb SHA512 f3d51f5a2c15b2c7cad0679fcb6c72647e090e64efb5e29ad04519fb8870809044f3ae6c2f95a36ad2f0ffb7401e602ea8f5d2f4e5b61c8b60082339b9b91c68
-DIST minio-2018.11.15.01.26.07.tar.gz 9075498 BLAKE2B 8b690a05a597d0c1d3212891a47f0db944817855138dccf7806f023f6e1e0028287cca3a96df28c36d6f91fea2117abb1a417c23863e5d1464430dd0f40c977c SHA512 aeaf3e4d3be48496742a48b9d7c0b49e040c6f5cc0501668b13aa1e81c64f759b547ab5c910d1fbc2d270d3f42b1b890c41043ad79edbbbbbf2caea74b6245d6
-DIST minio-2018.11.17.01.23.48.tar.gz 9076785 BLAKE2B 3dbbda0ee971d2ecedeff96fa61b2d5f3710361f34ded69075515c7cf9fa40e411360e68d04b85f43fc7082f66ff779368a984a5c1f429c4660b64c6f65dfdc1 SHA512 e460ae63bc2e23d4706c396d76c06c66fb61f20fa10544470b28f1764e64be7ed45c33b65fbb9386e7a07e374a29d700c3df2b794dd6e6bd6322e7ea40ad3434
-DIST minio-2018.11.22.02.51.56.tar.gz 9076540 BLAKE2B 61c153be20ec924c42575beed8ac6b44558f16ad630d47bb8d6e22436bdad40d9d192db20c9393d6572b9b30f09a7290f1d2c30bce8e2342b6923eb1ae1745fa SHA512 49be8aa991dbe3c46a8e656f5900924742cb09ac3d8959cc77b33893e8f698f9f5fd9c6b8e35a9c3458fdacde74905ee6c8a2ce7f82be2582d607764ac8dc63a
-DIST minio-2018.11.30.03.56.59.tar.gz 9085930 BLAKE2B 445ad82c4c3829fa62554d5ee16deae9a13a5f38111b1c01b891e886c6cd3e742ebdbfd0e4d1984bf4156423b0d1189dfd742e04455dee433a946a192f6f3924 SHA512 b93d8dc79c9bfbbc3e35960478836c953bb26bff533977c7e449395d0a947716115c28e3652c3c6ec632599f058ca25679995014ecdd22718b2d4b77d0a8fc6b
 DIST minio-2018.12.06.01.27.43.tar.gz 9087439 BLAKE2B fbbde99442ce0b1573251ca93a5ad4323c1ce68263d2f5c3c0fd6631868dc5110b7179aabdb5ded260def669fdddbd0f9eae6a543ecf1a74d9fb9825ebdd8bd2 SHA512 1ac070f9358acee7d51895965aedeb85b79080842d7dc4012c48ad5cdb6d73bb4cd53d60edcac0fe7d0571ef7a2276d055a5505c73fd3ffa82cac4508df999c9
 DIST minio-2018.12.13.02.04.19.tar.gz 9091219 BLAKE2B 7d4619cb3d88c4c115e0361edecf73df7d7d6b5ed86487653aa8ee30c75bf1fbb026011b25d8a5270616b89d1c3a9df3ca1aedb6d4339914e48744982c79991a SHA512 4d4542644738ffd8541ad118f74957aee272afa47c82469cda85994aa4c228dcf08126606c4cf3684c5a2a0ca9a55c1841230dfd0983dc17c4873e8ecceb7176
 DIST minio-2018.12.19.23.46.24.tar.gz 9096254 BLAKE2B 252c8e84e9df0f5e2f85f5f5a0930a53f960b25c03a381961adeb338f70d7ec3e172c369fb52c4aa14c039e48c0611f90f627ede797b3469ed08d2a4ffd0653c SHA512 c1acfca6fdba3490fcd89e0c910b0b9da0c2ca04fe8e5d17acf6001f313fa7ba64a548921a35c531e9998f7bef1535fc239e95382f78e2ee0a9fd40bc87bb2bc
 DIST minio-2018.12.27.18.33.08.tar.gz 9102593 BLAKE2B 40e1a014edcfe84f9310bd09b0d4e5853b3ef8e1cc7e1a0805aaf83f55320a516df0c930c78d5b7726625d9f2d521dbee534b949f31b63438ac19971f75e493c SHA512 92ec8b8d1094d3b125f3522063895274e9aa0144063c4ac64a3919dfc65a6ee26e7a1bc03063f61acdb6b5b14681448f3451598939a8f17d107205091049279c
 DIST minio-2019.01.10.00.21.20.tar.gz 9272639 BLAKE2B e8d64c436795894ad6e20cfc5acc193598312a6c1d7e20b58a1250f0bcc4791f004afd1dfed4d0e2d506f4690290d0d29596a263853c216456555792e84da5b2 SHA512 fe68bbd56f131ba4e189114b45fbf2f95925cce3a11384503c67debdc9eb04cf1c034f28f792adbcca373783cf74f3f57853a6e61241a5864898e19946c31e6f
 DIST minio-2019.01.16.21.44.08.tar.gz 9284989 BLAKE2B f54ecdd5892375c2bc8c3f2c8dc0144ee61c4e94342e12a27d8c55e1745b74c82a480a5562274553d2a5c968fc252ec8b95d0c708405089304b63520eb10405a SHA512 457c2adfe15a70c39fba8e8c7ac6dfa3dccc7265a725c932f57d4e45b5285859ce45701c8c7fa953300ad28322a46d1083f27e668ada5c3616c62337cdaf006c
-EBUILD minio-2018.10.18.00.28.58.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.10.25.01.27.03.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.11.06.01.01.02.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.11.15.01.26.07.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.11.17.01.23.48.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.11.22.02.51.56.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.11.30.03.56.59.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
+DIST minio-2019.01.23.23.18.58.tar.gz 9154650 BLAKE2B 4dd2f34edef4b994af25b1bc83fadc5993522f9ee9e54ef620fe54b43076f0fe147fe1343375343d6cc6c47ca31f762e9a033dfc2b3de76cfd55307f6fe36912 SHA512 49cb40f5eaccc2dd76aeb699ce8376d9d665860f38c93748b97cbd589dfeaf4301964659a32fe20a7174be3462c6269446810b9443a1688874c95a95acf5b22e
+DIST minio-2019.01.31.00.31.19.tar.gz 9109493 BLAKE2B 8d39e4edb0bc47b31e26fcd981be260ab90dbcb92e85700f9be691deda40d5ffb33003cfa59307647ab606d547ef461689b41e174ba3ed5ac6416bdc23d033d3 SHA512 f5f064c7a45f2844d445b955884764dce0bfcd37be469dc4a3b7fc17697dcee46415f0f17fa125b161c73cac076409e9a16f572020b82765d9ebf23d4bfba5e5
 EBUILD minio-2018.12.06.01.27.43.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.12.13.02.04.19.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.12.19.23.46.24.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.12.27.18.33.08.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
 EBUILD minio-2019.01.10.00.21.20.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
 EBUILD minio-2019.01.16.21.44.08.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
+EBUILD minio-2019.01.23.23.18.58.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
+EBUILD minio-2019.01.31.00.31.19.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2018.10.18.00.28.58.ebuild b/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.10.25.01.27.03.ebuild b/net-fs/minio/minio-2018.10.25.01.27.03.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.10.25.01.27.03.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.11.06.01.01.02.ebuild b/net-fs/minio/minio-2018.11.06.01.01.02.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.11.06.01.01.02.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.11.15.01.26.07.ebuild b/net-fs/minio/minio-2018.11.15.01.26.07.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.11.15.01.26.07.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.11.17.01.23.48.ebuild b/net-fs/minio/minio-2018.11.17.01.23.48.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.11.17.01.23.48.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.11.22.02.51.56.ebuild b/net-fs/minio/minio-2018.11.22.02.51.56.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.11.22.02.51.56.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2018.11.30.03.56.59.ebuild b/net-fs/minio/minio-2018.11.30.03.56.59.ebuild
deleted file mode 100644
index 9adcc45356de..000000000000
--- a/net-fs/minio/minio-2018.11.30.03.56.59.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user golang-build golang-vcs-snapshot eapi7-ver
-
-EGO_PN="github.com/minio/minio"
-MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
-MY_PV=${MY_PV//./-}
-EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
-ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="An Amazon S3 compatible object storage server"
-HOMEPAGE="https://github.com/minio/minio"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
-		-e "s/-s //"\
-		-e "/time/d"\
-		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
-		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	MINIO_RELEASE="${MY_PV}"
-	go run buildscripts/gen-ldflags.go
-	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
-	dobin minio
-	popd  || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-}
diff --git a/net-fs/minio/minio-2019.01.23.23.18.58.ebuild b/net-fs/minio/minio-2019.01.23.23.18.58.ebuild
new file mode 100644
index 000000000000..8154fe5911ee
--- /dev/null
+++ b/net-fs/minio/minio-2019.01.23.23.18.58.ebuild
@@ -0,0 +1,53 @@
+# 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 eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~amd64-linux"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/minio/minio-2019.01.31.00.31.19.ebuild b/net-fs/minio/minio-2019.01.31.00.31.19.ebuild
new file mode 100644
index 000000000000..8154fe5911ee
--- /dev/null
+++ b/net-fs/minio/minio-2019.01.31.00.31.19.ebuild
@@ -0,0 +1,53 @@
+# 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 eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~amd64-linux"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d38919640511..649a83a8f795 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -22,11 +22,11 @@ DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.8.8.tar.gz 17742757 BLAKE2B 2d5f51b9702a01227a7527a5500f35484f2c743aa1599c7e2f30438cab9c5ac0e6aa8d53d699cbb94c08e77c30a7306b08472538d46981cbca518d6f3d3186ce SHA512 2fac0d15de924dabbd5f6d8f4050239cb7b293abcba7b82a4a56708f68b9a4a1291cd1dd6f8bd6273c621e1b5727bc58cce0ca097dfff51d3417145defff64ee
 DIST samba-4.9.4.tar.gz 18053738 BLAKE2B 337444e55fc8a8864e3960609719087e64e7d14faaf150c510b9011f67ffdc8a9bd6533c60be938e742db8a2e5401a065e7d14fae0480ee7a996a1f71ef0448d SHA512 ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617
-EBUILD samba-4.10.0_rc1-r1.ebuild 9007 BLAKE2B 720eb3bb220b00468b9942bb2096c6706269a4f9b69491eb4d73bfb0100230ddaeef964cc55a368e9e065224ee472b3cdeebd7948120d80bf6ad4c5a4fdd6bb0 SHA512 604aa9a37fce231f604d823e2891222594b36b1d5f968bcb350cc3eb375d4a5e5cb68b5fb6e99dd3a84643faf4b845bb98a0e9564d7a13008de4e462139465b1
+EBUILD samba-4.10.0_rc1-r1.ebuild 9007 BLAKE2B d35aa9b2c6b078919d65d623191d2699fcb6ee10a6299459d62954f0e6778f33ea6cba0cb28e6cd3fb6bc6e5f02c7c954055634043a9b28db151c25ed7a84397 SHA512 020067472a52b93dbe7c53442be982f0f27dddb8a5ea7341be41081173de5e44ac4d87aeea594057b5491a5042ed1db76e3d7a07516f614a44e161e3a9c29ea2
 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.6-r2.ebuild 8462 BLAKE2B caa399ff4aab4c9dd23bfa8ed8c22b592bc3ed0cba6fe53c90247106abe6995ac4f127d6681c1a86c8ed5879e7a9d9e87a6e00f5c6474ada93076318f12dda39 SHA512 3b8d86d9191e37b4a28c205767db0cab39c76be2de3fb1c5d67f4b0ff1ff5b9e13cec0d712f105bc48d36b5dc2ad80f06893682154415be74156854516158df6
-EBUILD samba-4.8.6-r3.ebuild 8855 BLAKE2B 619b2d64551bda97a58611155e0743c7b976660310df202d9507d2e09e752a92ae0c6c92467becaba7025724ddd65e508a74c343b527fc07394a06e3afa1cf4d SHA512 804670eb865c840705cef4ed6f046f0bdfe52d3161c1671d3ce44552a4e658ac61104c865e6d7969f91a85313e1ae6deed3553de7af10fb606afc5051dbfb736
-EBUILD samba-4.8.8-r1.ebuild 8850 BLAKE2B 8962a10f10fcd1bf29a79db78c7e6b4758744d86274c90ce5b6daeb5f29288b2fc5de23c2e889f525a8bafceb0e35c37b2b96a5de77b2be4f1f0b8b1e494fd3e SHA512 760dffe321debc2600524a9750081010795963e3b91f9cd17807f19041bb17d56315f545b64c541e277c3057de80a7752d38af6df8bc313918a7ab56006130b1
-EBUILD samba-4.9.4-r1.ebuild 8947 BLAKE2B bec759914509108e2e59237612228e497118f1cc487ce36594ffc15d6773eaaa5f9e1516a162ba082bb0f9f70e80952eb0f2a5961e4f87293edad3eb01caba3f SHA512 fab0ea259e537c132deb493a6539fc6aae568eff72aa43a4a0343746f08e5a288d9d0ab6b7a44003485addbaa47325994c1e8137696b4269a7353011de0c1b15
+EBUILD samba-4.8.6-r3.ebuild 8855 BLAKE2B 65409036495551ef9f72a8e640c627e6e7b7f65f1fbf3b28b222cf1bf8b2565462983c39cc9fec0c4b95cb7ae4b0dbe4a989cd7bdf7d1457bd1e51d8dd61f859 SHA512 5b93b671a45b73a681b29ddc75676bd4e69cd23f6e31606f112e4e4984ab4e2022f741234b9df02b1eb57cf5e0c083c91d06b55918ed9f23c20ba6789e40c21b
+EBUILD samba-4.8.8-r1.ebuild 8850 BLAKE2B 865f274d5ef8175bf107c4875d747ce7be7c96b15ebc82ad63c1c1b686c995f430ad6a14693ec380bbc1ff4cb6963a2ac376aaadaac4c4214c5cb259fb964a7f SHA512 a05c1c17494de672287bf7322a525acee83277d32dbede9a906721cbe66f248486faba574454667c8cf25cf2c2e38f81486bc36135af7048cb9891a84744016d
+EBUILD samba-4.9.4-r1.ebuild 9009 BLAKE2B dcbfc2bc96472a42a2ddbc957aa5bf3e6315825f36b933c5fe5f68da12ff6aaf12210191643b03324e3aba0ec98aed4e7e24f9b0228ed7ad5433cc980128f4a7 SHA512 c0921e0fd02d6df12decb83746bea4c5a201494e991e05fed4d5f141577d06cbead23ea5bdc0cd1b52a07721be9e414409c7552b3b72ba126887cd7524b91e5e
 MISC metadata.xml 1673 BLAKE2B 56bdd566235a3db45ebcbb546a11c12b035b41f54bd00df2fbb65f47ff29c7a2ab5466cdaff8fef6fd72a7b5fc9af2bac1e4050bfd6db3220c32ac383eeeeb1a SHA512 2436c4c24de5cebee90c6fb49d52dd9228a3f0deced53701d229f1afa3bb7eb29621864678325381dfacd1d221142368b27d4800ebd2412b18595ab106ddff01
diff --git a/net-fs/samba/samba-4.10.0_rc1-r1.ebuild b/net-fs/samba/samba-4.10.0_rc1-r1.ebuild
index 842a8c1c5c99..ee0899ac915f 100644
--- a/net-fs/samba/samba-4.10.0_rc1-r1.ebuild
+++ b/net-fs/samba/samba-4.10.0_rc1-r1.ebuild
@@ -99,7 +99,7 @@ DEPEND="${CDEPEND}
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
 			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
+			>=net-libs/socket_wrapper-1.1.9
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild
index dce949b29391..742b6cd1b8ef 100644
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r3.ebuild
@@ -98,7 +98,7 @@ DEPEND="${CDEPEND}
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
 			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
+			>=net-libs/socket_wrapper-1.1.9
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
diff --git a/net-fs/samba/samba-4.8.8-r1.ebuild b/net-fs/samba/samba-4.8.8-r1.ebuild
index ed0d3aa61ee8..e004ef37a587 100644
--- a/net-fs/samba/samba-4.8.8-r1.ebuild
+++ b/net-fs/samba/samba-4.8.8-r1.ebuild
@@ -98,7 +98,7 @@ DEPEND="${CDEPEND}
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
 			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
+			>=net-libs/socket_wrapper-1.1.9
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
diff --git a/net-fs/samba/samba-4.9.4-r1.ebuild b/net-fs/samba/samba-4.9.4-r1.ebuild
index 894547a6d787..27d25a8f1132 100644
--- a/net-fs/samba/samba-4.9.4-r1.ebuild
+++ b/net-fs/samba/samba-4.9.4-r1.ebuild
@@ -99,7 +99,7 @@ DEPEND="${CDEPEND}
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
 			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
+			>=net-libs/socket_wrapper-1.1.9
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
@@ -214,7 +214,7 @@ multilib_src_configure() {
 		$(multilib_native_usex python '' '--disable-python')
 		$(multilib_native_use_enable zeroconf avahi)
 		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(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)
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index ee08b4ee458a..af2bfbf55aab 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 1dca16f7a04f..e4c2f49fa9d0 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,8 +3,10 @@ DIST FileZilla_3.34.0_src.tar.bz2 4869893 BLAKE2B 43f017a833191126526195636607b7
 DIST FileZilla_3.37.4_src.tar.bz2 4983335 BLAKE2B 16929caca3aabfdea406469a4128878f3cc48b347084d5d362ad206a7549be129195e8f111324b259e64d8e9324d9decd4bb51d088367fcaa560ec1feeb03570 SHA512 3f6697fd411b898f0db375bba7e6a34157c73274ee463832c38a4897240d990654c447baad8b0024492cb882106e7e63757d54401c487cfad96038d1f5eabfea
 DIST FileZilla_3.38.1_src.tar.bz2 4983087 BLAKE2B a19b80b35535485fd1c03aa36a85aa1f894b106d09d1b78ab7e02fec6cec3e78e0612c343694e5fabaa2202802d2ba2cd2aa4e4d0840342f17c60c06c0c8bcf8 SHA512 a224c6f65253ceeef1f3049fd6304533a7efb427707c73481d3973d06e3b887f2511bc705e718a1018b287940c3d682794c6cf3d0e8d9e3c403a1e2f14ed01fc
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
+DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
 EBUILD filezilla-3.34.0.ebuild 1803 BLAKE2B c04510be956992888544049b5b6c837c377f72b695fb5800471c6f727b1a9c2926aef3db754846bcff850e7cfb3ea5a4c505272b76aaa35be19ec940cbf13561 SHA512 fd8e85a7b5d9755bab0379ed38a79750d0b9baf4b0a244779e0c49f72df566cefb14bea83eb00c20ff1bb9ad3f318c680b94c73fc5222025e25c6f1a40e5ec7e
 EBUILD filezilla-3.37.4.ebuild 1773 BLAKE2B f4047b62f61357055ef3dd02bb1c86c73e8813ba9fd1af34dc605b9925aeaff810d61c920672ce614174cae80ba3366b0d6cc8db3872227f3d2b0ae4c34211b3 SHA512 99bbd32e2a1c4f2944dbbe15b21b0ca6e572614e536270763de8b1bb863bafd333c7865df4282171b15adfe5e4e8421e8ce59dfd63e36d3bdba65d8799674265
 EBUILD filezilla-3.38.1.ebuild 1773 BLAKE2B 237c7d4f03842a478d3fbcacc77dd851f682b4ff8e5743f5a85f4275dbb73507d45d77a2ea39138076f3137435c8fd63063720d9469e1e0b6a006937220c1f4d SHA512 6de6bf7356480bcbfc8e9123fc9def256710c0335357aa401b958425e9532617e286574e041b39b2ff8260fa1fc13d23de4beb3bc8007e28e8112f6bf454787a
 EBUILD filezilla-3.39.0.ebuild 1773 BLAKE2B ee08653a3cb9bd33a4f1534389bf330877dfa3fa92c22217a0e43046ed8d42523904b74525cd84f18612ebace2d266003e1e6ec8290d1b723366c4efad7ffaae SHA512 0fba922d5f4be687e8870c8faf69a19a7601b2e8af75fba1f4a5a37fc2be125dd29fa3382bbea052cd4f425047e73e866f2734210054c10f957a0f61b4125431
+EBUILD filezilla-3.40.0.ebuild 1773 BLAKE2B f3d7b9724a434a96c8a084cbee5039b6275b4855c38547a43bcae0575e6b1a1b51350ee52564c956514763b2805848d668e93c23b779d268a14f730b4e03024c SHA512 51a72bd06eb89c7e1e72d11ff526e31d5869efa55d9fda2e81a64d8b8cdd964dcc9ce1bbe1f49875188fed14ae6b534842a73a510be00c8a8c30f6ec52d637c2
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.40.0.ebuild b/net-ftp/filezilla/filezilla-3.40.0.ebuild
new file mode 100644
index 000000000000..aa2e664800ab
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.40.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic gnome2-utils wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.15.1
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.4.15
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( >=dev-util/cppunit-1.13.0 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_prepare() {
+	setup-wxwidgets
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-pugixml=system \
+		--disable-autoupdatecheck
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 54ff1fbc49e8..ba554e425e8b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest
index 6fdea49459e0..a2e306f113fb 100644
--- a/net-im/sendxmpp/Manifest
+++ b/net-im/sendxmpp/Manifest
@@ -1,5 +1,5 @@
 DIST sendxmpp-1.24.tar.gz 9657 BLAKE2B c1dbf65c031d7178b996b4309cab149038774c40aa903185d99f1cf26c9a803b623d5a72e3991e30c929b9f236d7cfe2e2828e92b1f135e7e791e001d58142e1 SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842
 DIST sendxmpp_1.23.orig.tar.gz 9196 BLAKE2B 16ec292478610d58c92ea50a46e24ac86656102966dfda3eb917b65af7c6cb13fb254b257fbf78d1f8040e2237d378450774c72f090c22cbd2bd3aed77da1367 SHA512 65cbda52450a3537982d0c8f94265a1f8c336379ea4e4bc56c772bb613ea03fe25feb85fb4c8e3b26a48ad03d0c5e07188268e07c1da9981cb1dab87b17d9ba8
 EBUILD sendxmpp-1.23.ebuild 520 BLAKE2B fe783206d54370c55309b77de5c894e90f7880247d9b359951bc68d3f08e2d6f0fb8741a9b106db6416fe4f6902e7dc2f77600ee35d991f8ecd251dbbffa8ca0 SHA512 e33d5b689932055d70a1ffcb0f199733c1236d0b0a1f901946efc9a54b02346de2a6fb9f0febadfb5fbe825ee53f0d402a42268cb476c5b18aa17e2b8b74da22
-EBUILD sendxmpp-1.24.ebuild 496 BLAKE2B 981a01b73a0af818961093c2bd4695b590efe3940a7347a52555ee01a80ed97e96a021bf61532f1ba1644df6a9551ffcdbd470f5be1c47496c8863adee2c0499 SHA512 d47476d84c82e581693d40581794f3c7e197339101cba6c5ed7cd27654a7fe146409ccd21bbea5cc8e36ce963a4aee7db21d7369a6815d4db72b4e2585ee50d4
+EBUILD sendxmpp-1.24.ebuild 491 BLAKE2B ec47a6a7ac356d25467652bf17ca287addfd8c2efbac73e0ff69e830a8ab8829caedf0a17d12033981b13e0016407605ad25c4dc45ba2424064237b506aaff71 SHA512 ff0d4703f7e0a644a45b4b6fbbd51247b69b8bd0ee7c46b2b31f54c2ec8311399173f06c697e0f4564fb3d7b4b6f1bb190a55ff4226a07797fe0b79ea1f382c1
 MISC metadata.xml 246 BLAKE2B 113c4d0217bba0bce6df81f39bc20882e47ed9dded43fb367e2c6c545fe1092ddea56d00d6e8d4f80cd751804f0206bb486795ee4ab592a85bc8937a879e7650 SHA512 b64c7aae46e2d47987372d30818221d17e5635606a61a1f87737bd3820e9db37d6ad91a470fdeac55fe42c85d3e86f3c28e81d45bc7a0d5440f8c6d5f52bd28d
diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild
index 6f0f864fb38b..91478bd62d4b 100644
--- a/net-im/sendxmpp/sendxmpp-1.24.ebuild
+++ b/net-im/sendxmpp/sendxmpp-1.24.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://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 hppa ~ppc sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Net-XMPP
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index c3c49e373f72..583c57c3f560 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -3,6 +3,8 @@ AUX spectrum2-2.0.9-use_qt5_libcommuni.patch 2428 BLAKE2B d6f377f9ac1d99d5af51a6
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785
+DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
 DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982
+EBUILD spectrum2-2.0.10.ebuild 2862 BLAKE2B 10a32320909ffcacd099979062f557f6e5b9bc9f9c0a4fb1c698d2ce2845741b6f6b89d7370b61b93263440f07dbde67dd2561b6b12afc25a12740df81c0b8c4 SHA512 3a37a2fa257f54b422cc4a3f60bf3ee725dbce7fd311b55159a52ea70511c4094f305066234083714411652b384853af0aade34ca3ec12647ff4ff3c48598c7a
 EBUILD spectrum2-2.0.9.ebuild 2901 BLAKE2B c0dedfd2f7693469ce936daf90ce512546239343a387a453798e5c48e964b886df8355d0716c6e447a8bf378098994ca403f35b271a7e3a742b81ab15a44a844 SHA512 2f9c427748e3ccbeac88986e82b83ed785b6f950a04ba18fc6049309e494b9f4f9bd0d72df2eb7757eba80a07e6f3431479a3bce86bd00537f3ae734ef172f07
 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild
new file mode 100644
index 000000000000..285dd6d49820
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	net-im/swift:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		dev-util/cppunit
+		net-irc/ngircd
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" )
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup spectrum
+	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+	use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	# Respect users CFLAGS, when compiling for debug mode
+	# Since Spectrum2 searches for a qt4 compiled libcommuni,
+	# it must be patched, to find the qt5 compiled libcommuni,
+	# See: https://github.com/SpectrumIM/spectrum2/pull/253
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
+
+	einstalldocs
+}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index ac464da24f54..b1b4128b8a13 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -2,5 +2,4 @@ AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
 EBUILD swift-4.0.2-r1.ebuild 4328 BLAKE2B abe8a088feb575117ef747e8069ad87244438b24886134e02b12dce5a7d3e5e9d7cc0676422ce2778b59d2eee67f3ad7bcaaded2a9bf67ba6f93e48cb5652404 SHA512 00c5ef5b7941be9b5ba2090121fbed3355dbdc31e0476cde5f764b13a531d0a361c8ef1d15a8dd388fc639691005585f118d3a0ad1b4666c231a0e3e827dbf96
-EBUILD swift-4.0.2.ebuild 4329 BLAKE2B cac1a60927e5ee80d8827963253b5e1f3972ea795d0048ec7b59b876e701aa5925ddaf77d1b57f716e821e2234a1290a2fce3178085980529b3b437d7ea1d1fe SHA512 4e267eb44ac4d7a4c529c948cdfd6717ee7e5fa41000f1df30a842386e424cfd33621696a5dd471b12c853d26b6e52a4d7b42f1a3617f7d3a9248c0f415114f0
 MISC metadata.xml 970 BLAKE2B ff45a5b75d9ec07a6d6bd1e65acaac799f56ef2f01d689d3e5e887a9a135e7d446a789c4d0445a64f1d904386d7c9ff0d12a990d71df024ab2f647bb8bf19a27 SHA512 6e820b2770aa305bfc1a1c9605f62404ee35485759451ce7fb1155329f666182238a8075f1e2ebcc77b1e9e5896040bca8ecbd541a813be5b09bcd2aa6ae2584
diff --git a/net-im/swift/swift-4.0.2.ebuild b/net-im/swift/swift-4.0.2.ebuild
deleted file mode 100644
index c67278ade281..000000000000
--- a/net-im/swift/swift-4.0.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils scons-utils toolchain-funcs
-
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
-HOMEPAGE="https://www.swift.im/"
-SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz"
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="~amd64"
-IUSE="client expat gconf +icu +idn lua spell test zeroconf"
-REQUIRED_USE="
-	|| ( icu idn )
-	gconf? ( client )
-	spell? ( client )
-"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-libs/zlib:=
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	lua? ( dev-lang/lua:= )
-	spell? ( app-text/hunspell:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
-	test? ( net-dns/avahi )
-"
-
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
-RESTRICT="test"
-
-DOCS=(
-	"DEVELOPMENT.md"
-	"README.md"
-	"Swiften/ChangeLog.md"
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
-	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-)
-
-src_prepare() {
-	default
-
-	# Hack for finding Qt system libs
-	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die
-
-	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
-	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
-
-	# Remove '3rdParty', as the system libs should be used
-	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
-	local my3rdparty=(
-		Boost
-		Breakpad
-		DocBook
-		Expat
-		LCov
-		Ldns
-		LibIDN
-		LibMiniUPnPc
-		LibNATPMP
-		Lua
-		OpenSSL
-		SCons
-		SQLite
-		Unbound
-		ZLib
-	)
-
-	if use test; then
-		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
-	else
-		rm -fr 3rdParty || die
-	fi
-}
-
-src_configure() {
-	MYSCONS=(
-		ar="$(tc-getAR)"
-		allow_warnings="yes"
-		assertions="no"
-		build_examples="yes"
-		boost_bundled_enable="false"
-		boost_force_bundled="false"
-		cc="$(tc-getCC)"
-		ccache="no"
-		ccflags="${CFLAGS}"
-		coverage="no"
-		cxx="$(tc-getCXX)"
-		cxxflags="${CXXFLAGS}"
-		debug="no"
-		distcc="no"
-		experimental="yes"
-		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
-		icu="$(usex icu)"
-		install_git_hooks="no"
-		libidn_bundled_enable="false"
-		libminiupnpc_force_bundled="false"
-		libnatpmp_force_bundled="false"
-		link="$(tc-getCXX)"
-		linkflags="${LDFLAGS}"
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED%/}/usr"
-		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && gnome2_icon_cache_update
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index cd28c984fd9a..f6aef9b46ef0 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 131c2807fe6f..22bff18fcacc 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -5,6 +5,9 @@ AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501a
 AUX epic5-1.1.10-xlocale.patch 350 BLAKE2B 4c2fe87d2bd42bee7cea05ab3426403836bb43a8136ee49f62ffdce3efc40690300a024b46f502a820cc1945577641afe25fab154f2c5393556caedaad360a04 SHA512 bb04eb98d4ce1c4f1b02d7572ad6722e6ad90ab68b4d22319a2285888c039cbc51e837193f78a93fb59c2c2caceb8fcb11d1e6125a4bc4432eddc98ee9c3ba55
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
 AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
+AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
+DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
 EBUILD epic5-1.1.10-r2.ebuild 1849 BLAKE2B e8567259e61a5e33fb1930296900cad6ac23c82f1b099fec405cd5b3295ad72663547da7553ecad9996a1846ccb337c41068d3b609fa324fbf6a8f138531a751 SHA512 86703fe7e6f5eada432846b7cacde9a300a5f7ca008a2708e0a531e6797ac1a330987bd0484e133e0608858f97776f983c1b2a7e7a646f0c203e207186d51cae
+EBUILD epic5-2.0.1.ebuild 1564 BLAKE2B 0b0306d8f7f9276367844d986cedf578b25c882d606de7b697c90e19ac83d233bfe9aafafb9eded723a08a0e96d95296c77d51a1414aab1c45a04fea1dbf0f7b SHA512 e9809cd9a8a189b3166beca5511c3acfdd2e59ee1fdefbb50973120a62f714682e71a13be45bbfe1b92e1d57ed83a8b53e6efafa85939ccbdcc57741a2b4dbab
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
new file mode 100644
index 000000000000..e5ebd880946e
--- /dev/null
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby23 ruby24"
+
+inherit autotools ruby-single toolchain-funcs
+
+DESCRIPTION="Epic5 IRC Client"
+SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
+HOMEPAGE="http://epicsol.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Fails to build without ipv6
+IUSE="archive perl tcl ruby socks5 valgrind" #ipv6
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.8e-r3:0=
+	>=sys-libs/ncurses-5.6-r2:0=
+	virtual/libiconv
+	archive? ( app-arch/libarchive )
+	perl? ( >=dev-lang/perl-5.8.8-r2:= )
+	tcl? ( dev-lang/tcl:0= )
+	socks5? ( net-proxy/dante )
+	ruby? ( ${RUBY_DEPS} )
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	# From Debian
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
+src_configure() {
+	# Because of our REQUIRED_USE constraints above, we know that
+	# ruby_get_use_implementations will only ever return one ruby
+	# implementation.
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/misc \
+		--with-ipv6 \
+		$(use_with archive libarchive) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with socks5) \
+		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with valgrind valgrind)
+}
+
+src_compile() {
+	# parallel build failure
+	emake -j1
+}
+
+src_install () {
+	default
+
+	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
+
+	cd "${S}"/doc || die
+	docinto doc
+	dodoc \
+		*.txt colors EPIC* IRCII_VERSIONS missing \
+		nicknames outputhelp README.SSL SILLINESS TS4
+}
diff --git a/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
new file mode 100644
index 000000000000..254035e6d385
--- /dev/null
+++ b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch
@@ -0,0 +1,77 @@
+Index: epic5-2.0/source/crypto.c
+===================================================================
+--- epic5-2.0.orig/source/crypto.c
++++ epic5-2.0/source/crypto.c
+@@ -282,9 +282,9 @@ static char *	decipher_evp (const unsign
+ 	unsigned char	*iv = NULL;
+ 	unsigned long errcode;
+ 	int	outlen2;
+-        EVP_CIPHER_CTX a;
+-        EVP_CIPHER_CTX_init(&a);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
++	EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(a);
++	EVP_CIPHER_CTX_set_padding(a, 0);
+ 
+ 	if (ivsize > 0)
+ 		iv = new_malloc(ivsize);
+@@ -292,18 +292,19 @@ static char *	decipher_evp (const unsign
+ 	if (ivsize > 0)
+ 		memcpy(iv, ciphertext, ivsize);
+ 
+-        EVP_DecryptInit_ex(&a, type, NULL, NULL, iv);
+-	EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
+-        EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL);
++	EVP_DecryptInit_ex(a, type, NULL, NULL, iv);
++	EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++	EVP_CIPHER_CTX_set_padding(a, 0);
++	EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL);
+ 
+-        if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1)
++	if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1)
+ 		yell("EVP_DecryptUpdate died.");
+-	if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1)
++	if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1)
+ 		yell("EVP_DecryptFinal_Ex died.");
+ 	*outlen += outlen2;
+ 
+-        EVP_CIPHER_CTX_cleanup(&a);
++	EVP_CIPHER_CTX_cleanup(a);
++	EVP_CIPHER_CTX_free(a);
+ 
+ 	ERR_load_crypto_strings();
+ 	while ((errcode = ERR_get_error()))
+@@ -454,9 +455,9 @@ static char *	cipher_evp (const unsigned
+ 	unsigned long errcode;
+ 	u_32int_t	randomval;
+ 	int		iv_count;
+-        EVP_CIPHER_CTX a;
+-        EVP_CIPHER_CTX_init(&a);
+-	EVP_CIPHER_CTX_set_padding(&a, 0);
++	EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(a);
++	EVP_CIPHER_CTX_set_padding(a, 0);
+ 
+ 	if (ivsize < 0)
+ 		ivsize = 0;		/* Shenanigans! */
+@@ -480,12 +481,13 @@ static char *	cipher_evp (const unsigned
+ 	if (iv)
+ 		memcpy(outbuf, iv, ivsize);
+ 
+-        EVP_EncryptInit_ex(&a, type, NULL, NULL, iv);
+-	EVP_CIPHER_CTX_set_key_length(&a, passwdlen);
+-        EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL);
+-        EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
+-	EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen);
+-        EVP_CIPHER_CTX_cleanup(&a);
++	EVP_EncryptInit_ex(a, type, NULL, NULL, iv);
++	EVP_CIPHER_CTX_set_key_length(a, passwdlen);
++	EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL);
++	EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen);
++	EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen);
++	EVP_CIPHER_CTX_cleanup(a);
++	EVP_CIPHER_CTX_free(a);
+ 	outlen += extralen;
+ 
+ 	ERR_load_crypto_strings();
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 60987e87e5c1..7c12bd8f173a 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -1,10 +1,11 @@
 AUX iroffer-dinoex-3.29-config.patch 7014 BLAKE2B 69a79b55922735e51622f8df9cd2a9c3601362ba0f54d9ba4e6b28c134a9d23e0186c3dca99aa2be055ad958be56681f370b92d43763e3a2aba10629be8d3f35 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8
+AUX iroffer-dinoex-3.31-config.patch 8156 BLAKE2B cf247efbcc6f5d8742af3b236615c9ffe33c6f5d51e8fd42c7809c917af7fe4bdd13ae45a4bf46e43db1e304d952e24267640194375679df192392c350902b2c SHA512 26df67f9c64e15cc2762f214a20a05e1458c6b7d1ebb5fc92e17eb77f2bf005fdbadb4412d634f6f89fd1994020f3a7d0877745995900c59e8aed18d525b2a82
 AUX iroffer-dinoex-Werror.patch 502 BLAKE2B d93cb7c5643357f2ffc208f2a169aa0cbf652f9295664e5bae780dba3cd3b3f30780dc53568ec13aea0d733a5a58b4deaee08ef5d91ce1362caa18e33c063c11 SHA512 dc0c88d85943421f5c8998b0080b41585f4ca2513bd554709110d2bef31d7b6f59fc558124974b1255ca97c1edd86bb656c495cabac0fb5c9115cb52033aa7eb
 AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634
 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a
 AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015
-DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
-EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30-r1.ebuild 2652 BLAKE2B 9db4a9b6d065944b9c31270ce08978a55d5c81ffab32af174d68ed30bb1b7adbb544050ea5293443f3e325a7f98a98240f0fe1e6e6e7f3643272cb9cf5c99070 SHA512 034712d52f4a3c2cb0e1772e72de392d95cebfbe9071f5d77cde1c1119573db13d663c4c9f495b474194014b0460d36574de46f1e8ae1636b87dd48b5fe82794
+DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80
+EBUILD iroffer-dinoex-3.30-r1.ebuild 2647 BLAKE2B ae818ddc5a50a966f11f2f2dc3c7739c51b55d29696a233218244fcaaa4d3ada55df7e749533e822906a6bf16f4260372498dad0164ddf002ce10b8542d0e79a SHA512 d2c1d4e8f8722370ab39d7cb1f6bbbdadd814d77749286a0bba319a964fded40bd30c40f2ed8358e0efd869b486e25209fb69262920755f0981c8efbda650deb
+EBUILD iroffer-dinoex-3.31.ebuild 2643 BLAKE2B ced2cc3022631d6778be5475c462977d3ee4a33656a1c35bb9c48d00f00cadcb80d48ac80a94a84b8374640719d0656e61d46849345e8f55376365d2d6e426fd SHA512 89f845c2b5c476c31b95cb31deae000df859db33f7c3bec598b89f831eb3439560f7bf7dfc4744f5c7c9a40e986544ef1722347205a414578cbc3470938d1128
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch
new file mode 100644
index 000000000000..d2000ddfdce7
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch
@@ -0,0 +1,167 @@
+From 789499722508f641c7a1b6ce8857832fd9ae2c08 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Fri, 25 Jan 2019 11:47:45 +0300
+Subject: [PATCH] fix config files paths
+
+---
+ beispiel.config | 12 ++++++------
+ exemple.config  | 12 ++++++------
+ sample.config   | 12 ++++++------
+ 3 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/beispiel.config b/beispiel.config
+index 90f76e8..a7f4d06 100644
+--- a/beispiel.config
++++ b/beispiel.config
+@@ -15,19 +15,19 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Schreibt die Prozess-ID beim Start in diese Datei                      ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### logfile gibt die Logdatei für den Bot an.                              ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt      ###
+ ### wird, mögliche Werte "none" (nie), "monthly" (monatlich),              ###
+ ### "weekly" (wöchentlich), "daily" (täglich) und 1-24 (stündlich).        ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -41,14 +41,14 @@ logrotate weekly
+ ### Ist logstats aktiviert so schreit der Bot statistische Informationen   ###
+ ### in die Logdatei und meldet diese auch an einen eventuell aktiven       ###
+ ### DCC-Chat. Mögliche Werte yes (ja) und no (nein).                       ###
+-logstats yes
++logstats no
+ 
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### Diese Datei dient als allgemeines Datenlager für die bereitgestellten  ###
+ ### Dateien und die dazugehörigen statistische Daten. Hier werden auch die ###
+ ### Beschreibungen der Pakete gespeichert.                                 ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -74,7 +74,7 @@ statefile mybot.state
+ ### als Packliste auf einer Webseite zu dienen, oder für andere Zwecke.    ###
+ ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit     ###
+ ### ausgegeben.                                                            ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff --git a/exemple.config b/exemple.config
+index 566ffe3..8c4130e 100644
+--- a/exemple.config
++++ b/exemple.config
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Écrit l'identifiant du processus dans ce fichier au lancement.         ###
+-pidfile monbot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### Écrit le journal du robot dans ce fichier.                             ###
+-logfile monbot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### Archivage du journal jamais (« none »), quotidien (« daily »),         ###
+ ### hebdomadaire (« weekly ») ou mensuelle (« monthly »).                  ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -39,12 +39,12 @@ logrotate weekly
+ ###                            - log stats -                               ###
+ ### Écrit les statistiques du robot. Elles peuvent être envoyées           ###
+ ### par DCC CHAT s'il est actif.                                           ###
+-logstats yes
++logstats no
+ 
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### Fichier temporaire de stockage des informations d'état d'Iroffer.      ###
+-statefile monbot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@ statefile monbot.state
+ ### « xdcclistfile » et Iroffer écrira la liste XDCC dès que nécessaire.   ###
+ ### Si « xdcclistfileraw » est défini, le fichier sera écrit avec les      ###
+ ### caractères spéciaux IRC (couleur, format, etc.)                        ###
+-xdcclistfile monbot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff --git a/sample.config b/sample.config
+index 5870e37..82fea84 100644
+--- a/sample.config
++++ b/sample.config
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Writes the process id to this file on startup                          ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### Writes logging information to this file.                               ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### After the time given here a logfile will be rotated.                   ###
+ ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly   ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -39,12 +39,12 @@ logrotate weekly
+ ###                            - log stats -                               ###
+ ### Setting logstats will log statistical information and this will also   ###
+ ###  send this stats to a dcc chat if one is active.                       ###
+-logstats yes
++logstats no
+ 
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### temporary storage for iroffer state information across restarts        ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@ statefile mybot.state
+ ### needed.                                                                ###
+ ### If xdcclistfileraw is set the file will be written with the IRC        ###
+ ### control characters included (color, formatting, etc..).                ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+-- 
+2.19.2
+
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
deleted file mode 100644
index e07c9359c4a9..000000000000
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="de en fr it"
-PLOCALE_BACKUP="en"
-
-inherit eutils l10n toolchain-funcs user
-
-DESCRIPTION="IRC fileserver using DCC"
-HOMEPAGE="http://iroffer.dinoex.net/"
-SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
-	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
-
-REQUIRED_USE="
-	admin? ( http )
-	gnutls? ( ssl )
-"
-
-RDEPEND="chroot? ( dev-libs/nss )
-	curl? (
-		net-misc/curl[ssl?]
-		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
-		!gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) )
-	)
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls )
-	ruby? ( dev-lang/ruby )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup iroffer
-	enewuser iroffer -1 -1 -1 iroffer
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-config.patch"\
-	       "${FILESDIR}/${PN}-Werror.patch"
-	epatch_user
-	l10n_find_plocales_changes "" 'help-admin-' '.txt'
-}
-
-do_configure() {
-	echo ./Configure $*
-	./Configure $* || die "configure phase failed"
-}
-
-src_configure() {
-	do_configure \
-		PREFIX="${EPREFIX}/usr"\
-		$(usex debug '-profiling' '' '' '')\
-		$(usex debug '-debug' '' '' '')\
-		$(usex geoip '-geoip' '' '' '')\
-		$(usex chroot '' '-no-chroot' '' '')\
-		$(usex curl '-curl' '' '' '' )\
-		$(usex gnutls  '-tls' '' '' '' '')\
-		$(usex upnp '-upnp' '' '' '')\
-		$(usex ruby '-ruby' '' '' '')\
-		$(usex kqueue '-kqueue' '' '' '')\
-		$(usex blowfish '' '-no-blowfish' '' '')\
-		$(usex ssl '' '-no-openssl' '' '')\
-		$(usex http '' '-no-http' '' '')\
-		$(usex admin '' '-no-admin' '' '')\
-		$(usex telnet '' '-no-telnet' '' '')\
-		$(usex memsave '' '-no-memsave' '' '')
-}
-
-src_compile() {
-	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(l10n_get_locales)
-}
-
-myloc() {
-	emake DESTDIR="${D}" install-${1}
-
-	dodoc help-admin-${1}.txt
-	use http && dohtml doc/INSTALL-linux-${1}.html
-
-	insinto /etc/${PN}
-	case ${1} in
-	"de")
-		doins beispiel.config;;
-	"fr")
-		doins exemple.config;;
-	*)
-		doins sample.config;;
-	esac
-}
-
-src_install() {
-	l10n_for_each_locale_do myloc
-
-	dodoc README* THANKS TODO
-	doman iroffer.1 xdcc.7
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins ruby-sample.rb
-	fi
-
-	if use http; then
-		insinto /usr/share/${PN}/htdocs
-		doins htdocs/*
-	fi
-}
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
index d6533d41c96c..b5ef681e3827 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-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="http://iroffer.dinoex.net/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
 
 REQUIRED_USE="
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
new file mode 100644
index 000000000000..b26d946201e1
--- /dev/null
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de en fr it"
+PLOCALE_BACKUP="en"
+
+inherit l10n toolchain-funcs user
+
+DESCRIPTION="IRC fileserver using DCC"
+HOMEPAGE="http://iroffer.dinoex.net/"
+SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
+	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
+
+REQUIRED_USE="
+	admin? ( http )
+	gnutls? ( ssl )
+"
+
+RDEPEND="chroot? ( dev-libs/nss )
+	curl? (
+		net-misc/curl[ssl?]
+		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
+		!gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) )
+	)
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( !gnutls? ( dev-libs/openssl:0= ) )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup iroffer
+	enewuser iroffer -1 -1 -1 iroffer
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-config.patch"
+	eapply "${FILESDIR}/${PN}-Werror.patch"
+
+	eapply_user
+
+	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+}
+
+do_configure() {
+	echo ./Configure $*
+	./Configure $* || die "configure phase failed"
+}
+
+src_configure() {
+	do_configure \
+		PREFIX="${EPREFIX}/usr"\
+		$(usex debug '-profiling' '' '' '')\
+		$(usex debug '-debug' '' '' '')\
+		$(usex geoip '-geoip' '' '' '')\
+		$(usex chroot '' '-no-chroot' '' '')\
+		$(usex curl '-curl' '' '' '' )\
+		$(usex gnutls  '-tls' '' '' '' '')\
+		$(usex upnp '-upnp' '' '' '')\
+		$(usex ruby '-ruby' '' '' '')\
+		$(usex kqueue '-kqueue' '' '' '')\
+		$(usex blowfish '' '-no-blowfish' '' '')\
+		$(usex ssl '' '-no-openssl' '' '')\
+		$(usex http '' '-no-http' '' '')\
+		$(usex admin '' '-no-admin' '' '')\
+		$(usex telnet '' '-no-telnet' '' '')\
+		$(usex memsave '' '-no-memsave' '' '')
+}
+
+src_compile() {
+	# TODO: default compile targets always include chrooted target, which is not good
+	emake CC="$(tc-getCC)" $(l10n_get_locales)
+}
+
+myloc() {
+	emake DESTDIR="${D}" install-${1}
+
+	dodoc help-admin-${1}.txt
+	use http && dodoc doc/INSTALL-linux-${1}.html
+
+	insinto /etc/${PN}
+	case ${1} in
+	"de")
+		doins beispiel.config;;
+	"fr")
+		doins exemple.config;;
+	*)
+		doins sample.config;;
+	esac
+}
+
+src_install() {
+	l10n_for_each_locale_do myloc
+
+	dodoc README* THANKS TODO
+	doman iroffer.1 xdcc.7
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use ruby; then
+		insinto /usr/share/${PN}
+		doins ruby-sample.rb
+	fi
+
+	if use http; then
+		insinto /usr/share/${PN}/htdocs
+		doins htdocs/*
+	fi
+}
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 1b428a6e26ff..aa8d30ced2b5 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,8 +2,11 @@ AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4
 AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca2787937afdd2ac1fe0b0b4ab55ad7d453029bf4a8c748c5787fc4ed3b46e2b33c925cb962ec868f7a5c07356697a3039e2 SHA512 b74d136985546114604252be74e55e8f5e0740b678bdd224ea63cc3587d17d861c81c69b4bdea0aabc23e64097dda0097e97fbd80110c2c2a919b33d912d2dea
 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
+DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
 DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
+DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
 EBUILD znc-1.7.1.ebuild 5210 BLAKE2B 39e1bfeff0b6b062a85ce1f362a6cdc1a30434f8ff4d3e6f0ffb9c9e7c079834a76dea87f2ec955be4a2c2e5c32752ed42f1d7dbf597d498ffca43b3e92dafed SHA512 2bdbcfc173bf15f77619c07ec13f0e5af8a4a368c01f620ec830a52ae6e97ded36a986c251925911d8f232f978c7a5b7cfd2792cca5b390f53bea3f18d4c3ef1
-EBUILD znc-9999.ebuild 5211 BLAKE2B 4e17086ad59007af436fbbfafb225c9708c66bf47eed8936d43c63feee16d6597f99fe5286fce7e1efd347b9a55fe5ecc932756322813646dfc36cabf7e98c07 SHA512 761110da439be96c483c0b7253e83b12fcbe1574b8d8e226879cead14c54e11200c9fafb6d9234756751c3c2ba27bc974840d80d981e456260a657fb325872e5
+EBUILD znc-1.7.2.ebuild 5136 BLAKE2B 5f7dd319c877ff4f8d229853feae6302d57eab8e86f15c9d0e00a24353ad1c412ec8e522219bcd7d8f963b40c0997fdf22afd2b033a5492e89d163484ad1f620 SHA512 049ae60449caf17f7f1447aba7138efee8cf70b9cc34a5b328f35f1a273d7c1ba753fb2eedfa29deeea1e584063ecf5fa0a613f9f2de6068948ee70f48c51afc
+EBUILD znc-9999.ebuild 5136 BLAKE2B 5f7dd319c877ff4f8d229853feae6302d57eab8e86f15c9d0e00a24353ad1c412ec8e522219bcd7d8f963b40c0997fdf22afd2b033a5492e89d163484ad1f620 SHA512 049ae60449caf17f7f1447aba7138efee8cf70b9cc34a5b328f35f1a273d7c1ba753fb2eedfa29deeea1e584063ecf5fa0a613f9f2de6068948ee70f48c51afc
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild
new file mode 100644
index 000000000000..b8d5eb3df8fe
--- /dev/null
+++ b/net-irc/znc/znc-1.7.2.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=( python3_{4,5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+	SRC_URI=""
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="
+		https://znc.in/releases/archive/${MY_P}.tar.gz
+		test? ( ${GTEST_URL} )
+	"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+	icu? ( dev-libs/icu:= )
+	nls? ( dev-libs/boost:=[nls] )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	perl? ( >=dev-lang/swig-3.0.0 )
+	python? ( >=dev-lang/swig-3.0.0 )
+	test? ( dev-qt/qtnetwork:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	# The home directory was previously set to /dev/null
+	# This caused a bug with the systemd unit
+	# https://bugs.gentoo.org/521916
+	esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+	# Let SWIG rebuild modperl/modpython to make user patching easier.
+	if [[ ${PV} != *9999* ]]; then
+		rm modules/modperl/generated.tar.gz || die
+		rm modules/modpython/generated.tar.gz || die
+	fi
+
+	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
+		test/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
+		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		-DWANT_ICU="$(usex icu)"
+		-DWANT_IPV6="$(usex ipv6)"
+		-DWANT_I18N="$(usex nls)"
+		-DWANT_PERL="$(usex perl)"
+		-DWANT_PYTHON="$(usex python)"
+		-DWANT_CYRUS="$(usex sasl)"
+		-DWANT_OPENSSL="$(usex ssl)"
+		-DWANT_TCL="$(usex tcl)"
+		-DWANT_ZLIB="$(usex zlib)"
+	)
+
+	if [[ ${PV} != *9999* ]] && use test; then
+		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make unittest
+	if has network-sandbox ${FEATURES}; then
+		DESTDIR="${T}/inttest" cmake-utils_src_make install
+		local filter='-'
+		if ! use perl; then
+			filter="${filter}:ZNCTest.Modperl*"
+		fi
+		if ! use python; then
+			filter="${filter}:ZNCTest.Modpython*"
+		fi
+		# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+		# invocations from inside the test
+		GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+			CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+			CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+			cmake-utils_src_make inttest
+	else
+		# TODO: don't require sandbox after
+		# https://github.com/znc/znc/pull/1363 is implemented
+		ewarn "FEATURES=-network-sandbox; skipping integration tests which"
+		ewarn "temporary open local ports."
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc NOTICE
+	newinitd "${FILESDIR}"/znc.initd-r2 znc
+	newconfd "${FILESDIR}"/znc.confd-r1 znc
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -d "${EROOT%/}"/etc/znc ]]; then
+		ewarn "${EROOT%/}/etc/znc exists on your system."
+		ewarn "Due to the nature of the contents of that folder,"
+		ewarn "we have changed the default configuration to use"
+		ewarn "	${EROOT%/}/var/lib/znc"
+		ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+		ewarn "or adjust your service configuration."
+	fi
+}
+
+pkg_config() {
+	if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
+		ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+		ewarn "any existing configuration. If you are sure you want"
+		ewarn "to generate a new configuration, remove the folder"
+		ewarn "and try again."
+	else
+		einfo "Press enter to interactively create a new configuration file for znc."
+		einfo "To abort, press Control-C"
+		read
+		mkdir -p "${EROOT%/}/var/lib/znc" || die
+		chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+			die "Setting permissions failed"
+		start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
+			"${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
+			die "Config failed"
+		einfo
+		einfo "You can now start the znc service using the init system of your choice."
+		einfo "Don't forget to enable it if you want to use znc at boot."
+	fi
+}
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e59849a6e29b..b8d5eb3df8fe 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,13 +1,13 @@
-# 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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet
+GTEST_VER="1.8.1"
 GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
 DESCRIPTION="An advanced IRC Bouncer"
 
@@ -99,8 +99,8 @@ src_configure() {
 	)
 
 	if [[ ${PV} != *9999* ]] && use test; then
-		export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
-		export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
+		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
 	fi
 
 	cmake-utils_src_configure
@@ -109,7 +109,7 @@ src_configure() {
 src_test() {
 	cmake-utils_src_make unittest
 	if has network-sandbox ${FEATURES}; then
-		cmake-utils_src_make install DESTDIR="${T}/inttest"
+		DESTDIR="${T}/inttest" cmake-utils_src_make install
 		local filter='-'
 		if ! use perl; then
 			filter="${filter}:ZNCTest.Modperl*"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index db7452789439..9b535740a49b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 2f552a912f0c..c55512efc50b 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -7,9 +7,9 @@ DIST courier-authlib-0.67.0.tar.bz2 2194546 BLAKE2B 2ccb6ed15c2f02d206606f8bba04
 DIST courier-authlib-0.68.0.tar.bz2 2194982 BLAKE2B e463390b49bb3ca147467d3054a83d5a8ce96b604bde0b624c4d7ce81235c6f747e5d847dde794c81c4ad36aeef49bdd27cf904142b4542df833484c5eb7a57e SHA512 5c4adaf0fd69f4b9e780962aa3f9eeac6b15cea3f302288ff4549ce2b0be9ea0808b4501670ef3c4e0419c3d27505c256c082f795dea4683dd5265fd7dcab93b
 DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
 EBUILD courier-authlib-0.65.0-r3.ebuild 5172 BLAKE2B 2bc31ffdfa5284c3d7054ef698bd82bbd1a36156091dc7ca409940c26e95da1eb4a579229e2615341fd6f2d4d1001e2ad240a61894786b20315092bacefd9da9 SHA512 59c9da719125282e3a26b6d2e604dc49950b1c10fb3d66a685cade000a35355d5a824cbfb96ea1b16a9bf6cf64ed82b8d8ddd4f6af925dc29faf1ec075707a8d
-EBUILD courier-authlib-0.66.4.ebuild 4516 BLAKE2B f8e457f743d96173137ab7a935001ae1d1bb4b4ff9c59178c3ec64e3809bdf4d1b57e3668f168839189e29d0856ff22859f17966b6c6e1e5ea678dd6556a351c SHA512 2987ce9526412ee61cb31bc4cd32cebe242f4ad13b961dc9629f489f96cd3d36a9ba8a13761c4b4469341d29b72ff4105be742eede1972aa7a7dc3e6bf383d83
+EBUILD courier-authlib-0.66.4.ebuild 4512 BLAKE2B c348788f85b636efe9d19d3d2e2b4b7155865a546898a099db5f20c40c996dec5cf841086060760d13b9064f226a87c5b8e71e35103b59b8d7c201255da40d40 SHA512 e46992d601717a0d5d3c5f52c345c61646e317bad878fe2ffaab57ae3e0c4339232bcbe87422ce8626de9807ec38bfe12b770a0be10edd4523d4b6261d388dcb
 EBUILD courier-authlib-0.67.0.ebuild 4565 BLAKE2B 421bdda6b5a0db98de2359ff6bca26da3675b16c833db575f98b8013d3fdb84e81d7b84f01f08e36f306213657e3db02dc08d9bf0e8762806aaa09a4309e95a7 SHA512 c1458bf707a9d03985351c0e25a648ced09a4545a5928a2a718efd4f15b9a0fceaf02e4634a56a7eb79604fea98f4531e093f73b96e6fe6a140ee4f1f38b2e8d
 EBUILD courier-authlib-0.68.0-r1.ebuild 4569 BLAKE2B 87a0fab1111584bdf4ae3c4e81b52d71074f1e1ecc7f5682ea83b35e20a941a86f033e0a50cbc0da4260627128b1357c55e5ab1c35b17a53241468a872c81deb SHA512 8e0a63aa39d46896e0c5ad90125867b552adcfaa8ea3d35175062abbb43bbff4c73da794f6cc2c5a547eeb4e1f5cc3ae2e1eba2aa81868c89f3daa9c11de6bb8
 EBUILD courier-authlib-0.69.0-r1.ebuild 4533 BLAKE2B 310ea514141f522997b5a1070b1f94f6bea44704a02f96dcca3aff86df8e88437bafdb5c2f47332993cf9606ed175519adcc282a7855228f0c6b959328e7e0be SHA512 0ca906dae872b34cb0a9462d3882fac6a0c89fd807d3076819eb81876042344f00bf2a1730d946acd4acc22a6ac7027d26e3b1f8ed7200ed184e636e5e9fcce7
 EBUILD courier-authlib-0.69.0.ebuild 4575 BLAKE2B de7957af47985b84e9c08dc493d6ff069e2eda684d77f8113eab0cb7bde8f3a215bf6bd4663559fa3b67efbd6462ed945b326f26b8f37720bcacac08c9af40c9 SHA512 3b5054b13721bca8e302741f28ca9e2f6eb7a42489f2ca138cb61bbe878703c34e66bff3883bcfc06e43656a90b96c8233a95c47dcf17f0e591223a31d29a2f2
-MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
+MISC metadata.xml 486 BLAKE2B 160b9ab143eb206d225343dfac08321684250eae48ee0ea26023c2b36c008b8f8b17933e6044beab79415ee7a27d1658226f84f1553ba106f5298e6f487423a7 SHA512 5ccb8e2df98ea00c3a0825ea738d7cfa4045e24612e18b7e62994c8ad94271debce6c90a7813ca054cc1d7ea5cb0c11cc9fd71a3bf59f803375ae8583338c2e6
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index c01c45e0819c..d4ce92e9f4c2 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index d9850f835e50..fb8193f49c32 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
   <maintainer type="project">
     <email>net-mail@gentoo.org</email>
     <name>Net-Mail</name>
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 45ed02dc2798..ae852f69cd26 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,7 +3,9 @@ AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c96
 AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
+DIST gnutls-3.6.6.tar.xz 8257612 BLAKE2B 1b201eedcad7e4424cc6f53d21de5c8105fdea3f0bbc2ea1eceac6fed20a45ad8009fc0f4d9bd7c3e8e3a4cd261d6c32a180a273b22494c4b2f1982244bd4698 SHA512 4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1
 EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
 EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
+EBUILD gnutls-3.6.6.ebuild 4101 BLAKE2B 78c74a989d0e87a404201a6b1b4be336da54680dcf063c582bf8a0cffc76c7c687d9d9944b669ca7d3f3a3d6a355b789097ca905cbec7ad230005f79d3da1a50 SHA512 d6e92e7b045c8bcc1e8f1a0bff9e54a07d1c917d6fd93ec9e26c790ea7fec94f229a47958c4d2424b2322de6517f65211875ecb1fecb794e67d27d19fb52f1ad
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.6.6.ebuild b/net-libs/gnutls/gnutls-3.6.6.ebuild
new file mode 100644
index 000000000000..ea49105d00bb
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# detect also guile-2.2, bug#676402
+	# aclocal/autoreconf will require more dependencies
+	# that we want to have
+	sed -i 's/_guile_required_version=2.2$/_guile_required_version=2.0/' configure || die
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable seccomp seccomp-tests) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable test-full full-test-suite) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable sslv2 ssl2-support) \
+		$(use_enable sslv3 ssl3-support) \
+		$(use_enable static-libs static) \
+		$(use_enable tls-heartbeat heartbeat-support) \
+		$(use_with idn) \
+		$(use_with pkcs11 p11-kit) \
+		--disable-rpath \
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+		--without-included-libtasn1 \
+		"${libconf[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 40323cf35a61..ab1845da1d09 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.75.zip 32645773 BLAKE2B 120d79a33f90881ef5c4486ffef3a7713770622a65832be9997edeebbd4beac6dbdb6dfd876eb86f8622a1693908e6f56a47b48179fb37fdb12d313e2929ea7e SHA512 f5ebbe307b9125eec2284989a7ec1c16ade93df3b091ac44768750010bf51fdd9199ba96dbdc5b37b105bdd1156a0f90f41fdb407408d62b2c7750881db8b949
-DIST gsoap_2.8.76.zip 32474005 BLAKE2B 4b604ea5c21ff98e2eddad3bd032e87e460d708a118ed65cb98e1577a7dc85f7103ffa4ddc4c3447425f4978f7ef72f6c1004fbe6d099a654ef3705fff53bc8a SHA512 4613ce97a52c08267f6186fc90dfa15dac3be0407b754a42ceef59a5f784078c90e43086b9920031d7690a775b42184c330af03c7c594d6cd5b781ff44b1c0b6
+DIST gsoap_2.8.77.zip 32495225 BLAKE2B 96d1d629eddfa470b53412f15fdb1ffdcc53bcda257ef4ed9c93b3da56cb1627fb98bed81108eb8344e6dbefa2b93c7cf9d9372186590c9a9668044eac9217e8 SHA512 3c03bd32ed9e6368f8483ff7979d2a75361f60f475a4b99b6d3a7d371719c254671d49177c70dd1538075a5e96b3e398d1d301e4fa66cb5979441b6bd6c60fd8
+DIST gsoap_2.8.78.zip 32507212 BLAKE2B 8e173cb447dd918fa83673ad9a8ef26ca78dfba0cb8ae2fc81bae23f7a0548d52dddfc0e4f02719833aa302a02ac8d069bc1356b424097802ab0299f0453a58c SHA512 c115044d2662c2dd355c4756a974a0013b7213dd28c536aba179e53c19466279bfa34ce16b4426db5aa7a24d94c18e0ed7e7cdf05e799bf89f7b54031aa0874e
 EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.75.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
-EBUILD gsoap-2.8.76.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.77.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.78.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/gsoap-2.8.75.ebuild b/net-libs/gsoap/gsoap-2.8.77.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.75.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.77.ebuild
diff --git a/net-libs/gsoap/gsoap-2.8.76.ebuild b/net-libs/gsoap/gsoap-2.8.78.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.76.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.78.ebuild
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 666bb400c984..1ec7c7951553 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,5 @@
 DIST gssdp-1.0.2.tar.xz 312352 BLAKE2B 0712ce4e698fb9a455bf217863aecf4e4e87654d9b78a4e0e9c2f618a8bd9c62dd3c85ab7bd4c4400a8a658b2743bbe3a6b0d454f1b7c4a3383c893bc5ae2e7c SHA512 eac1d3db495d0433c27ad84c33c23a25b3ebdf5c85bb2d5f5b2198c00aae484f2128c22838534b9b4bf4c9787795241acafe30d00407912bdb9945422cbdc103
+DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
 EBUILD gssdp-1.0.2.ebuild 1430 BLAKE2B 5fc2822d44a31e045e0d7f452613301b9e0058946ab10d21458f384a65645b109337d498c86b52125d84e3af2cb78e36a0eba510b8f4eb12c7555034cffb210c SHA512 0cfade0dba0442915247ff4474e5518edd214158148474b8726d60aef3d1bf66553881c93c9c51f1eda5bd46a1a7a748e0509be8d5faf394496255a05ecac20e
+EBUILD gssdp-1.0.3.ebuild 1431 BLAKE2B 5d25a88c62791304f4a1567dda7cb029813c326845f974b10b4e57e6944f3cbfd4e6687f13563a17576767ae7d1888b90b1b12e3264ffdec7a7451586609688d SHA512 a2972cf95ffd9976a81083a6c5b28f24ad766e707472cbec7d8f0d359986c7d0fe1c4871f1a1054e7e02db3e23cec0d2b8e505c54f01c59789b77469fa66366e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
new file mode 100644
index 000000000000..1a709e46cf25
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.0.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	introspection? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.36:= )
+	!<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Disable functional test as it requires port that might be used by rygel to
+	# be free of use
+	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+		-i "${S}"/tests/Makefile.in || die
+
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with gtk) \
+		--disable-static
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 3e1bb338b129..acfc417b9c1d 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,8 +1,8 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
 DIST libetpan-1.8.tar.gz 6188927 BLAKE2B 730d9fc545ea2fbd4dbc0eaf3cdbd0540ec85984dee5448c5f22c83ad12e568a9e066e53734da96ef6a9c77942e5aea2eb241c2228f0ca7577755e67646aa589 SHA512 a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
-DIST libetpan-1.9.1.tar.gz 6189971 BLAKE2B d6cffd9c333c76451d7ac26e978e09b7f1a0b225ef1f318c80f28fe00047c523f2bba32cef5892e452bc84593ce0d635a4cd075e32575c812ff853d0932b01f9 SHA512 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286
 DIST libetpan-1.9.2.tar.gz 6191522 BLAKE2B a5b3b93c94596d64b49150680a2599c930b5f010d29be7fbd325e43ba82b8d61032bae65155d2c5e0e2bbcd219db3d916b10a6ce5a98df2ac31fb88811491d71 SHA512 3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba
+DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
 EBUILD libetpan-1.8.ebuild 2093 BLAKE2B 4d24c6398d9de5b50433e3c2b4716331280fe0c88f70ac64192bedb570ce955e1002d520e0c1ff7132aa1b957020bddfbc4d4ab08823645b1e16b4b85f83bb4f SHA512 23d9195d9665ad24c58cc1c7b570e48ddc157cae14cc69dbd814124525bc70de3aaa33687a5a914aade21241c082c1b16f5014f8618795cc53ebdbf6b8b0e933
-EBUILD libetpan-1.9.1.ebuild 1865 BLAKE2B 0cc278d72d4f3e270f03b2b64c8f2a874349b6f60fcacd6985eab1b2ad58c303e2a3f8b1fea86f0cfd73239d1bb5c4e58ecfd4dd7e1a6153efcc3b66c3092eba SHA512 a008360891145c5d64e560933a0129f029675f7b1e0d95f4dcc77f6fdb58744f22289e2772d30ae94f7668246bf17e9a0c2e7e2b84acab490d7d256fca26c43a
 EBUILD libetpan-1.9.2.ebuild 2059 BLAKE2B 302400ed74c1f3a142f0fbec6ae2fe01467d26bd7ee604d0b098965588ace7a5afef0ee16eeb1f5fe81e0daca13cc09fd9b685cd1d02bbdc0273a512dfca576c SHA512 35d05d4da2bc6c234db47fd048f3beccfb6ab9b6144f1f1d6ff445185d8c4c79a7f67e8e2615d934104601e7e0719e9f4225e3b0678832241559b400acc406bd
+EBUILD libetpan-1.9.3.ebuild 2061 BLAKE2B 47ae941a001e38740c78fb8c6f9f71db15c4cebc7e830ee6378522bf1baadf64e2315b54f54bae7381d69d900b586053b0b6424f809db96d69a06cd908183a77 SHA512 f934d22dd5a51e8ab2ad8639caf70a34d40f1e88887f5f3d726f802af52ad58fca272c513fc2d50ddb147aa384ad922c09ba943f6b6b27c803a1f9f6faab3346
 MISC metadata.xml 821 BLAKE2B d1402bb748677b9c50c815807cb5658f42a0f2f9c6a82b14ac83ad96c51b1580d85d36ee748da9fae051de5ff3eb112f37cfbc698541dcb8d9a647d67d5fc094 SHA512 45e47b781f67a7dd186bca6c48afd6283ba3b67c015c246e173ee37b368705b461461a6e5877157deeb2479e1bafb22eae4c4d9a0c01aa6ce59ffc66c860da9a
diff --git a/net-libs/libetpan/libetpan-1.9.1.ebuild b/net-libs/libetpan/libetpan-1.9.1.ebuild
deleted file mode 100644
index 31edc45696c0..000000000000
--- a/net-libs/libetpan/libetpan-1.9.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb gnutls ipv6 liblockfile libressl sasl ssl static-libs"
-
-# BerkDB is only supported up to version 6.0
-DEPEND="sys-libs/zlib
-	berkdb? ( <sys-libs/db-6.1:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-)
-
-pkg_setup() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	local myeconfargs=(
-		# --enable-debug simply injects "-O2 -g" into CFLAGS
-		--disable-debug
-		$(use_enable berkdb db)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(use_enable static-libs static)
-		$(use_with sasl)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
new file mode 100644
index 000000000000..93ca868c961a
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.9.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 autotools
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
+
+# BerkDB is only supported up to version 6.0
+DEPEND="sys-libs/zlib
+	!lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
+	lmdb? ( dev-db/lmdb )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+)
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
+		ewarn "No ssl support will be available in ${PN}."
+	fi
+
+	if use berkdb && use lmdb ; then
+		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
+		ewarn "Using lmdb as cache DB!"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+	# libtool recognises it as valid shell (bug #300211)
+	use prefix && export CONFIG_SHELL=${BASH}
+	local myeconfargs=(
+		# --enable-debug simply injects "-O2 -g" into CFLAGS
+		--disable-debug
+		$(use_enable berkdb db)
+		$(use_enable ipv6)
+		$(use_enable liblockfile lockfile)
+		$(use_enable lmdb)
+		$(use_enable static-libs static)
+		$(use_with sasl)
+		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index 4f99cb9a70a0..39ec70f558ef 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,6 +1,6 @@
 AUX libgssglue-0.3-protos.patch 415 BLAKE2B 1c9a1592070eeeb3189ab7a64381f85c79fc8676b1efd744da70768767741ba1e3978c8dde7762c9c22e4de98c0d1e523d5bfd28efb7e5f97e5404e37dbdd183 SHA512 0993ce5908d1388490c195cd7da7950d019ac2937e4aa374dad515b12c9775ebbc578f2635b508b333fd8f961b4f8816db7c5e4891ace07f042c7ea6588c0307
 AUX libgssglue-0.4-implicit-declarations.patch 474 BLAKE2B 578c3306d1dc40165d20485dabac62f1a0d211e0ad3e0d54f79f7330c3ec7c26b0271345124b459eb576571735c9e3ec79687c1fce433fba5501a2b9ff59fcf9 SHA512 1a76bb2b53baa8277e117d8161cf186c569ae1d2e8f368a17378b33fb623e0be8b76ef6c36d413054d5501f344093be7691ea6e042b6367619de6079cd116c07
 DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
-EBUILD libgssglue-0.4-r1.ebuild 906 BLAKE2B bed33d64dc1db5aa931103d74038dfc0bbff7ea3117aa2d5985560b81f2d7ab4d2696fe4142f8f725d9d5b55ad4e4e2da5c69c677aa17dbb525fb8e4a0b46ed7 SHA512 c2cae4858324415973ff7d8b8ac80821087559a1c597d0b3163340778eaa067962eaa5dcbe8720be2deabf7a5ed394d99b56b885eca51b7baf0a0d316f2339e5
+EBUILD libgssglue-0.4-r1.ebuild 904 BLAKE2B 1f9a4fe47e42880a1b771cb0e60aa1c5264b86c41f037cffe8a36b422ef14e9645e74df53c22ed8c6dcc955addf02ee2fb53470da6e0768a478d1268e83c244e SHA512 a0f9384f905ef8bd515b0168d151edc5cbcbce75fc65da22b60ab742d1d6bd8608e0ed95a3ff0af6f5178e761136849de34bbf2d89ef1c43a2bdbc54fd490592
 EBUILD libgssglue-0.4.ebuild 846 BLAKE2B 677236531187898c9d41dc876edcbed31d1a313aa06efb48338c3725c4c638f532a845bb9f5eb41142952c12379f11991981fa92e9b6fd080dbdf707d769a3df SHA512 d9140d4acb46c2b0fdc7e2ce8e071c65bfb428007e07d2d627ef6ca3148c373a97bbd7f96de01465802684353f2ebb439e03927cf2d38a1190a136c06192c729
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index fd4c0748d5d6..e9d5cee7a23f 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-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
@@ -9,7 +9,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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=""
 
 RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 58a71a2374e7..8ea2dec88937 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -2,5 +2,5 @@ DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420
 DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libhubbub-0.3.3.ebuild 786 BLAKE2B b995a7361dc41af100c17b781ac3f9daf3d5fc47d22905153167165b256765747a8199bdfe6041ac3147f51beb047f6c1010177d60ac0197fa82daae28126b62 SHA512 80f415406e399aa5045f5f946590a07e2f94c173e5bf34e1326d17658e0f89a775c1a689934ad93dec404e8f00195155cd747696b611482f90475f97adfedff7
-EBUILD libhubbub-0.3.5-r1.ebuild 1071 BLAKE2B 76f4f027a5df87c391c97d61f2cc883f578668dfa01156097b8b8b53266c0e2a28fe1771d2dfc58c082ccd1934f80ceda0a1b50656c20e5555b3d5bbaacc1151 SHA512 ad7fbf1d635b16152224c7ce41e4b9b3e2589ad66e6439a24f9e1e294e4d2433a1b19d23418f66f6371e378932375d2c656744eb9ac90c0eb286af27a063a23d
+EBUILD libhubbub-0.3.5-r1.ebuild 1106 BLAKE2B fcca4f275ea13d29584e83a2c421a72d4833a53cbe3d97e085c14b5c44128c8c77ada5743cfb15c38cca6dd94d7b95ed76a6b96cf526522e256a01a641a77742 SHA512 4162f12046aedaec54c40a80423ba2331d364bdb2dca2f0b4d3648b4d8df95023c4451c430fc6a8f5e87875ee6feb9446141a90b71417315b3a49bd3eff66308
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
index d0a20d7641ec..28a147d5b6d9 100644
--- a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.5-r1.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=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-lang/perl
-		>=dev-libs/json-c-0.10-r1
+		<dev-libs/json-c-0.13
 	)"
 
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
@@ -36,6 +36,7 @@ src_prepare() {
 _emake() {
 	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
+	append-cflags -Wno-error
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
 
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index b287fd8dcaa6..fd90665b1956 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -1,6 +1,7 @@
 AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae34d5cb3507916b49edbf487ce007db7b20d2da58404161a5a6ba063cec86d9507c074a232ea58688f5de2deb6147815b9b5501cd9b SHA512 c7ac48e30ededc7079a08504ae78f421b843100dec2c8658d75ff7a3101660087de962d73ac73bf1023286b0a89c1d1b3187ba36336d1caf051b03d445571dd6
 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 1536 BLAKE2B 279535ccfca6db6850f83e1df8cea9810454c6f944ef3ab20a58258a7bd96e63f1cd5682c43e02a5baf3036f72e68ae0ddd5cbe6ac882c1d213ad4ae5ce47eca SHA512 c03ca8bc392c5ecf96fcaff187d9f8788beca1d3da46a67bea8049621e27b03f7d860bed7755decd68b77b5f51873424c1526c4b509d3f412c422153f248803d
+EBUILD liboauth-1.0.3-r1.ebuild 1583 BLAKE2B 75f926210d27ca8f62e08a7158e8f93495db1632018cfe84b9444214983d4e0622a37227a04c9c71ea6156ba8a525de9d3b242384a9cc15fd48e5847c9647a26 SHA512 97b3823d12a39a09f4d73559c89dbf4bbd3dd1e32a52099749afdbc597cfb5af62f42ab65493da0ce6d9c5dae2c7fe802138f449b9fdbca901625d5a46afab1a
 EBUILD liboauth-1.0.3.ebuild 1445 BLAKE2B af869f162f31ae9b2b487da42a476709f4726c3fa4724ce427b36a153ecf2daf0cb8f2e98448f50243a40f9810899a94b33b41ee27269dc118470e1d03b3c00d SHA512 a70d801add90aade10a12b5dd24446a1dbc36a9dfa28fbd3c90f3a7054b6a0a0c34830cda96565984b4b444295f557334b5fe149c99cf1e87b37a5af4b1b254f
 MISC metadata.xml 879 BLAKE2B 499e638089270b30e1fc4a15008592e036c05032719e05ef06cc4c897be1bebe3d4873caacec09f6c54f65240da2582fee0776aa7e0b89508e98c4a3a668f870 SHA512 05625ec768286997f291d95e40e024c692bb8dd3be2d2eea1c3d7c90b452b9a98988a2ca43a5c6134a0e084e0a4ae40af4a00e809092edbcf3a0630781657a07
diff --git a/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1_2.patch b/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1_2.patch
new file mode 100644
index 000000000000..c22a7753cce0
--- /dev/null
+++ b/net-libs/liboauth/files/liboauth-1.0.3-openssl-1.1_2.patch
@@ -0,0 +1,22 @@
+diff --git a/src/hash.c b/src/hash.c
+index 551991f..a0bc8b6 100644
+--- a/src/hash.c
++++ b/src/hash.c
+@@ -455,7 +455,7 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) {
+   EVP_VerifyInit(md_ctx, EVP_sha1());
+   EVP_VerifyUpdate(md_ctx, m, strlen(m));
+   err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey);
+-  EVP_MD_CTX_cleanup(md_ctx);
++  EVP_MD_CTX_free(md_ctx);
+   EVP_PKEY_free(pkey);
+   xfree(b64d);
+   return (err);
+@@ -485,7 +485,7 @@ char *oauth_body_hash_file(char *filename) {
+   len=0;
+   md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char));
+   EVP_DigestFinal(ctx, md,(unsigned int*) &len);
+-  EVP_MD_CTX_cleanup(ctx);
++  EVP_MD_CTX_free(ctx);
+   return oauth_body_hash_encode(len, md);
+ }
+ 
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index 96cf577256ea..90acfdbc1fcc 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-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,6 +17,7 @@ REQUIRED_USE="bindist? ( nss )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch
 	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1.patch
+	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch
 )
 
 CDEPEND="
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index aaa16a6e0645..3bd6a1648976 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,7 +4,7 @@ DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf872
 DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
-EBUILD libssh-0.8.5.ebuild 2960 BLAKE2B b917b087ba6f2e51416d298dd6539c03701cbe27ea07b9ec068f4aa3111b2685c8dea01550904cdd04a88fd2e46aa087c06ce07a9d30a53268fe586334d671d1 SHA512 c4dc633fec8536137786321401d11b35e014d063595806a23fa41d430f0009ee88e73d8307cfba040f30ef5a7f5a0a96f6da5f8db2d06b299e1b5d7a3fcd3408
+EBUILD libssh-0.8.5.ebuild 2959 BLAKE2B c9acac4ed8b93e0742a99e1b8514cbb505a58f78f142ddcca4bac35c03d8299343b1550556b309b17e9c4dd55f73c1d535f6670a41b42b40125b74fef93e042c SHA512 b314908c959cdd0443ef505f2000dc5b47f41bc4cbe0c1ad4906a03af486cae314c1482769614deba1d5b77e0e5a30b182095459180febbf56f2e5f0be390424
 EBUILD libssh-0.8.6.ebuild 2947 BLAKE2B a05a939e8d1f1f5168aa583030d44c19fef3eee261d782e13a8906eb7a7d3190d732f07efb5a2f6c3fd2750344a71e184c8cbde4d6fbfb0cced27d0995edb916 SHA512 afea1393ad93357142d8480ad9af757d78792cb991113f5f453381206fdaac3eb84a0ff75d735324a7c7c253b09d8484c2752b85f05d2c85899ae91e37878857
 EBUILD libssh-9999.ebuild 2897 BLAKE2B 45f5872ca4ccd8b8e51d45ee218dfe82367cee5018dfd34e59e8f453ec1d480244632431e3d911efb55ec1c8d2707114292804bcb18e909a2132f2a3ac72eb7f SHA512 4e974acf3d5a821f11822d4e36a8ed8b965ebe1b047992a7b1b344764043d8f81f925269766e98bc61a61615b6d61f24bed7cd5e9a19795bffe75f810f284dd6
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.5.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index 0860487e1bb5..362a937e9f33 100644
--- a/net-libs/libssh/libssh-0.8.5.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 96266f7cceaf..c4046533beef 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,6 +1,8 @@
 AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
 AUX loudmouth-1.5.3-skip-gtk-doc.patch 394 BLAKE2B ebcfed350077bcb67b0f7da9d0c9a31fa7483d4d927323490920f7d56b7cf78bcb6dfe04b4f59a36fac07c24267653ce8bcb2e17f2e19f4d2ad7037dca0844b5 SHA512 02ec191f33dd5601f9d875d3a5d0e1bc5baf904c18ca47c90280f860ee1449e51dbc7f2be841de85c8baf23d615574592ca8f9a913ae6b5dacd2583497bf8889
+DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.3-r1.ebuild 1144 BLAKE2B c0f5f6d6d538cc0661c678a00fe31ad6370b444ee01aa999ef19b1bd2861a8e7647df192471eba6756d121a0ec3ccf5a7360eaa47e2db0682a95c4ee5ddeb34d SHA512 1dbd2faec2ffbbad86a1e651a679c6994b7d1edb3e84460f174f78fc8d333bdf238e7c3d6a6b251fb61144cfe6b34bc33f00f8d6102c4d1f5b7bf58d1ba4648b
 EBUILD loudmouth-1.5.3-r2.ebuild 1174 BLAKE2B 29524a97e8a1c4bcd2d57850615725f8ec2b927d84d261cd7acd410b0f57fd0cf21dc5593d6d80e40eca6ddc5a0acb224324adb27fb65ddf2833cb586c2dee0c SHA512 524c7f0e58c2561b1049c2cc8abf460fa086d152ec5654f1b87f189086bd73c9237bb8476a76f1781b4bbd12b6a2663ff27fa64f95558560d3cd2a50f92a4af3
+EBUILD loudmouth-1.5.3-r3.ebuild 1053 BLAKE2B f5aa1688a6e2aa1db85b46a756663c117cabba7797b4ccb5938a684d95c7a7635a6479821b8f58d8efecfcbaa0fa1ee1ca62a2fff3ec71b68d70daea41cd252e SHA512 72ef56c75e9aaea23a532dc0e2167358de9cb1a6c27aae1e6bf72ddfc62f606b7a1487a42395efd2a237d7a20d00c198eea53fdbfb7a44cbecdf71af4d9d2a23
 MISC metadata.xml 563 BLAKE2B 11e3e68d92736cc1dc95df692d61420d487434c24d7ffa665ef7453fb0dde039b6006ce3edcae8ac0401dc15f99468133b3a4eb73c48b6ef20570558b33a90cf SHA512 b2847486aaf03b8bcd02ea006247c735da3dddac5e60f746f21d32985ef78585c347eae6cfcc8723175166455cd758014e19ccea79bdd77ede74bd36faf31c09
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
new file mode 100644
index 000000000000..6969efe6a5eb
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight C Jabber library"
+HOMEPAGE="https://mcabber.com"
+SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+
+IUSE="asyncns ssl openssl static-libs test"
+
+# Automagic libidn dependency
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	net-dns/libidn:=
+	ssl? (
+		!openssl? ( >=net-libs/gnutls-1.4.0:0= )
+		openssl? ( dev-libs/openssl:0= )
+	)
+	asyncns? ( >=net-libs/libasyncns-0.3 )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	test? ( dev-libs/check )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_configure() {
+	local myconf
+
+	if use ssl; then
+		if ! use openssl; then
+			myconf="${myconf} --with-ssl=gnutls"
+		else
+			myconf="${myconf} --with-ssl=openssl"
+		fi
+	else
+		myconf="${myconf} --with-ssl=no"
+	fi
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with asyncns) \
+		${myconf}
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 04789b44cd8e..9d308b927c4e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -4,8 +4,10 @@ AUX nodejs-11.4.0-stdarg_h.patch 243 BLAKE2B fef871a9900e3987559cc29ae4c60394b64
 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.0.tar.xz 20217588 BLAKE2B ef7f626bd3b13b11a1cbf21f5c6a2ce08567dddc2fb525c5f10e02f81750a648245c2eb88535d8aac1b055a13d12f9ead72d55c4ccf68062940da09d582344c3 SHA512 6c10ae4070cd8b89d4d31ee2137453fa582cef85c6f002c78d5029ceedddf5caeee8e28a4e75dfc632c3af3c8e2acec403ab17a927ba51fa31175d58b45cbf49
-DIST node-v11.6.0.tar.xz 20410716 BLAKE2B bf6150a42070f714dfa5a38da70a4ce6b6a81ca5b9aedb84e672dff5244676ce77ca771ee46d34adc7cd7b84a0fe91537f9cbd3841a95c4bee67a894d4e8b4e7 SHA512 7e3ee41a5de8395669796cf8f81a9e8f584ceda480b54874fceb057ccf8aa5b986239ca842b2dbd796dd1a97f9e2111995b334278f6d7bf38421a84c4e883c65
+DIST node-v10.15.1.tar.xz 20231024 BLAKE2B 82fec4cf3902cc3b8eba595c969e18ffd2fb468e58eec026308aef2c3dde3c9b96c96997b2710e224c77c373ac72e5cc8dd4e68d937914e014d3f457c7d6afa4 SHA512 823a4703b388275aa86e7ede5c626a918764d6e83bdd9a0cb249ec1f960f3a3020306078d8a4113311303e4c3380d4090c928041ef64189a3cdf67153c7cac95
 DIST node-v11.7.0.tar.xz 21218124 BLAKE2B a7e69dc8d6ee2f42ea78ec9c4d623b56bfbc2e130fc6b7d33038ce79f03d7b92e78545fa26bb2dbd58c1c25677f0b224077822264fd9cec49e71f18517098563 SHA512 eec2d5e67d94314f1a09f3a1c3407d6b12e9decbdff99d41eb487c4ddc1929fc5661be0b6fbb180961ecb6094311630b19faa0af031d82ff8de7ae213ee35ab7
+DIST node-v11.8.0.tar.xz 21253080 BLAKE2B 808df024b7dba628f03b7c6c2fe8c486bb036f02f80aa2184de0a8393afad17dcd19d98fd63f1ffc5f9c1dc4fb078f32d15217322d1608510f291eef456df35f SHA512 7c33984014c2b95bde59affee88bc77caa2788dbdd7db87150acd58c56304932bf4b030994c91fc655f0f32202b8d1ed370c3d19d09569af50ffce91414d62ac
+DIST node-v11.9.0.tar.xz 21703796 BLAKE2B 9097a93b749b7a3dee38507ae37ece985872391f86f75a7aefb7820c361e98e708e4629fe2c5c8d76de9e9fac8c9b8d8811b490b63ce31ba57777abf47cc2fe3 SHA512 beb20a9042c990ae8978b5794db21d3461ed41b985ad6a5f163ea9563ed3277953926f83a81f49d7b7ae040bad95d7777ff758a03dd299a0de1014e008767da2
 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.16.0.tar.xz 15854256 BLAKE2B 0c70ce154639cbae12e0dfd6e7d5705999badb5872d71f388a3bb89f2830ddb096761aed47bdc6e310f2088fa79070d8a3427361206d74f686d86b27f929a4b4 SHA512 e9a222af328c8afb47b4b9c0f39ca5c1e45c5590b2064b3a8994b25f63acd041fba591d390e5a617db08d1212de15c438c66000ddcbc65cd071681311fa3591d
@@ -13,8 +15,10 @@ DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d
 DIST node-v8.15.0.tar.xz 18499412 BLAKE2B bba68517358cea14e9ba7c0c14b3f30caa00e358ff79d0602a1a71c9dd80334800ea2fd12086c5bee47cc23b9debe2cb0e36650f6be02e20615047a971297c54 SHA512 9a3d54ee9e22919ab425532ea64336b1dee0ae3ce4afd4eaacc109a2c2d34c98ea8188acd436c55a5dbba30fb4f95f8fcc9000ea60a81224d09b90d2f493cefd
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-10.15.0.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
-EBUILD nodejs-11.6.0.ebuild 6532 BLAKE2B c656a13b096d7925e7649e6ab1a4884bb484dfd55475c7fc951a18e27614667e47a945da30adbf9a9c15bb0dbd986cecd9deb0aa5af15ff6553857348a087d8c SHA512 a7743833916e53c7f10856d6bb5825d50a34d8a2f2a2ba4172d34c275249a4c076472b1bd1d452ffab425955c173560dc3339f6ccf94103619ce84f3ea90c773
+EBUILD nodejs-10.15.1.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
 EBUILD nodejs-11.7.0.ebuild 6531 BLAKE2B 5d5288b5d2787c299542605b32788187eab4107bddd80dd807e7fc46be19fabef4e59a2218be074849c13c09a1dde9e1a81e254789cb31ca3efefd3c88961646 SHA512 d8045148cfe83f9d76688d99840bfab4c32cc3b4ea3260c83f46c41bc2698715d52d0f99b564a141a1b61729da72aa12ba48507a38d29eeef9d0902ca5dca8ed
+EBUILD nodejs-11.8.0.ebuild 6531 BLAKE2B a63270b2483868d8d1952b316a9c62d85901d810e56de37671e1657fd6a26b44e67082ad1e55caf488f9eb45e21b6d3c8851b0075ba7196df921b4868169af2c SHA512 d5bad17d438452d89f52146d5630d1ee8dfb08442c86a48e4f718f700d37cc63163142463a342942344c4f63ae30caaae8f66c5d36e96aa4597b13fd553ca9cd
+EBUILD nodejs-11.9.0.ebuild 6531 BLAKE2B 4976062182cd5b05b455f5c82ab6630ef996b87978405a7d11434404b11a199541444f1a83babf66115bd5b5d2c33786cb70ccc0d57917243d122d526cd99a53 SHA512 551ed05471504b1112c1f1e4b37d2151f4025148f0d27de9717f5f92aefa650f192b9a9e097ea90119148c04be8321f1ba7c75c0120c6f8d9db759cd55531d36
 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.16.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
diff --git a/net-libs/nodejs/nodejs-10.15.1.ebuild b/net-libs/nodejs/nodejs-10.15.1.ebuild
new file mode 100644
index 000000000000..959fdfa0bf29
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.15.1.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.23.2:=
+	>=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-62.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*: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-11.6.0.ebuild b/net-libs/nodejs/nodejs-11.6.0.ebuild
deleted file mode 100644
index 69a0e9fdb543..000000000000
--- a/net-libs/nodejs/nodejs-11.6.0.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
-
-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.24.1:=
-	>=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-63.1:= )
-	ssl? ( =dev-libs/openssl-1.1.0*: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}-11.4.0-stdarg_h.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 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 "${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() {
-	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-11.8.0.ebuild b/net-libs/nodejs/nodejs-11.8.0.ebuild
new file mode 100644
index 000000000000..b3d856deb7fe
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.8.0.ebuild
@@ -0,0 +1,210 @@
+# 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.25.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-63.1:= )
+	ssl? ( =dev-libs/openssl-1.1.0*: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}-11.4.0-stdarg_h.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 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 "${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-11.9.0.ebuild b/net-libs/nodejs/nodejs-11.9.0.ebuild
new file mode 100644
index 000000000000..a72d4a393548
--- /dev/null
+++ b/net-libs/nodejs/nodejs-11.9.0.ebuild
@@ -0,0 +1,210 @@
+# 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.25.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-63.1:= )
+	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}-11.4.0-stdarg_h.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 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 "${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/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
index 51792eb5dd75..d07e8a88f55e 100644
--- a/net-libs/rabbitmq-c/Manifest
+++ b/net-libs/rabbitmq-c/Manifest
@@ -1,5 +1,5 @@
 DIST rabbitmq-c-v0.8.0.zip 249220 BLAKE2B 171ae0ffc093851089f4dc11cc1e8ef25ae90cbb0cce75ffb93c04a765b7d195e5bde8bbdaa4ce0c598c7f4bb291ed204d157443ed927db373a89f8ab9e7ebc0 SHA512 e386979ce1bc05c02cda06e8582981e0df25f9b31ca950f8a921bd2b249020f751ba65a6f38b8f5ba0be1b3e89492b29b72c6cd1d5ed3d6f19440799d6419ba6
 DIST rabbitmq-c-v0.9.0.zip 227245 BLAKE2B ea37e0a9734bc7a8923cab880a9e150f055bab83bb79eb793882a1d435e6e435fbf4610034235f858d0e4d20978287b9432b312c8c3eea5e588655dc2f831554 SHA512 0cac0e26b4caca3de22b468200a20c38c8ace1a824442faa0855d93922b0c3a649fc2067366f6694eca0be635187ca9a9cfe47643472f4abb3d67028768f49fb
 EBUILD rabbitmq-c-0.8.0.ebuild 1107 BLAKE2B a6b9018702b7b2969fb3f95a843aa243c7d057bd416dba9ab16fc586db8f9434995593fb6af660818008f53a02ff4db34364a4bd3fa3a37319623d7cc0274a7b SHA512 ea8089584ad9d42759c6bf901cef3e5ae5f0a9d6d2631ba86079f29b399c15898eba183e10e415a9d1d3dcc85fbb443014c6572f4695e3e114bd6a44c03523e0
-EBUILD rabbitmq-c-0.9.0.ebuild 1331 BLAKE2B 44b776bcd36dd8c8ef4498da062215dd1ae4b89461f0936e1ab93e960bf6f0465f9cb4d56ff099e4616da1a07cac49e8883dace20cf12658632404fb3ccab38d SHA512 02382404ffb6db5db3b7ee3d06a099753ac427b67e15162df1715f72741556a942ff79547ff40481517bd45231d961e523305aa5cd8954671aa5840e1c1be9ea
+EBUILD rabbitmq-c-0.9.0.ebuild 1330 BLAKE2B 3431c4282c76ea9efd302aea430f81988a2b644c865df9b12ee609b4105f8afe312fe5070dcc4041971e350b8d029a60ecebde2ada116dbe9409b636d64ccc3d SHA512 0ba4c80f9feb45c451e1cab9e922c1ee688d5854a3211e2e3c6e148ca4d2393342bdde428d8465dc8b7ea482b1594933989e20c91c0ea4ba7329405a091945fc
 MISC metadata.xml 334 BLAKE2B 672c5318c4bde4bcece68c54ef2267f870bef399b2f1f245fffbaef00be8debe125362f5e082af20738487636be8116c8dd14cbcced2c6f3d3862bd3ffca4377 SHA512 e28cd79f898d2fc3a02d48b62a572102724cf18951810791479c273f8407f0c4bf8f202bf72f035c8383fe7ab4a8f216a98ce79cbaa9bb1ad82f69c26d762d76
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
index 5f1af9841fa7..ad4a454a7899 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.9.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.9.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"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/alanxz/${PN}.git"
 else
 	SRC_URI="https://github.com/alanxz/${PN}/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 951737bb2efb..7b5d6fb1eaf2 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 1500 BLAKE2B e7e102d1529c6aed63c22adb97dff2ede198b33e85b2fc8189be2d672a1a80a144cfde3966a737924598550f6066a0307be85ad4344c54f3b3eb8f701a6f159c SHA512 2262dc3bd64e0a6e6798bff6b876b129e022a183033a14d69206fab64191d3b7b89fa2f07e18057df47d097e6628c33e8183bb7b2fb985b00dc2c57b8cc0fe47
+EBUILD rest-0.8.1.ebuild 1505 BLAKE2B 3c0d1e6274a5f9f1b783a0c4faf350c28ead3ae7931ec413411c1b23606f0fc87f6489555205a2950565a36e08e987ef38d5a585b8bd8a72b1600444a354d042 SHA512 291c84bb788f69496e05a26effc63753a3bc111ec9eea8fe36ad827745b298c509be186952340abebf85b4e45b3ba34ace4914b8eb45c02f4cb91c9d7a64a2f2
 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 ebfd6ac2bc28..831f75ec61d0 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.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"
@@ -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 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-misc/Manifest.gz b/net-misc/Manifest.gz
index 6241973b890a..c31fbcfd7883 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index b847760f905c..9f2d027d51ea 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -5,5 +5,5 @@ DIST cni-plugins-0.7.4.tar.gz 862510 BLAKE2B 7ec9ec84614caecaca1583430552bd93606
 EBUILD cni-plugins-0.7.1.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.2.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
 EBUILD cni-plugins-0.7.3.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
-EBUILD cni-plugins-0.7.4.ebuild 1064 BLAKE2B 57a11bd2def29f78cae12c5683f7514b65650a872e2fc39000e27cfb3f5d3cc2f197f63048053038293646cc8afa8e7dfa4b8267d1ce81856821e8d3ddd039a9 SHA512 b5639bbafb522a0e2161d98a37b19a28aa89796b61cc840f5ff4e99d673783b15453419041cce365f8a2d325e9db9cb280154e70871307aaff337283203263ce
+EBUILD cni-plugins-0.7.4.ebuild 1063 BLAKE2B 5d07a8eb1acd7a42f5d24a309725d7a8df3192e7aa85f05f694024b4e65b7cdab3841796cc960bc13b5f615524de532fe81a4c08a5cc5930f3d6122339730298 SHA512 fd4fdbe92167dc99fed41991477d4a8cb52ace90525ea185ee86c37c75c2b5cf509f63dfe7c0b900f56ed8194f6c337779e57491c82277fae314a88fc5184a77
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
index 33c40be3cbf2..0fbcda6f9546 100644
--- a/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.7.4.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
 
 inherit golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 DESCRIPTION="Standard networking plugins for container networking"
 EGO_PN="github.com/containernetworking/plugins"
 HOMEPAGE="https://github.com/containernetworking/plugins"
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 1294b0aabd5d..4a39237b85e0 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -28,5 +28,5 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 EBUILD dhcp-4.3.6_p1.ebuild 7814 BLAKE2B e3bb178b440b23c39e97fc082af1949dcd3bc9c5b9ba0b778ffbb10cfb8e99e3b8cc3d3c79b1dfa10bb7d924f7b643704a9acfef4289d822b78a71910f632721 SHA512 627121c2f592bdf85e3d1b7b1d98209caa7eda69fa2ca6d9042ed3e6c07b9a4ef2b4b9d985930d21e7275e55ea6bcba816c87b6339f88249d29554d7cf2771b4
-EBUILD dhcp-4.4.1.ebuild 7927 BLAKE2B d59c3bc1bffab0dd9f2065082a06b22f455910475d1d415482d12819cf2fead427c5946658ea58f70eedd3cecc271477e89b46d53a21f1f859f09d46ec1097c7 SHA512 2e223ac06d25a7f9dddd04b664c744479f1b0d8f20f46f807da0ff5e2885bce57e64f0f940be9e38e794d64ab2181caa6e3dd2f7c5b28ca717286ff8b170118b
+EBUILD dhcp-4.4.1.ebuild 7941 BLAKE2B 7b6913b724a4f50dfd1e63a9f65b7192298660cf56c368a565c4b0ce8efe5adb702abc84586f371b633493942f6b8b044d2e82e39952483aa2e599dc3c8e1e12 SHA512 aaad6123f649f136b3f8ccb675a5661c1d0b142cbc0748d114dd96b47f89ab4a85ba774933d675bd87aa70f7cdc7149c3fe299a5e4f3ada05a7cdaa8e79aac32
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index b092a1229505..140b6f709966 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.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
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
@@ -170,7 +170,7 @@ src_configure() {
 	cd bind/bind-*/ || die
 	local el
 	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
 		--disable-symtable \
 		--without-make-clean
 }
@@ -192,7 +192,7 @@ src_install() {
 	if [[ -e client/dhclient ]] ; then
 		# move the client to /
 		dodir /sbin
-		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+		mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die
 
 		exeinto /sbin
 		if use kernel_linux ; then
@@ -224,15 +224,15 @@ src_install() {
 		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
 		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
 
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560
 	fi
 
 	# the default config files aren't terribly useful #384087
 	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+	for f in "${ED%/}"/etc/dhcp/*.conf.example ; do
 		mv "${f}" "${f%.example}" || die
 	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+	sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die
 }
 
 pkg_preinst() {
@@ -245,10 +245,10 @@ pkg_preinst() {
 	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
 		h=${f#*:}
 		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
+		if [ -e "${EROOT%/}"${f} ] ; then
 			case $(md5sum "${EROOT}"${f}) in
 				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+				*) cp -p "${EROOT%/}"${f} "${ED%/}"${f};;
 			esac
 		fi
 	done
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 922d6990676a..cf04fc28c511 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,16 +1,12 @@
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
-DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6ae0292bfedb3a96ce435a774b42fdc1a1e9d288edc786c544c17c21fd7d3c8c6e6a6832acdad7e1f5edfa8c0b SHA512 a23d5dde66567c4addbc86c8b3fbf2c5d4dba3b463659729778a310306ab0e949be8998154ef15401ac2d289bde2f090d44492bba6a1becd2f01890d4efe7051
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
-DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363 SHA512 5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
-DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B 4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac SHA512 04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
 DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
+DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24
 EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc977b8541f07a27c43f908bfe0867addf4b949c8e9f9e4163ca6f366f2083949f9b4d895d4e4bfc858d23cc3f514 SHA512 8c650ccff0f4ffb6ee9a17046b18c7f4c0e849e25b73d3d3abea66cd423a77e1c80c830f639d2ce74bc9c7566f8d6cea968feeb52ccdd6e20a5975f08f6a4b75
-EBUILD dhcpcd-6.11.5.ebuild 3271 BLAKE2B 5064827809559cd2057813ca86889dcdb85253477a44b3a8393fcaa75944a4dab38161796b62943f7b88f88eca15a9012822293499649a4ddc125768ce89dafa SHA512 407eca53d8b7bf76702ed0e87b582ce7b88a8d4598619b192f59309fc111b9048ed222a81a1a5c9404e50b88c036302998682c41f11f049cb959a9d5ced881db
 EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B c27f5d78441c62e481f4439fbebe8454838e6e1e577b239848d6d484754e12da270674ec15ed0de27645508687160077155f0e639254b8fa2da6a92578bd619b SHA512 93e79e9148afd868ec9d0c8134d538b19d2f894056beda42bacc9a6d2ae57989e862e109fd3525e78149a6f7a83e6898972af9c2b0e21892d33aac01079946e7
-EBUILD dhcpcd-7.0.6.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
-EBUILD dhcpcd-7.0.7.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
 EBUILD dhcpcd-7.0.8.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
+EBUILD dhcpcd-7.1.0.ebuild 4469 BLAKE2B 584d2050407bb0bf6bf6e20ca29213dd0305ea774eb6b67afec190dd111890848fe8376cd73b1c956ec50360c85325be5d01e2f32139394fa5b5fbc057eb2fd5 SHA512 356e8dac57a1f8229dd7c68d7cc7164b21178592400170251a11c3a52098e78ba1c24d36e5c5bd672d7c550a2be86d355efb5e757c07e0617ac194f511011014
 EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
deleted file mode 100644
index 3880ad082832..000000000000
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
-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
-
-inherit eutils systemd toolchain-funcs
-
-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}"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" dev-vcs/fossil"
-
-	src_unpack()
-	{
-		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
-		local repo=${distdir}/fossil/${PN}.fossil
-
-		addwrite "${distdir}"
-
-		if [[ -e "${repo}" ]]; then
-			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
-		else
-			mkdir -p "${distdir}/fossil" || die
-			fossil clone "${FOSSIL_URI}" "${repo}" || die
-		fi
-
-		mkdir -p "${S}" || die
-		cd "${S}" || die
-		fossil open "${repo}" || die
-	}
-fi
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	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.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.6.ebuild
deleted file mode 100644
index a146481fe88b..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.6.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
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-	inherit git-r3
-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
-
-inherit eutils systemd toolchain-funcs
-
-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}"
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_old_duid}"
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_duid}"
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files="${old_files} ${old_secret}"
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files="${old_files} ${old_rdm}"
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.7.ebuild
deleted file mode 100644
index a146481fe88b..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.7.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
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-	inherit git-r3
-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
-
-inherit eutils systemd toolchain-funcs
-
-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}"
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_old_duid}"
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_duid}"
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files="${old_files} ${old_secret}"
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files="${old_files} ${old_rdm}"
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild
new file mode 100644
index 000000000000..a1f2efc1cab5
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	inherit git-r3
+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
+
+inherit eutils systemd toolchain-funcs
+
+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}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index aaf17b76e666..b5c084b3ab20 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -9,8 +9,8 @@ AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23
 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.2.tar.gz 8934781 BLAKE2B 1edbde4d26056b13efe84b93eb39ce0db4a20baf29367216c2cb4ac0e5c8887ca6be42e70fcfb095d7a2e80a539646c1a87677af82eee62a34380bc13b57600c SHA512 da8eca13c54eb12938ce204905df535cdf1402874109bee636d4c5acb106530463d6d96a636e7418b7635073491df6aaf50ea172e53b2c75ae6844f9f94eefd1
+DIST Electrum-3.3.3.tar.gz 9192110 BLAKE2B c4884125f5309c18d324b2bdcc9afee05b3beeb124ca45a0c6f3207b19cf9431f5ed15fbd066c854f8f7bfa89e347df5578eda825ab43e69c502fc7ced00e8ec SHA512 a30287794b87f3e3ad02be4c32281c22dcfec801ff0d4602e6adcb85e532c34e69b60e2aec65f5d6ef8ae68c21b068fff87ca685ef8caca4c785b56cb400e23f
 EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
 EBUILD electrum-3.2.3.ebuild 4431 BLAKE2B 73632ec671f7a2b95b39bf068f727fbc5d2007a58531fc827d1375a569b7a92d4cd99f3ec0be7984436b7160ea951de618bd21384e0aed437ece99435c911e6c SHA512 dd37f22a0462612f3723597815150a8516c822b5e45e89382355815fcca2c5fa0be02227dca8a6532e330a3c088a28af819d44bba7eb422293512194ca29e587
-EBUILD electrum-3.3.2.ebuild 4547 BLAKE2B 0434e4c617a94fbcbb523aff284292c733939fcf0746c93732505e10d26ca7b5dcf30791f85b1b8a55e0c7fa0502c44ffcbc2c9e3317470d523ccb18cf3bd866 SHA512 5fdc51e424941a1f5aa9e63e6804df091997c50b8e6649227ebae940d527de41d92626519fa036ecc46d77db1af0aea9d9ba8528c55bdee12bab1c35475bb0fa
+EBUILD electrum-3.3.3.ebuild 4629 BLAKE2B aeecbe400dc123f9e363a0730beebda4c092f324eb38f9a891101bb548ee0ff904c7e503f6c487695fa72f4264816b1acc64292304110582e49d6300b73c46ab SHA512 f70bb7dbc876302be045bba03dc5d5e77ea17798c2052739bb26736151bbe9f1d17d8d11beaa7e3406d2d897bbe9299e93f7f4e1a76ceb1bd1416f549cda919f
 MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
diff --git a/net-misc/electrum/electrum-3.3.2.ebuild b/net-misc/electrum/electrum-3.3.2.ebuild
deleted file mode 100644
index e899d91abe8c..000000000000
--- a/net-misc/electrum/electrum-3.3.2.ebuild
+++ /dev/null
@@ -1,176 +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/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.3.ebuild b/net-misc/electrum/electrum-3.3.3.ebuild
new file mode 100644
index 000000000000..f2fa58dda34c
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.3.ebuild
@@ -0,0 +1,178 @@
+# 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/exabgp/Manifest b/net-misc/exabgp/Manifest
index cf62aa7e7b83..c36a023e59d5 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,3 +1,5 @@
 DIST exabgp-3.2.17.tar.gz 596373 BLAKE2B 410b77af542160334d32e3e3ea54b25f45c990c56fe2dbef0714576eb9e728cebe6d1463c0f22b1240aaf8e99ccabc5f7334cd6c2b3c77426c94b2c048c8783c SHA512 69dbff75caf287e9e0f6ab3707a2bbd576b0b4c8a8c318217cf88c8a1c417d47915b038bc7d64be3bbce9771caa550275703e5543fb5799afc7149dc9f054416
+DIST exabgp-3.4.26.tar.gz 544456 BLAKE2B 75f62ce8a68588f711e86208f00cc6de9ae51a5c82f833b91459bc05974c8eff06fec080823adfecea7b75a43caa3310f6395bd22ab4e6a696f230787bbaae23 SHA512 6cfcc8a40e1e05dfa76df46d8b5e13ce85e73f078d6ab4d2e23dd85035c1ed52bbbaaaade81602ea7572841e6e20d7d7183a7e968599f9e8314e1b89e3a6341f
 EBUILD exabgp-3.2.17.ebuild 435 BLAKE2B f9075fca0cc83f4ab693453fd434538fa72f7b7efe0f2702b9fd7fbc40fced273dac906be1d24fd2ebb58b350df862a95e0dd22859123703871546062e8f6806 SHA512 200dbcc99913a28bd69a7ebde17b729efb280fd1c79e7cd99196c1648f60f771ddac734dbd56d5c4ecc182fd00e9d9d7d89e7b46ed09e9c67bd9c35d544f8359
+EBUILD exabgp-3.4.26-r1.ebuild 400 BLAKE2B 0be76cb073e639dc6bc3a4dc61da8dd3da7c63c407af1af08c3e18a4d224ca87092f91d647dd3a8eecd1595680c0521898f7c378679c6816a430eb47422e01b6 SHA512 50fc08f265c6f5025426257d4ad5c6039137450654a2cc9116c29d61c6f07a16379be4adfb6b62f746bcfaa1e00e92b3b56ed2cde070df9e549a2807f89ad71b
 MISC metadata.xml 339 BLAKE2B 863e3a5221b0dc3ef29b27b0d27a0941adc634d0287881bc586005ac6ed60e33e7a1dd48d63b237a78581b7a9890347a8ecc5346ad90cae732763235e486f8ae SHA512 81c99b9e586b1873b2949359be5147e2651e1b7a7e81aed124f54248f2c5f96ffe68f19f153d7029ec8a16e04b1a71b0c6c79c4c747d5901079a536d716acdc8
diff --git a/net-misc/exabgp/exabgp-3.4.26-r1.ebuild b/net-misc/exabgp/exabgp-3.4.26-r1.ebuild
new file mode 100644
index 000000000000..c0a9b4043dbc
--- /dev/null
+++ b/net-misc/exabgp/exabgp-3.4.26-r1.ebuild
@@ -0,0 +1,16 @@
+# 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="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 065aae7f975c..a6aed74a5db4 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,7 +2,10 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
+AUX gerbera-1.3.0.config 6341 BLAKE2B 3252c1a1695953e52335c8cc35515ce5af3162499d35e4b05a6fe5c674b8f97bdff43d887e5934b12309a8fb7191df957b07fd96cbcb7ccd0bd61e2f491f20c6 SHA512 8748277007760c60484a23edf73e81301ad9d327a6c8a5ee26a2d9f83c6b4eefdc6fd849979c4ae9a178ecd7827ed7cbb8214d686bd08cf63ebf4da16f45c616
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
+DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d SHA512 1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
+EBUILD gerbera-1.3.0.ebuild 2551 BLAKE2B 9ca7199ed286be5bcbcc6cf5f32b51966423d274f105854a76da68d06fbeb1f85b4bfc70eaaee7cdf2ae0b6e83e501aa374fb7a3fe231e99f06e9e4f1be6bf82 SHA512 f834b15ed8fd8d10bf331cefbd984cd06c5b890a97c0b2a95f49ba46ce707311d8b8e2bef9387699c29b650b4c4490d04bebd0590b96a43fb692ea219ae3c5dd
 EBUILD gerbera-9999.ebuild 2554 BLAKE2B 24fbd4b31248cebce80d7732b5b3e884adfe72f83986e0d0b44f573ae856bc50170d3b253db0fb67848495bf44f1f1de389c389dbd84546a713f4da55d75fba3 SHA512 8082eab99d34aeb588f4ece501de7f45e8acd34eac5af3380053c81a1c96b97d768bba05301563f69b29b8e7e9ef74d56bb163542a6e4e5d3475952e3e51e086
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config b/net-misc/gerbera/files/gerbera-1.3.0.config
new file mode 100644
index 000000000000..4c41a27143cf
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -0,0 +1,147 @@
+<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
+  <!--
+     See http://gerbera.io or read the docs for more
+     information on creating and using config.xml configration files.
+    -->
+  <server>
+    <ui enabled="yes" show-tooltips="yes">
+      <accounts enabled="no" session-timeout="30">
+        <account user="gerbera" password="gerbera"/>
+      </accounts>
+    </ui>
+    <name>Gerbera</name>
+    <udn>uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9</udn>
+    <home>/var/lib/gerbera<home>
+    <webroot>/usr/share/gerbera/web</webroot>
+    <!--
+        How frequently (in seconds) to send ssdp:alive advertisements.
+        Minimum alive value accepted is: 62
+
+        The advertisement will be sent every (A/2)-30 seconds,
+        and will have a cache-control max-age of A where A is
+        the value configured here. Ex: A value of 62 will result
+        in an SSDP advertisement being sent every second.
+    -->
+    <alive>1800</alive>
+    <storage>
+      <sqlite3 enabled="yes">
+        <database-file>gerbera.db</database-file>
+      </sqlite3>
+      <mysql enabled="no">
+        <host>localhost</host>
+        <username>gerbera</username>
+        <database>gerbera</database>
+      </mysql>
+    </storage>
+    <protocolInfo extend="yes"/>
+    <extended-runtime-options>
+      <ffmpegthumbnailer enabled="no">
+        <thumbnail-size>128</thumbnail-size>
+        <seek-percentage>5</seek-percentage>
+        <filmstrip-overlay>yes</filmstrip-overlay>
+        <workaround-bugs>no</workaround-bugs>
+        <image-quality>8</image-quality>
+      </ffmpegthumbnailer>
+      <mark-played-items enabled="no" suppress-cds-updates="yes">
+        <string mode="prepend">*</string>
+        <mark>
+          <content>video</content>
+        </mark>
+      </mark-played-items>
+    </extended-runtime-options>
+  </server>
+  <import hidden-files="no">
+    <scripting script-charset="UTF-8">
+      <common-script>/usr/share/gerbera/js/common.js</common-script>
+      <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
+      <virtual-layout type="builtin">
+        <import-script>/usr/share/gerbera/js/import.js</import-script>
+      </virtual-layout>
+    </scripting>
+    <mappings>
+      <extension-mimetype ignore-unknown="no">
+        <map from="mp3" to="audio/mpeg"/>
+        <map from="ogx" to="application/ogg"/>
+        <map from="ogv" to="video/ogg"/>
+        <map from="oga" to="audio/ogg"/>
+        <map from="ogg" to="audio/ogg"/>
+        <map from="ogm" to="video/ogg"/>
+        <map from="asf" to="video/x-ms-asf"/>
+        <map from="asx" to="video/x-ms-asf"/>
+        <map from="wma" to="audio/x-ms-wma"/>
+        <map from="wax" to="audio/x-ms-wax"/>
+        <map from="wmv" to="video/x-ms-wmv"/>
+        <map from="wvx" to="video/x-ms-wvx"/>
+        <map from="wm" to="video/x-ms-wm"/>
+        <map from="wmx" to="video/x-ms-wmx"/>
+        <map from="m3u" to="audio/x-mpegurl"/>
+        <map from="pls" to="audio/x-scpls"/>
+        <map from="flv" to="video/x-flv"/>
+        <map from="mkv" to="video/x-matroska"/>
+        <map from="mka" to="audio/x-matroska"/>
+        <map from="dsf" to="audio/x-dsd"/>
+        <map from="dff" to="audio/x-dsd"/>
+        <map from="wv" to="audio/x-wavpack"/>
+        <!-- Uncomment the line below for PS3 divx support -->
+        <!-- <map from="avi" to="video/divx"/> -->
+        <!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 -->
+        <!-- <map from="avi" to="video/avi"/> -->
+      </extension-mimetype>
+      <mimetype-upnpclass>
+        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
+        <map from="video/*" to="object.item.videoItem"/>
+        <map from="image/*" to="object.item.imageItem"/>
+        <map from="application/ogg" to="object.item.audioItem.musicTrack"/>
+      </mimetype-upnpclass>
+      <mimetype-contenttype>
+        <treat mimetype="audio/mpeg" as="mp3"/>
+        <treat mimetype="application/ogg" as="ogg"/>
+        <treat mimetype="audio/ogg" as="ogg"/>
+        <treat mimetype="audio/x-flac" as="flac"/>
+        <treat mimetype="audio/flac" as="flac"/>
+        <treat mimetype="audio/x-ms-wma" as="wma"/>
+        <treat mimetype="audio/x-wavpack" as="wv"/>
+        <treat mimetype="image/jpeg" as="jpg"/>
+        <treat mimetype="audio/x-mpegurl" as="playlist"/>
+        <treat mimetype="audio/x-scpls" as="playlist"/>
+        <treat mimetype="audio/x-wav" as="pcm"/>
+        <treat mimetype="audio/L16" as="pcm"/>
+        <treat mimetype="video/x-msvideo" as="avi"/>
+        <treat mimetype="video/mp4" as="mp4"/>
+        <treat mimetype="audio/mp4" as="mp4"/>
+        <treat mimetype="video/x-matroska" as="mkv"/>
+        <treat mimetype="audio/x-matroska" as="mka"/>
+        <treat mimetype="audio/x-dsd" as="dsd"/>
+      </mimetype-contenttype>
+    </mappings>
+    <online-content>
+      <AppleTrailers enabled="no" refresh="43200" update-at-start="no" resolution="640"/>
+    </online-content>
+  </import>
+  <transcoding enabled="no">
+    <mimetype-profile-mappings>
+      <transcode mimetype="video/x-flv" using="vlcmpeg"/>
+      <transcode mimetype="application/ogg" using="vlcmpeg"/>
+      <transcode mimetype="audio/ogg" using="ogg2mp3"/>
+    </mimetype-profile-mappings>
+    <profiles>
+      <profile name="ogg2mp3" enabled="no" type="external">
+        <mimetype>audio/mpeg</mimetype>
+        <accept-url>no</accept-url>
+        <first-resource>yes</first-resource>
+        <accept-ogg-theora>no</accept-ogg-theora>
+        <agent command="ffmpeg" arguments="-y -i %in -f mp3 %out"/>
+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
+      </profile>
+      <profile name="vlcmpeg" enabled="no" type="external">
+        <mimetype>video/mpeg</mimetype>
+        <accept-url>yes</accept-url>
+        <first-resource>yes</first-resource>
+        <accept-ogg-theora>yes</accept-ogg-theora>
+        <agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit"/>
+        <buffer size="14400000" chunk-size="512000" fill-size="120000"/>
+      </profile>
+    </profiles>
+  </transcoding>
+</config>
+
diff --git a/net-misc/gerbera/gerbera-1.3.0.ebuild b/net-misc/gerbera/gerbera-1.3.0.ebuild
new file mode 100644
index 000000000000..fcdb0195c5e0
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( dev-db/mysql-connector-c )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${P}.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index ad2e14946e39..1f6e52edcce2 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,7 +1,3 @@
-DIST gns3-gui-1.5.3.1.tar.gz 5784326 BLAKE2B 535ef34b24a4069e597f0ac12900057d4ea10f03ab4dd4ee342091c72743d611b442cd2c3cdd9cde65a357ff26e776702e730be916533960c3cd0c9a53149553 SHA512 1d145d1565dc890d3e54386d9867826470cce2997d42f113cfcfd9a2cadd6e215e96753af8f0cdc9d2a7776341d9c4cb8ac473084126ba4ea76585de4c37dd0c
-DIST gns3-gui-2.0.3.tar.gz 5528039 BLAKE2B 05831031780a163f650a3eef8b4fd67629f0550fcd8a0b3a76f53d18bec073199d437755c13e856a10a11a210d9c923c11ff7466a706d5a3b07291d5a04f51e2 SHA512 0c6955c885c1110acd4c791e92ba24db583d259938bb7f0c2147f3f648dabd4dcaeb2967b8e30e6169adca9f3b8ee667f00431bec66d6fb5fde1f9d90cca88f8
 DIST gns3-gui-2.1.3.tar.gz 4792762 BLAKE2B 577381bdee06f967e4fddec3b0885920e8a25380d834ab1c983e010d40a14f63c69912f745bb72b4605e49cdf7192fe52ac57380d5f65f03d067a2f1dd03f7d6 SHA512 da90eea0920f9fc10bb5ea7e0039ca11bfaf36870e182a6b97ffdbab9f12da0d13b58c4a13ca747add675426324f3c1cde5eedbd858a68ee4bbefdcdff193904
-EBUILD gns3-gui-1.5.3.1.ebuild 1298 BLAKE2B d2d929f042245309c1ed7ec480cb308187a85d05afd4f6f4a6fc791d028f179e20875f6307929c8adba1940c1b334334f60fd9f238ffd456268b789722757a77 SHA512 c72192cacf1eef3aa51b7c61855de8a311cef10f45d868983b28160354421f3907a083fcc18425ebe7d1d607525da00f9b09f2b8282347962329a44d3e91729b
-EBUILD gns3-gui-2.0.3-r1.ebuild 1122 BLAKE2B 526c3900f792e3c35069889752978856159699313d80cce1c24adce2a17b1a1b29835e77c14eed5ca24718485a73061ae3b5a7ae322354855676507f8b0381e2 SHA512 fd193520fde60f2e32bc6e775ba6b35ed3954985172847cfb1823aa081ad7f379a8211861d764c2b533343f6ac4098e1c673aade05c7b634c26dddf31b82c27f
 EBUILD gns3-gui-2.1.3-r1.ebuild 1132 BLAKE2B 9ea73ce3b39d4fedf55e82555c5024efa465ff9d738fa362e0d764c5255e64f536fb3e4a633fdfafc950208c1780830c51dd31b6e9c44648a7a2996efcc0acd2 SHA512 16e3ebb36a594864f5e174977f4f7406b0ed2cd391f2c801f52b73783cb492ab4819ce96e034726130347a0bb6aac79b8db8a0bb8aec64e28ac971132feedbf2
 MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
diff --git a/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.3.1.ebuild
deleted file mode 100644
index 705031598053..000000000000
--- a/net-misc/gns3-gui/gns3-gui-1.5.3.1.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
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-#net-misc/gns3-server version should always match gns3-gui version
-
-RDEPEND="
-	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-	>=net-misc/gns3-converter-1.3.0[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_configure() {
-	# temporary fix until upstream releases 1.4.5 with proper setup.py
-	sed -i -e 's/gns3-net-converter/gns3-converter/' setup.py requirements.txt || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
-}
diff --git a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
deleted file mode 100644
index a8118d51b05d..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# tests are severely broken upstream and they have been notified
-RESTRICT="test"
-
-#net-misc/gns3-server version should always match gns3-gui version
-
-RDEPEND="
-	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,svg,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -rf tests || die
-	eapply_user
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
-}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index d20dbe92d45b..0304fa78b222 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,9 +1,4 @@
 AUX gns3-server-2.1.3-typing.patch 259 BLAKE2B 5950ecf364b86f472bab5d5a8c59982086be7b3c541b841f0b6c31e3b4b585d88c4a8e3e013939635cb5c89e8cadf65a428521429ec166879d1a5f90e776b92d SHA512 02a7cafb1c0c306be8177c8c206800511953dd115b428810baa6711ba2e8bba9ae5be7bd9768a87fceb1bf75618fc59c31349e5bf3d55eebe1636a3c71e7fb00
-DIST gns3-server-1.5.3.1.tar.gz 847598 BLAKE2B 9a025150cea08830f39e63d4ff79897643bc846d4ccab4b9e3d37f8fa9b3de26296a30d3b93c38fdbb4e927653978e0aa4f1f4d5200b176f102f4c550bc7edd9 SHA512 79e8b2546d8239d78fcf621fe8e88c0ddc10bea2e216225ca1f48ebd4d0e307cebc81e63ded2e36cca50917d518d52d8619eed5a84b39123c3ce56f3a6606fd9
-DIST gns3-server-2.0.3.tar.gz 1468528 BLAKE2B fac026020563386553841e98c8f056cc270b17a7896481fb268b1633a3166737a3be111b9cf7f38dacb85ee2e8bc371fa32490e4a3fe07e708b01c57af1d79c0 SHA512 a9927e414f6fc6558cecabd006f9d123752b0b6e5b88408a53a6d1f195d22047ffdc3e4ccc6e132d04135c434174aa4b58f29deae9e952f83ccc678037f25b8a
 DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
-EBUILD gns3-server-1.5.3.1-r1.ebuild 1583 BLAKE2B f609acbb3ad6df54f9c01a6bc0553d59732a4b591d81d8fed3896dddc4c6985be2eb56acf14efbcffa405ed41e91dbb519c499f563ddc8dcb85ccb168e29fd95 SHA512 52a2ce317b0c3586a63be29bd358e0a3271474ae9fb11f87affb82f8fc8797a9696308483dd8fae75d2b409dc1e2ee98e4d27c9588885bccf8a557103781399a
-EBUILD gns3-server-2.0.3-r2.ebuild 1644 BLAKE2B 0437d9b2d7f0a199de1ab40391dd42c506b019ece76fcb0cdda18d2e969d9e59486601c51e2f5bc7f8c280efb9c1299f212c76d4a8393e72fcddace949e9db2a SHA512 b241a4d568ecf9405252087aa8b3240ab05071f64769f1bd5547dd602af24077fee6e0c5eb97330bb6471b698a19bff0fac6a7685d947947ef1b0cc5ba88ac59
-EBUILD gns3-server-2.1.3-r3.ebuild 1887 BLAKE2B aac42a46ac5c720c83931df923bd75fec153477c7764829c068a20d1d4433f84a11d1302228008901598b53926ce383fb8617ebda1ff9918e6856f1aeb62d45d SHA512 a6ad54a38c85a180757e60c47d04cd857f98a089e5510a19550a04ff5deecb2809cbf3c06271fe7676544d47bed0c4037f16b4bba6cd8a1db7d59a2ca793ecbd
 EBUILD gns3-server-2.1.3-r4.ebuild 1889 BLAKE2B b6203b65418462d4eb1f1b74306afc626b884da93e967807215a8ab7bb3d9db3830d492eb0de8506a38c62781b4847fa438e4086d042cb3d5e6d96b65ab8d6bc SHA512 32b2abd246d424b8be859e5e4551da367db4d3921e3388bf969d3e5f922b62eb9228f8bc12270195fef84cc72bc8cbbc6dca7c01c45635c76ae65a5f971dfb2d
 MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
diff --git a/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild b/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
deleted file mode 100644
index 8bcb6c9c3b05..000000000000
--- a/net-misc/gns3-server/gns3-server-1.5.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		>=dev-python/aiohttp-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/aiohttp-cors-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
-		>=dev-python/yarl-0.7.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
deleted file mode 100644
index 4dfbfec240f4..000000000000
--- a/net-misc/gns3-server/gns3-server-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		=dev-python/aiohttp-1.3.5*[${PYTHON_USEDEP}]
-		=dev-python/aiohttp-cors-0.5.1[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
-		~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	rm -rf tests || die
-	eapply_user
-}
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r3.ebuild
deleted file mode 100644
index 282ff6a38407..000000000000
--- a/net-misc/gns3-server/gns3-server-2.1.3-r3.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
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emulation/dynamips-0.2.12
-		>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
-		>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
-		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-		>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
-		dev-python/prompt_toolkit[${PYTHON_USEDEP}]
-		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
-		>=dev-python/yarl-0.11[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# https://github.com/GNS3/gns3-server/pull/1368
-PATCHES=( "${FILESDIR}/${P}-typing.patch" )
-
-src_prepare() {
-	default
-
-	# Package installs 'tests' package which is forbidden
-	rm -rf tests || die
-}
-
-pkg_postinst() {
-	ewarn "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
-	ewarn ""
-	ewarn "The following is a list of packages that can be added:"
-	ewarn "app-emulation/qemu, app-emulation/virtualbox"
-	ewarn "app-emulation/docker and net-analyzer/wireshark"
-	ewarn ""
-	ewarn "The following packages are currently unsupported:"
-	ewarn "iouyap and vpcs"
-}
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 98976fb8cddf..8e23bf583a67 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,4 +1,6 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
+DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 DIST gwhois_20120626.tar.gz 41698 BLAKE2B cce3a6eb385bb782a772a7532cecc2ae164d6ea00a42a6afa29b2ff4d16526507511c16e9cae3dab3d26e7818126b2fcd20a5d88a4affa472162f9ef30c0e464 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e
+EBUILD gwhois-20120626-r1.ebuild 1364 BLAKE2B 31f0f5d87f4955f1d56ce0f059e8fe7674b012325edfc92a8fa7c9ff639ea12933d635bb3007fe89852ae101f367e860ae4ed99b2a0d584cd0b53ea2442160be SHA512 d6a562e6ad5b71912daed0676bea90280c532a50c987a43f15c29c21f0954fee74afe69c7e4601cfb9129bf422104a90a94c7eefe2195a4617f6f73c8bee34d7
 EBUILD gwhois-20120626.ebuild 1176 BLAKE2B 8c4f27cd2a32a3227b4a22ebac16b9d694e8ce845ca450f83e3a23cc90a99f1ca0a0cdc044d9eb97cd9e801997d646df6d6dcfccada9df39626892a2da46758b SHA512 730f084c67f0051c130d25dd1f2dfb765b8ace18bf29d81454b8f937d45ec80e01cacfc02adc6652fa369e95fd3553d688edd4030b2b7455ce7201e6e3c4259e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
new file mode 100644
index 000000000000..3ff907bae8cb
--- /dev/null
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1
+
+MY_P="${P/_p/.}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Generic whois"
+HOMEPAGE="https://julijane.de/gwhois/"
+# Debian is still maintaining it
+#SRC_URI="http://gwhois.de/gwhois/${MY_P/-/_}.tar.gz"
+
+DEBIAN_VER="1.2"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	www-client/lynx
+	net-misc/curl
+	dev-lang/perl:=
+	dev-perl/libwww-perl
+	dev-perl/Net-LibIDN
+"
+DEPEND=""
+
+DOC_CONTENTS="
+	See included gwhois.xinetd for an example on how to
+	use gwhois as a whois proxy using xinetd.
+	Just copy gwhois.xinetd to /etc/xinetd.d/gwhois
+	and reload xinetd.
+"
+
+src_install() {
+	dodir /etc/gwhois
+	insinto /etc/gwhois
+	doins pattern
+	dobin gwhois
+	doman gwhois.1
+	dodoc TODO "${FILESDIR}/gwhois.xinetd" README.RIPE
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [ -f /etc/gwhois/pattern.ripe ]; then
+		ewarn ""
+		ewarn "Will move old /etc/gwhois/pattern.ripe to removethis-pattern.ripe"
+		ewarn "as it causes malfunction with this version."
+		ewarn "If you did not modify the file, just remove it."
+		ewarn ""
+		mv /etc/gwhois/pattern.ripe /etc/gwhois/removethis-pattern.ripe
+	fi
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/hotot/Manifest b/net-misc/hotot/Manifest
deleted file mode 100644
index 8cde0495c25e..000000000000
--- a/net-misc/hotot/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hotot-0.9.8.15_p20150812.tar.gz 1234481 BLAKE2B e0e3a29b476b0de8c23586193578bf597a96b5ec3f203da61ca5e0f89d0c8bc0d020d262ccbb622a9f0e01b5c10e7ae432e9907c83c0aaaa5beb1b7ff7845fb5 SHA512 8faffd583bc7bc2888acac5b33cf7ede285a5732c7349e9f84acf63788a9a96d6c0de0759605afcacb618d904f1a54e50581684d49bd637acd6036046f28bc7e
-EBUILD hotot-0.9.8.15_p20150812-r2.ebuild 1198 BLAKE2B 739de6653d70d5522893fd019a9e8aa002d4312146072ecc1facc7457493bddbead5172c1b15696ad0886e3177adfd42f54d2c97f37fb3811664854b95d93d04 SHA512 3f884a548d773ae567ae902ad78016c9134a62af3e3d4907f7e9674d5e3904f9cd9373e6800b9d07d593cebdcea37fb0b1379b544d628aab2600c1d1fbabeb2c
-EBUILD hotot-9999.ebuild 1166 BLAKE2B 48f2e19b91ba78f9639eb30b7ce1df862d916c9149f8a8defd40976047e857ca0a5735d2efe6ac65a73641f285f6d8f14b860bacb07d42864fe5e45f7c7ee5e0 SHA512 e97babaeda233e04ab5fc02855ed43919ecb20d0df196f90ad0b553a6d3c32d67a9e372352c819e1b760c1caa1ea00491d4eaed170e3b917953d42d2f7ac18a0
-MISC metadata.xml 320 BLAKE2B 6337227bc64a7b830e67a9317fce491bbbff09ac59f89308ca133201cc0f247bfccffac369d88682506d0e6e6e9c92ac3d10efa44014701f045b5fb9121cece0 SHA512 fe513375ed6bc4c034f9b4ecd024cd447bd0e2335b6e9d13eecfc74f9c2c8f1e627ca99f798f7571428b29d299b708f7821ec43c1a51593c18402c11447327ad
diff --git a/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild b/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild
deleted file mode 100644
index a15fe974e0db..000000000000
--- a/net-misc/hotot/hotot-0.9.8.15_p20150812-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="lightweight & open source microblogging client"
-HOMEPAGE="http://hotot.org"
-SRC_URI="https://github.com/lyricat/Hotot/tarball/452fc0924a98923b -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chrome kde qt5"
-
-REQUIRED_USE="|| ( chrome qt5 ) ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	mycmakeargs=(
-		${mycmakeargs}
-		-DWITH_CHROME=$(usex chrome)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_QT5=$(usex qt5)
-		-DPYTHON_EXECUTABLE=${PYTHON} )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name "*.pyc" -delete
-}
-
-pkg_postinst() {
-	if use chrome; then
-		elog "TO install hotot for chrome, open chromium/google-chrome,"
-		elog "vist chrome://chrome/extensions/ and load /usr/share/hotot"
-		elog "as unpacked extension."
-	fi
-}
diff --git a/net-misc/hotot/hotot-9999.ebuild b/net-misc/hotot/hotot-9999.ebuild
deleted file mode 100644
index 777e7d1e2bcd..000000000000
--- a/net-misc/hotot/hotot-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 python-single-r1 vcs-snapshot
-
-DESCRIPTION="lightweight & open source microblogging client"
-HOMEPAGE="http://hotot.org"
-EGIT_REPO_URI="https://github.com/lyricat/Hotot.git"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="chrome kde qt5"
-
-REQUIRED_USE="|| ( chrome qt5 ) ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	mycmakeargs=(
-		${mycmakeargs}
-		-DWITH_CHROME=$(usex chrome)
-		-DWITH_KDE=$(usex kde)
-		-DWITH_QT5=$(usex qt5)
-		-DPYTHON_EXECUTABLE=${PYTHON} )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	find "${D}" -name "*.pyc" -delete
-}
-
-pkg_postinst() {
-	if use chrome; then
-		elog "TO install hotot for chrome, open chromium/google-chrome,"
-		elog "vist chrome://chrome/extensions/ and load /usr/share/hotot"
-		elog "as unpacked extension."
-	fi
-}
diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
deleted file mode 100644
index c93b1aebf693..000000000000
--- a/net-misc/hotot/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-needed -->
-	<use>
-		<flag name="chrome">Build chrome browser extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">lyricat/Hotot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index bfb732ae98e8..7a103bb1beac 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95
 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
-EBUILD iputils-20180629.ebuild 3961 BLAKE2B ed4722cb1b57f7669d3328d50cc6a1fd50456caef9740fa8fb7c4037c6e1d2aae131cd411c5a958c31b600683606bc11802763fe14e366ccf83288e11d762431 SHA512 f9b57c37b915564c413c7069b35975b002c39319903c42ab50d50ba2f53c9f325c637bc7be45c0a87aaadaee6270375cd778ccbc7fb5933d687f23aa2cc7ee1e
+EBUILD iputils-20180629.ebuild 3960 BLAKE2B 75270f1f195528663eb23a8b7e453aec559a0254569ae81c4b9df2dc53b3e726ac3958708e77b2c22b23bd994c33f487344ae92d0fb6cbd4096044716ae008e6 SHA512 831524795c0df5320e2cce8c6a5349e259dca5b4c0f551ad476ef2e887dd41cc43f6516bcfb0021e010c1ac0bfaa255adc1b76367f9c1799c1a18d490706c42d
 EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index 0da2cb928bdc..05db264e8bd4 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 0df953dd8434..4a42aa438b01 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -7,6 +7,8 @@ DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149c
 DIST kafka_2.12-1.1.0.tgz 50326212 BLAKE2B 079118f6e269c028a78700a6d11f70c36b8856a5f4180050c5d4b667f6f719fcffcc50433a687e6b181dd15423dbe28dfdfacd82f6d6046e8839a21d56c6377f SHA512 48d1ddc71f5a5b1b25d111f792553be69be62293640a3c6af985203c6ee88c6aa78e01327066bfad3feae6b0b45d71c0cac6ebd2d08843d92269132741a3791b
 DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
 DIST kafka_2.12-2.0.0.tgz 49405896 BLAKE2B 601ea97c3007e2d09b1520baa86bf9ed7e740ba6e1aaac675cb158dad3e079a253e032ba7e1034526fa04d7f8088043747800b37db59232b45e729b944029f6c SHA512 b28e81705e30528f1abb6766e22dfe9dae50b1e1e93330c880928ff7a08e6b38ee71cbfc96ec14369b2dfd24293938702cab422173c8e01955a9d1746ae43f98
+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
 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.0-r1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
@@ -14,4 +16,6 @@ EBUILD kafka-bin-1.0.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131
 EBUILD kafka-bin-1.1.0.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
 EBUILD kafka-bin-2.0.0.ebuild 1460 BLAKE2B 0daffcba280aa1d893a6300ee489e09ffb0fe28a81a63e5821532f912642a236a3f5bff850775fa55a9a6f10165a139dbd2eb3c98a02599d61daf1b982c27e99 SHA512 4668e1ca308d2e49db6b1aab86699d94eed2599dc5276a8cc963a1eb0ce192991c5506371e4dfd382b9b0ce608c2da7e0007d23c5b72159fb2acd10ef09e6ac0
+EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
+EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild
new file mode 100644
index 000000000000..0f799f94c22c
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-2.0.1.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/kafka-bin/kafka-bin-2.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.1.0.ebuild
new file mode 100644
index 000000000000..0f799f94c22c
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-2.1.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/nyx/Manifest b/net-misc/nyx/Manifest
index 17f41cbfb3ac..a430548bc086 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,5 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
+DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
 EBUILD nyx-2.0.4.ebuild 638 BLAKE2B b1e8e29f6c828e0542f46ea48ed2bb43ccfb422555813af9f9d6074489e19f3f939d81a37bb3d4c79f297c7299414294d35d4cc1fd84d9ff6c5211d1ffb4137c SHA512 06f90b0cb50d4ff5c8be27002c21eea2919230c911b1aee10f69f2fe78a4db866967044a9e94f9289ffbae486a0698f8addd5d42bb2bea3382a159b0aafa9611
+EBUILD nyx-2.1.0.ebuild 638 BLAKE2B 926733e64c1526f4015861973d913c97dfc8031416cb8762f5caaf6a6f88a2ee2920515daf666f8335b696bb3472d897e569eac7874aa054173a6b57e93cb9f8 SHA512 f83040a8ad770ec7e26b7595e9246882681a9ec18c6906ac9827a6eb9c10d3b1f83a9f49c8ccb7a03efc0ba00981b0c58c2c168f3189f0558f30f3ccf1604c9e
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
new file mode 100644
index 000000000000..32e8fbd725b6
--- /dev/null
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Utility to monitor real time Tor status information"
+HOMEPAGE="https://nyx.torproject.org"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.torproject.org/nyx.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	net-libs/stem
+	net-vpn/tor"
diff --git a/net-misc/pen/Manifest b/net-misc/pen/Manifest
index da78dede97fe..eaf0a17b268c 100644
--- a/net-misc/pen/Manifest
+++ b/net-misc/pen/Manifest
@@ -1,3 +1,5 @@
 DIST pen-0.25.1.tar.gz 150231 BLAKE2B 155605baa0e8656880a543a46b62598fbb321990141868284ea3ef998d57a47a0ab0f9f2d8cd74814c65895149fc5f6b8defc4b757e45a3ebbecef153b00db58 SHA512 712c5899eb0ab20df1c91653328a63fe1715f0412e434aa08229555ff725bd54eb4732be1176f2cea02761db37a5ae241a4f790ca803fc1002be2bf65bc6269b
+DIST pen-0.34.1.tar.gz 184622 BLAKE2B 1a00942d65fa814e91ca9c69bed559cbb02245763885a14f1ad835c2bee680f92d9d861822189815ece05f5292299066f3fed0208eac144e516fb4204128e17c SHA512 5237e67ef2a8751cab0bbaf75bbd081f0c645830b20d94e5fab365def0692307f2e0c55158697fc79a197c624bd34bda590cf5ded229beea44da597d3344b263
 EBUILD pen-0.25.1.ebuild 502 BLAKE2B ad38872eabead3116d210e9eac1b6c2b12a3d520c31cfe09d3ecad7567b384edf0b46ada2a7681b1509b05a7cd1d93bdc08092e0d14501b5fd527ee50722f861 SHA512 93a89b36776d29b9a4283b093391cfc7a52eff49ac4cc33b5ad164ae51013c91d3a9863154d02286628b00231c950fa456dfd4f6ddec65812fd65971fc5ed570
+EBUILD pen-0.34.1.ebuild 506 BLAKE2B 49cd79cad1bc43bde392113c85e793c7b4088230efe3210f68b3328ab5d6933a47e3d21faccb2c56677acde40aba6d49e6ebc5092f359d050a5ad2155d6c9128 SHA512 16c0d9121e3fcb09e506ea67a80fa8bd8e45a6c172ff43611a6863081ba44fbdc2d1fb267e23b33e6e2ab7de724c38486e378c591a869fdb7b9da5d88f7c008b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pen/pen-0.34.1.ebuild b/net-misc/pen/pen-0.34.1.ebuild
new file mode 100644
index 000000000000..17969d8d67c8
--- /dev/null
+++ b/net-misc/pen/pen-0.34.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="TCP Load Balancing Port Forwarder"
+HOMEPAGE="http://siag.nu/pen/"
+SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="geoip ssl"
+
+RDEPEND="
+	geoip? ( dev-libs/geoip )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --with-docdir=/usr/share/doc/${PF} \
+		$(use_with geoip) \
+		$(use_with ssl)
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index cc861a6b327b..6670d5f9170f 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -4,6 +4,6 @@ DIST putty-0.70.tar.gz 2386108 BLAKE2B 0780b94a1c7c1450cc3f46ec5fa5419ae8c618563
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.68.ebuild 1585 BLAKE2B c5cf6d298348b950e62eaad33054fef6d2740aa148afd3d0b9f1411dfc38162c22919f71829ebb5bdc77a3e758045aad5fa751f8f084dcd8bbdc7f6afee781fc SHA512 2d4188d5cd77f4335990b5e67d516b6cd6b5c34efc1d8253e5c3ac28f03995f24646b29a6de180d9a8957d10d30d76ec60b185cbda5bb889edad83894b1ecfd4
 EBUILD putty-0.69.ebuild 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e
-EBUILD putty-0.70.ebuild 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e
-EBUILD putty-9999.ebuild 1706 BLAKE2B e4c1400a23fb600e2baa5c0cbe762e1d7dd106e46c66138b8b6556271df601c501e1a23ed1e8dba429e2dc8e4bc0027e2f003f4f308fa1b4ccc6980df6f502d2 SHA512 7f4f8ed060c3efe04f45b080b1f830d424c9b9cd134a99bcb3b036a201bf67c7b9229827b65e436205ffb03914852d636efad683ebb4524cbd1dafce5bab8578
-MISC metadata.xml 803 BLAKE2B 39376a700c0d83be3cf6f3569882e3369273c166b1b910245ba942be8dd3c22f709815847c0f8adc90dcbf9aeb597ea8ed14b957e2133c9bb0176cf32843a0f3 SHA512 d350ca1ff3c8ab8ba1b13e098c6e0f215f31c8c4d673566d2e0befef1404cd3a8dafdf5c7f90ed78d7d06a113b2d9ca92014909257e638982ed7a73797113c1d
+EBUILD putty-0.70.ebuild 1576 BLAKE2B 463404e2b72702b60f0a1ef7a346b9cc59cb4761de889b30c767e61b02817ef5833a7663fb6753f5539dfebf34de3aebd0f2b20739f870a6e3994c0703d8ffef SHA512 3ea16c4e3d1c34e8e284334294a8bedd9ed32ef60e907fc8c6b501183fa1a7a95854faf9ec565822ad6caf1a60ddac215677ca13acc8300691b08f581882612c
+EBUILD putty-9999.ebuild 1699 BLAKE2B 89ed0fb7e47ae19a6ae0232dffd0fc1dac87c2f4e99247aea3fc985e19eac4d259cd11f87706ff4a4356e015e7a9288d48649a51d88b1fed8df5cd6394545eb4 SHA512 e3fe328f67e0e927b768651dc5f24a24eb09be9537603dd3881f54a2d59cea6618b77f328bc97cfe085fc012cf529a3d9b0f58660f729efa846e4a4433215510
+MISC metadata.xml 866 BLAKE2B 1d1ed9fe125d0800bd0fb868a44e29444a5a2555fc08f63e0ce764b6255a026441a011a03a8499578ded4063e3f0ab44a455ceb88d0340a6f5e22db6085578e5 SHA512 bc182c0e67bdfd300ab3c25d0457bf7502fc9fbc62d5253a8df4671b5d1c59a95fc5432688277f6a2b2328969f7b58bdd7ea5478b8d4a19bb48381aeed8582d9
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index f8db72350db4..bff885218f39 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<longdescription lang="en">
-		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
-		platforms, along with an xterm terminal emulator. It supports flexible
-		terminal setup, mid-session reconfiguration using Ctrl-rightclick,
-		multiple X11 authentication protocols, and various other interesting
-		things not provided by ssh in an xterm.
-	</longdescription>
-	<use>
-		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>:2. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.</flag>
-	</use>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<longdescription lang="en">
+PuTTY is a free implementation of Telnet and SSH for Windows and Unix
+platforms, along with an xterm terminal emulator. It supports flexible terminal
+setup, mid-session reconfiguration using Ctrl-rightclick, multiple X11
+authentication protocols, and various other interesting things not provided by
+ssh in an xterm.
+</longdescription>
+<use>
+<flag name="gssapi">
+Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)
+</flag>
+<flag name="gtk">
+Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>:3. If disabled
+only the CLI tools puttygen, plink, pscp and psftp will be built.
+</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/putty/putty-0.70.ebuild b/net-misc/putty/putty-0.70.ebuild
index 1d6f330296b3..888ed3b7bbbb 100644
--- a/net-misc/putty/putty-0.70.ebuild
+++ b/net-misc/putty/putty-0.70.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 @@ LICENSE="MIT"
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gtk ipv6 kerberos"
+IUSE="doc +gtk ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
@@ -25,7 +25,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -47,7 +47,7 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/unix || die
 	econf \
-		$(use_with kerberos gssapi) \
+		$(use_with gssapi) \
 		$(use_with gtk)
 }
 
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index c677a8a6686d..9d0477fe17e1 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="MIT"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +gtk ipv6 kerberos"
+IUSE="doc +gtk ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -23,7 +23,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/pango
 	)
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -53,8 +53,8 @@ src_prepare() {
 src_configure() {
 	cd "${S}"/unix || die
 	econf \
-		$(use_with kerberos gssapi) \
-		$(use_with gtk)
+		$(use_with gssapi) \
+		$(use_with gtk gtk=3)
 }
 
 src_compile() {
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 3bb8e3e23920..57da30e4811f 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -3,10 +3,12 @@ AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d4
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
+DIST rabbitmq-server-3.7.10.tar.xz 2569968 BLAKE2B 90a0162c9e573f1b99526c7a6cdec38061c3e6f355377b51b920a62b0d61c5f13a21b69d627b49c4c6702e517dfba4c856664e9741d9ad2d21171a3b46770799 SHA512 092df82ac00397fc90ecd69c712985f055ec25fd0ba427fce9330df75f5fe6d788aabc9e25ccbf63c8c3cbe111816a226fb63479a16d8530a53b23ab23b2598e
 DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
 DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
 EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
+EBUILD rabbitmq-server-3.7.10.ebuild 2999 BLAKE2B 3f7d5a6d6aab697c89b1c36d787f1946bb1a847e5a4301929c945b1c233a8e6b810cae0105563f5c9bdd2a7be3d35936ae7466f80d817e75abccc72471b3372d SHA512 6dc7e5e2e7943f223c0582f837b76a57e9fde6efc9e42e5e40f78d6a29bfeb26d4993793779d10806d67bc1822a5856e5a844e7a4bdca8e1445a3ae54ec7c494
 EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 1e52884869bea88c8128249c395226fa4b67ffa574b23ee0dd336d6c59f0af050139617a0688e4875cb0633d9032898a7b754f57be37f6977ffccfd8e9d5d3a1 SHA512 5d2d9fe18a2a4a03521b47ede6209791871d361dd00448a2c668a9740dfca834246d4af1b01bf4dd35d1198a3c7359ff911cbdad9c0a4a77e39a2e560d900704
 EBUILD rabbitmq-server-3.7.9.ebuild 2995 BLAKE2B 78f3dab75df9ac4c5f7ca74920678e841cacc5633163e4e2a6478a7a53337417dccae86784132cdeaf922cb6d4bdc4c2de683a966aef4ab7615350aecb67f2aa SHA512 c42215c89935baaf78cb0fcc6c438b8e6552317b9af0f13e4f3daee581f25a3ff346f7027fb5469ae751dac0d10094c0298345c07bf91282463b6fce1b5f96f2
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
new file mode 100644
index 000000000000..e412841b290d
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-19.3[ssl,smp]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	<dev-lang/elixir-1.7.0
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "http://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 6185152a8113..c9d2004c7108 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -3,11 +3,13 @@ AUX rdesktop-1.7.0-libao_crash.patch 494 BLAKE2B 57c5dcf40c15173942db524717819d3
 AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
 AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
+AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e99dfb4d5dc91de931c9f1471d2e080063b1c3b2a2e1cc4418b9d2052e019e06b1573ba0921346d885b82eec37fc3d SHA512 ab93bf6c822cfae151158a427a5d1679beb0fa17f6a9df629283cbeead43b0003a23bc4b3a2ca89a616eca6d46cfc7e2080e03e36600605891a4b4743ba63d71
 EBUILD rdesktop-1.8.3-r2.ebuild 1896 BLAKE2B 5741137acba3af2842dfd5e6bdc95a53d230feadece2a7c5d71ed2042442a6702ff3d94bb1f98554fb2c0134488c8fecf456ca9d8171680c89cc0054ce2acba8 SHA512 2b5e2ed13d3a42dfd70173b7cbafde9d078c08a27ea13aec85951c7dddb302d61b61c08eecc72b7bc8a0ef13fa9fe1854069d6e1c106428adc2182314ca798ec
 EBUILD rdesktop-1.8.3-r3.ebuild 1725 BLAKE2B 0523fb8eb8962017673fe4dc7cfbd05457aa514c2166fbe5ec0beb1fe6902d5109a878f7371ce2157d2a0a85da2e6245d0ca9b80ef2c2de013dce2bca456c296 SHA512 519ff1eafb4ea9420c62a6ce864fdf5005aaa3f7dffa05dc5265d14837133430fc60a204390a7055a2b1277d0f90c2f84bc11ee46baaf0fd76f15c79fd5068ad
 EBUILD rdesktop-1.8.3.ebuild 1803 BLAKE2B 783d1cdb94a66f2c6339cc45fb4c201ed0ba2af0d06b91bf6d615b00b086d7f498fb082efbb34e48b6a110a1232d5c400fd8b984e7729685c7cf1410544ba7cd SHA512 c1bcdac48e93f0e30b57ebfdeb6338b20f980aca3630986e564f20483b38e9f31110a1efda74b94d8fb973b9299399ae7e75351dbda049b82f8e74002363f68a
+EBUILD rdesktop-1.8.4-r1.ebuild 1744 BLAKE2B d48a2224a154f2a7bbc5398611deb04a6f751a1c9c056ad6c1d0448b6683e07ce060d61591a838cfe853da2418228b5bbca03b27d862b085a2f4e87f9d24665e SHA512 3842760d78f8f3a694ccc21ff3f537917800eed0c18c52419f8f43fdafdf03afae34008ade9d8fd72197e5c18ce0902f47ef30fa2558fe9561854f8c64aa9e0e
 EBUILD rdesktop-1.8.4.ebuild 1709 BLAKE2B 09f9ae4b35a35d4a9882034e425c69f66fa30e30166cc26fb6d4ff1fba36512436c40ad4e52f181fae462257e9d575c973efa6b085d29d5e2684fafa55d5ac0d SHA512 c204cc5606d6c38eea53565a09ae57a6783d62aa3436b9049c470ef77053c15e5afbab8027fd8654c465f0878b4c98c5e99112f3f80e14a42475259d34d8c9f1
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
new file mode 100644
index 000000000000..b56cbfc30539
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.4-libressl.patch
@@ -0,0 +1,16 @@
+diff --git a/ssl.c b/ssl.c
+index 07d7aa5..45df34f 100644
+--- a/ssl.c
++++ b/ssl.c
+@@ -225,7 +225,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
+ 	BIGNUM *e = NULL;
+ 	BIGNUM *n = NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L  || defined(LIBRESSL_VERSION_NUMBER))
+ 	e = rkey->e;
+ 	n = rkey->n;
+ #else
+-- 
+2.20.1
+
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..d0abef7c4ac9
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
@@ -0,0 +1,70 @@
+# 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? ( net-libs/libgssglue )
+	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}"/${P}-libressl.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/remmina/Manifest b/net-misc/remmina/Manifest
index c3779d2e96e1..518a31c69339 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,9 @@
 DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad849ce3220dc6e3084b3905f9fe1203443fe0bb2f8a3fa910e7f367299b1b8c1b2373e8b337da7c4ff99ced1951492b SHA512 e66bd77e3b3e8374773e6029a727d814ada09b90a5620452e8ecce19e6f4327aa2e50b8956b292abce2e9329deec79370665a6a6aecbc2d33557381ce5b8db3b
 DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
+DIST Remmina-v1.3.1.tar.gz 1341006 BLAKE2B a4938558e2b3595a62514789a6f748f0e526a20dae23f21c835b6c11a3f321fe564fbc77fa4ea7def97875ada169b73692861707d432b81c3ad51d5630633e67 SHA512 91146a75563f169b39f7aa57fbd846cef1965a0e7c11931acda4bc461407cf3644a1f363b1f46421e5a6ccd1d43d6a89cdb38420dd98fea5ddad1a52ae65d41e
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
-MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
+EBUILD remmina-1.3.1.ebuild 2241 BLAKE2B dcf61f0d57abca3f24bd7bffab8bb43b6834f14cc214f3f7fb36e9e10da1fa40ca0f98f97853d21bf1c2a29351f32d18f8f1ce489487ef5c85be88213a10ae56 SHA512 2505786c61408b6bb47f6f0c73505f0431f0ac53be831f6d177d226405ec8a0bb898304368f085737c3afddf52dab428c067a3a23f9e552835465fff74859235
+MISC metadata.xml 1255 BLAKE2B fefa1b10f16641e6641e44792dae98bc75449f2a514572819f541a616345a56448b4fafbd2da649e41ddbcd7562debd481ad033012e3db0d12e5c07d2ffd3e0e SHA512 2d75beb76a8e3d652a9b68b7e563126e8bd2b487974f0b68b6cc79ebd83cb9706349c3802e383995c3ff9c0e61b8221a72beb469d68ec432fb429af1e2109ffb
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 49d6116aa5e7..17edcfb89bca 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<longdescription lang="en">
 		Remmina is a remote desktop client written in GTK+, aiming to be
 		useful for system administrators and travellers, who need to work
diff --git a/net-misc/remmina/remmina-1.3.1.ebuild b/net-misc/remmina/remmina-1.3.1.ebuild
new file mode 100644
index 000000000000..76a481df317e
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index ab240e75c491..39b5d82e5b35 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -1,6 +1,7 @@
 AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b4b93796694a98bf0f8e54d9e0b9822d675e2446be6082df9db7dc64c75c90dd87a452daf40daa5810ff4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be
 AUX Makefile.vncviewer 273 BLAKE2B 2c57e85006e4f2ee8cd81d074deae19aea3ee3fe7c8f8a5f3c4273d17788214c97c40c2b18901fb7748386583a42f343098923d8e17959d089d104feb9bf7af3 SHA512 21104188080d7a3dab83140e7a32ebb8129cbc7af1759d7537802df9943f63af1d6e01df57cc816b96b7a91886607ccfcf86f35ebabb05537dad16a850f8c22d
 AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
+AUX ssvnc-1.0.29-openssl1.1.patch 6990 BLAKE2B c64425b5872cabfcde55b66ac433e734b53724ea0a002b081a7112a24167908fd1c4857c237a2d06fdf80be063450fd9d468dff28df295dcd20411509ad430bd SHA512 460b1f89e571acd61a411ba0653fd8cfa342d8004dbb44b57a1a887cd0abe72804cc9f87c8d9647004b01ba25ce0e5e83eab211f4222a06c8bf583791a97d377
 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.29-r2.ebuild 1347 BLAKE2B aa53dd49376ebefae26d6995ee6afb70e28d518c5b18c35f3fc2f2d2a381daca29823aa55d86780afe63b174cd28e99a4ff6907bbc33d8771c86ea11d7875aff SHA512 abed242fef361462b5e0d7af76dd9a380568a40a95dc8ba787a68698bac8ade05fb8828cd837b84a373e4a95e2d8542d087aa7a6fa1f897dce9c4af6f0561aec
+EBUILD ssvnc-1.0.29-r2.ebuild 1381 BLAKE2B 100c6712a2715ffa40ca6a32dc3a6c2ad4c4ecd265f08bbd513f56fec8bbecdc961d0ebdab8623c11053ef642119f60b3f3964d9f54152bf685fa0997333b4f9 SHA512 0123a82de54b93ed72a98adf67e4e248f47e9539d2e2be131f10c6b31e697c1bfd740e3a55ced7953573f7b969832a1fbba8d3a31a455a93a65d373ce13114d5
 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
new file mode 100644
index 000000000000..0ee278f9eea3
--- /dev/null
+++ b/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
@@ -0,0 +1,199 @@
+--- a/vncstorepw/ultravnc_dsm_helper.c
++++ b/vncstorepw/ultravnc_dsm_helper.c
+@@ -414,7 +414,9 @@ void enc_do(char *ciph, char *keyfile, c
+ 		if (strstr(p, "md5+") == p) {
+ 			Digest = EVP_md5();        p += strlen("md5+");
+ 		} else if (strstr(p, "sha+") == p) {
+-			Digest = EVP_sha();        p += strlen("sha+");
++			fprintf(stderr, "%s: obsolete hash algorithm: SHA-0\n",
++			    prog, s);
++			exit(1);
+ 		} else if (strstr(p, "sha1+") == p) {
+ 			Digest = EVP_sha1();       p += strlen("sha1+");
+ 		} else if (strstr(p, "ripe+") == p) {
+@@ -655,8 +657,10 @@ static void enc_xfer(int sock_fr, int so
+ 	 */
+ 	unsigned char E_keystr[EVP_MAX_KEY_LENGTH];
+ 	unsigned char D_keystr[EVP_MAX_KEY_LENGTH];
+-	EVP_CIPHER_CTX E_ctx, D_ctx;
+-	EVP_CIPHER_CTX *ctx = NULL;
++	//openssl1.1.patch - Do NOT create two context and only use one
++	// - that's silly.
++	//EVP_CIPHER_CTX *E_ctx, *D_ctx;
++	EVP_CIPHER_CTX *ctx;
+ 
+ 	unsigned char buf[BSIZE], out[BSIZE];
+ 	unsigned char *psrc = NULL, *keystr;
+@@ -698,11 +702,14 @@ static void enc_xfer(int sock_fr, int so
+ 	encsym = encrypt ? "+" : "-";
+ 
+ 	/* use the encryption/decryption context variables below */
++	ctx = EVP_CIPHER_CTX_new();
++	if (!ctx) {
++	    fprintf(stderr, "Failed to create encryption/decryption context.\n");
++	    goto finished;
++	}
+ 	if (encrypt) {
+-		ctx = &E_ctx;
+ 		keystr = E_keystr;
+ 	} else {
+-		ctx = &D_ctx;
+ 		keystr = D_keystr;
+ 	}
+ 
+@@ -797,7 +804,6 @@ static void enc_xfer(int sock_fr, int so
+ 		if (whoops) {
+ 			fprintf(stderr, "%s: %s - WARNING: MSRC4 mode and IGNORING random salt\n", prog, encstr);
+ 			fprintf(stderr, "%s: %s - WARNING: and initialization vector!!\n", prog, encstr);
+-			EVP_CIPHER_CTX_init(ctx);
+ 			if (pw_in) {
+ 			    /* for pw=xxxx a md5 hash is used */
+ 			    EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
+@@ -816,7 +822,6 @@ static void enc_xfer(int sock_fr, int so
+ 
+ 			EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
+ 			    keydata_len, 1, keystr, ivec); 
+-			EVP_CIPHER_CTX_init(ctx);
+ 			EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec,
+ 			    encrypt);
+ 		}
+@@ -836,9 +841,9 @@ static void enc_xfer(int sock_fr, int so
+ 			in_salt = salt;
+ 		}
+ 
+-		if (ivec_size < Cipher->iv_len && !securevnc) {
++		if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) {
+ 			fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n",
+-			    prog, encstr, ivec_size, Cipher->iv_len);
++			    prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher));
+ 		}
+ 
+ 		/* make the hashed value and place in keystr */
+@@ -877,9 +882,6 @@ static void enc_xfer(int sock_fr, int so
+ 		}
+ 
+ 
+-		/* initialize the context */
+-		EVP_CIPHER_CTX_init(ctx);
+-
+ 
+ 		/* set the cipher & initialize */
+ 
+@@ -986,6 +988,7 @@ static void enc_xfer(int sock_fr, int so
+ 	/* transfer done (viewer exited or some error) */
+ 	finished:
+ 
++	if (ctx) EVP_CIPHER_CTX_free(ctx);
+ 	fprintf(stderr, "\n%s: %s - close sock_to\n", prog, encstr);
+ 	close(sock_to);
+ 
+@@ -1060,14 +1063,14 @@ static int securevnc_server_rsa_save_dia
+ }
+ 
+ static char *rsa_md5_sum(unsigned char* rsabuf) {
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md = EVP_MD_CTX_create();
+ 	char digest[EVP_MAX_MD_SIZE], tmp[16];
+ 	char md5str[EVP_MAX_MD_SIZE * 8];
+ 	unsigned int i, size = 0;
+ 
+-	EVP_DigestInit(&md, EVP_md5());
+-	EVP_DigestUpdate(&md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
+-	EVP_DigestFinal(&md, (unsigned char *)digest, &size);
++	EVP_DigestInit(md, EVP_md5());
++	EVP_DigestUpdate(md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
++	EVP_DigestFinal(md, (unsigned char *)digest, &size);
+ 
+ 	memset(md5str, 0, sizeof(md5str));
+ 	for (i=0; i < size; i++) {
+@@ -1075,6 +1078,7 @@ static char *rsa_md5_sum(unsigned char*
+ 		sprintf(tmp, "%02x", (int) uc);
+ 		strcat(md5str, tmp);
+ 	}
++	EVP_MD_CTX_destroy(md);
+ 	return strdup(md5str);
+ }
+ 
+@@ -1184,7 +1188,7 @@ static void sslexit(char *msg) {
+ 
+ static void securevnc_setup(int conn1, int conn2) {
+ 	RSA *rsa = NULL;
+-	EVP_CIPHER_CTX init_ctx;
++	EVP_CIPHER_CTX *init_ctx = EVP_CIPHER_CTX_new();
+ 	unsigned char keystr[EVP_MAX_KEY_LENGTH];
+ 	unsigned char *rsabuf, *rsasav;
+ 	unsigned char *encrypted_keybuf;
+@@ -1203,6 +1207,8 @@ static void securevnc_setup(int conn1, i
+ 
+ 	ERR_load_crypto_strings();
+ 
++	if (!init_ctx) sslexit("securevnc_setup: EVP_CIPHER_CTX_new() failed");
++	
+ 	/* alloc and read from server the 270 comprising the rsa public key: */
+ 	rsabuf = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
+ 	rsasav = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
+@@ -1323,8 +1329,7 @@ static void securevnc_setup(int conn1, i
+ 	/*
+ 	 * Back to the work involving the tmp obscuring key:
+ 	 */
+-	EVP_CIPHER_CTX_init(&init_ctx);
+-	rc = EVP_CipherInit_ex(&init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
++	rc = EVP_CipherInit_ex(init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
+ 	if (rc == 0) {
+ 		sslexit("securevnc_setup: EVP_CipherInit_ex(init_ctx) failed");
+ 	}
+@@ -1340,13 +1345,13 @@ static void securevnc_setup(int conn1, i
+ 	/* decode with the tmp key */
+ 	if (n > 0) {
+ 		memset(to_viewer, 0, sizeof(to_viewer));
+-		if (EVP_CipherUpdate(&init_ctx, to_viewer, &len, buf, n) == 0) {
++		if (EVP_CipherUpdate(init_ctx, to_viewer, &len, buf, n) == 0) {
+ 			sslexit("securevnc_setup: EVP_CipherUpdate(init_ctx) failed");
+ 			exit(1);
+ 		}
+ 		to_viewer_len = len;
+ 	}
+-	EVP_CIPHER_CTX_cleanup(&init_ctx);
++	EVP_CIPHER_CTX_free(init_ctx);
+ 	free(initkey);
+ 
+ 	/* print what we would send to the viewer (sent below): */
+@@ -1407,7 +1412,7 @@ static void securevnc_setup(int conn1, i
+ 
+ 	if (client_auth_req && client_auth) {
+ 		RSA *client_rsa = load_client_auth(client_auth);
+-		EVP_MD_CTX dctx;
++		EVP_MD_CTX *dctx = EVP_MD_CTX_create();
+ 		unsigned char digest[EVP_MAX_MD_SIZE], *signature;
+ 		unsigned int ndig = 0, nsig = 0;
+ 
+@@ -1421,8 +1426,8 @@ static void securevnc_setup(int conn1, i
+ 			exit(1);
+ 		}
+ 
+-		EVP_DigestInit(&dctx, EVP_sha1());
+-		EVP_DigestUpdate(&dctx, keystr, SECUREVNC_KEY_SIZE);
++		EVP_DigestInit(dctx, EVP_sha1());
++		EVP_DigestUpdate(dctx, keystr, SECUREVNC_KEY_SIZE);
+ 		/*
+ 		 * Without something like the following MITM is still possible.
+ 		 * This is because the MITM knows keystr and can use it with
+@@ -1433,7 +1438,7 @@ static void securevnc_setup(int conn1, i
+ 		 * he doesn't have Viewer_ClientAuth.pkey.
+ 		 */
+ 		if (0) {
+-			EVP_DigestUpdate(&dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
++			EVP_DigestUpdate(dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
+ 			if (!keystore_verified) {
+ 				fprintf(stderr, "securevnc_setup:\n");
+ 				fprintf(stderr, "securevnc_setup: Warning: even *WITH* Client Authentication in SecureVNC,\n");
+@@ -1456,7 +1461,8 @@ static void securevnc_setup(int conn1, i
+ 				fprintf(stderr, "securevnc_setup:\n");
+ 			}
+ 		}
+-		EVP_DigestFinal(&dctx, (unsigned char *)digest, &ndig);
++		EVP_DigestFinal(dctx, (unsigned char *)digest, &ndig);
++		EVP_MD_CTX_destroy(dctx);
+ 
+ 		signature = (unsigned char *) calloc(RSA_size(client_rsa), 1);
+ 		RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa);
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
index 0304a7237897..fbd99ff15127 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
@@ -1,9 +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 multilib toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
@@ -14,10 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="java"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib:0=
 	virtual/jpeg:0
 	dev-libs/openssl:0=
-	dev-lang/tk:0
+	dev-lang/tk:0=
 	net-misc/stunnel
 	java? ( virtual/jre:* )
 	x11-terms/xterm
@@ -25,11 +25,16 @@ RDEPEND="sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXt
+"
 DEPEND="${RDEPEND}
-	java? ( virtual/jdk )"
+	java? ( virtual/jdk )
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.29-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.29-build.patch
+	"${FILESDIR}"/${PN}-1.0.29-openssl1.1.patch
+)
 
 src_prepare() {
 	default
@@ -55,5 +60,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc README
+	einstalldocs
 }
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 3352f48d97f5..edac7ac9432e 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -2,6 +2,8 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
 DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
+DIST whois_5.4.1.tar.xz 83748 BLAKE2B acc3267a78c22937967cea92b542d92e99dc135a70550f242b098e0a459193564514c6b28c0290a82b9321a6a081793f64d51157c75cbe852fbb91a7cd353310 SHA512 8036679be4b5cd7ab67903ca1c949e0261bd2589f5a4efa18b10ecab8a1e13d99e5e8b839a4974af22c6afcfff74f7bd1c4361ef1aa3ebf7621a7c8a6bc98c25
 EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
 EBUILD whois-5.4.0.ebuild 1590 BLAKE2B b832b7c82c05efff9136bd6f4ca02c9b482f141fdeff38aa6b72ec5ef5b3cefe74b9a8711f4f358bac380d0c34f2ecd0bb92203c40f0912aecbdfedbd64834cc SHA512 6251dd887631db7394f43ab322d733b4da29f5c012c8398de2f79c83ba57bde18dea0ead4fd6eef8005e48373946ac6ebe88e468173c59d6735175eec65be37e
+EBUILD whois-5.4.1.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.4.1.ebuild b/net-misc/whois/whois-5.4.1.ebuild
new file mode 100644
index 000000000000..05fc6a779ed0
--- /dev/null
+++ b/net-misc/whois/whois-5.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://www.linux.it/~md/software/"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 4550921da2cc..1f20272b5741 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,8 @@
 DIST youtube-dl-2019.01.17.tar.gz 3088912 BLAKE2B 6cd46442d78126b3428135fcb820eb02bb2d567fe41fbfefcd80fc68a9ece0faaf2aa4981e31c619c3be1f789a9539236b1a71e72490c4ee667953837b25f0e5 SHA512 b8e81c2b2ec284033a5a92f49a965375d681d92435bc0402bb891b443f94d1321716a15717fe4e3c1fbc54ec610445282c52c18c046e140dd53731560230bd3f
-DIST youtube-dl-2019.01.24.tar.gz 3099596 BLAKE2B e8833a0432e32e843ed8a3e971b9572bc0f4f8e90ea9c26fe6426ccc95231d21cf85601615634611129405115fe1d3fc192f423c0d700beab7fbccfcfe25dc68 SHA512 23d81769dc202c6598a8ece772f104ed7a048464b3d14305492e562aa77dc77ef32e56ae7a1084b144460e18dcfb2a9d7813ef88f7fdc34760f62f4de23e4602
+DIST youtube-dl-2019.01.27.tar.gz 3102349 BLAKE2B 4d078cacc220e7c0ec46a395c58fddcefbdc4c6abfb68ba36eec0aa8a4506896132ac14c0edf1cafb8d55473931d1ce7f80cf0b08f2217c72c16d8084ed7afaf SHA512 33c7ac784b57feaa7b28b1cc0916f722fd958d111e3caeff6edf30bfe7d4f96bd61ee666dfaf672c75f1da7abc7d54510f7c9b7d7fdc2479e0dfd4625f4c6a42
+DIST youtube-dl-2019.01.30.1.tar.gz 3105464 BLAKE2B f09cf3e86710f6d3ec6555e18299097800775a44ed336fa54fd5abb8ea753806dc6431894659e51fef43b90f974250dbcce9bb51eed50e1e43b75fe40dd21fbd SHA512 4d1fd2b9cf84dbbbf3a7a84ce9e7b2fe39d34fb29c337c71c4dba598bc3eac9d205399055dbcd7ec964398dafac90d488188c4fbc5083ee0abfd09269dce26b3
 EBUILD youtube-dl-2019.01.17.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0
-EBUILD youtube-dl-2019.01.24.ebuild 3416 BLAKE2B a006e2ef1f88a0867fd931e1bde00c35e211f2c4efde7f5c68348c012ebc22346b46d200a24aa50f86b5e3fdb1e5c9253527c284a949b3c1920f3c8034d3fb94 SHA512 b5f01ad65383548f81ce29a6ed77ba3e450f585a19557c73ea7215df434dcfc8b6f972d057b6b767462a454f6ae7c2162d71fdda8a1d575b0f74952ad655b465
-EBUILD youtube-dl-99999999.ebuild 3304 BLAKE2B 62e4cfa266a5c117633a91e9fe83648f42bbbbd60e8764adca0002a03fb55b06caf224fb7997bcc9073847ca7d0055037749fd45f7521757a8e1bf9d4cc7215b SHA512 70686e618298486fc81621671f687cf11a0b56a05041be6016f4e2eed97ea215c21e869f90b5f071111f229f0d3ee49be3b3d395cd8e28900cc985d1d9d8fd31
+EBUILD youtube-dl-2019.01.27.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
+EBUILD youtube-dl-2019.01.30.1.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
+EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.24.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.24.ebuild
deleted file mode 100644
index 6ef55f59a57e..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.01.24.ebuild
+++ /dev/null
@@ -1,117 +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_4,3_5,3_6})
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-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 "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.01.27.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild
new file mode 100644
index 000000000000..2cb0551f3e35
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+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"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+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 "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.01.30.1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
new file mode 100644
index 000000000000..2cb0551f3e35
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.30.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+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"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+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 "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-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 4713e21251b3..632093ebfdb4 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.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"
@@ -8,76 +8,24 @@ inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://rg3.github.com/youtube-dl/"
 EGIT_REPO_URI="https://github.com/rg3/youtube-dl"
-
 LICENSE="public-domain"
-SLOT="0"
-KEYWORDS=""
-IUSE="+offensive test"
 
+KEYWORDS=""
+RESTRICT="test"
+SLOT="0"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
 "
 
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
 src_compile() {
 	distutils-r1_src_compile
 
 	emake ${PN}.{bash-completion,fish,zsh}
 }
 
-python_test() {
-	emake test
-}
-
 python_install_all() {
 	dodoc README.md
 
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index be686c442515..ccd70fbdaa9a 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rawdog/Manifest b/net-news/rawdog/Manifest
index d72261468008..816085e63c14 100644
--- a/net-news/rawdog/Manifest
+++ b/net-news/rawdog/Manifest
@@ -3,5 +3,5 @@ DIST rawdog-2.20.tar.gz 66933 BLAKE2B 77ac8babe97736c6ed9e7da22de0d8ca494fcbaadd
 DIST rawdog-2.22.tar.gz 68777 BLAKE2B 192292fdf92df45fee9f468258af4de3b22935e10dd1236b4a3fadc21a09918973c32c76e002b158e19f6aba51881b2c570d158a7ea36e16edcddf16e745915e SHA512 27d4140713b0bc5fd6acf70e0377653266422e74201bb895b622a1abe03607704bf16e83a8135f9b0594b8f9566b84fc969c6f197f26d2e463dc5821fd5816d4
 EBUILD rawdog-2.19.ebuild 615 BLAKE2B 40d69f80d91b91e39d7efd2baf540da3d7b8b5e38d4b58d57676e7788d53d04d48e47eaae732f0ffc8f975cd7de4cd04394a1249a7e16dea54c415f0ba1d1d72 SHA512 5f563f4529dfb466fe8149a966bad7d4f04e365dde6577cb2017c922b005adb2eb3563d878b9f2087bae2125833b17c79749e8879a6cedac7c750237f409274b
 EBUILD rawdog-2.20.ebuild 622 BLAKE2B bd694fab6e354616032ebf00a8e77e042dde7449eaae63ffa700bd0b21329e16011f35fffd4b8a67420f57beb6a6b3958764a3e4133006f11d28f8f5ead674a2 SHA512 ed42cd40403cba7435ff4f074e3e6dcda2ee2e3f519c83274fca29bfb153c1f58a69504d31601747fda499b1bf2b55e2d01abedbeb8e1cbdd2d2c6c04799a5d3
-EBUILD rawdog-2.22-r1.ebuild 614 BLAKE2B dafeed1c587c32b7fcdfe0cc1d0cfae6ddd20a82c5b828f016401071b68b9afb647d6ac5fff3706f752a5229282a04a1d78c0825755e8d756886e453dcbf80b0 SHA512 8ef0ef8a0393ba156bf66127e6fb7eb710395e36f2653f731c147b66676a1f844576ab593070746f8d67c548e1bd66e79e0c668d0d882d9d75da84a272eeb516
+EBUILD rawdog-2.22-r1.ebuild 609 BLAKE2B 1e9f7ed6bec312b93e0bc049565dcc9e1f95c53b64353b2ac8251cc653bbd4c64ea649fb624ffafb8ed8e080ca6029fd6e1f44aee4dfcd6025d21fdcf7056bff SHA512 274bb6104f5cc57f668855b2314e5c9aa912cc4b5f40564c7a34a11b134a5ef41bef11407219e975e1ee8345d9d29fdd5dbeec29b4dc7a89f5119f1dfb0a746c
 MISC metadata.xml 591 BLAKE2B 5775551f1616b07ddae93a3f6d59dd67706b4bb9a0143ceeff0f4cd07ace9030374251a4ecb738698758458d0dd78953f754b25572bf2477a0e334decd0df0b8 SHA512 6307022fb71d771c07ed113a95091591c3952740a91f2fe32f5b480719134dade9324324528ca5225bec5efc41287e3cedd3f978b69c3e066e46745305f7ccf1
diff --git a/net-news/rawdog/rawdog-2.22-r1.ebuild b/net-news/rawdog/rawdog-2.22-r1.ebuild
index 77e57136d3c5..85bb555fa936 100644
--- a/net-news/rawdog/rawdog-2.22-r1.ebuild
+++ b/net-news/rawdog/rawdog-2.22-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
@@ -13,7 +13,7 @@ SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~s390 sparc ~x86"
 
 DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 97247e445301..f9a670d99367 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index ec6d937f4739..36305df44381 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.5-src.tar.gz 2750437 BLAKE2B acce46d9a7e90f7f209dddaf7c9936f78a99209a5af158f58cb63caf761759a8477212d9ab9c4c1e9cd09c76962e910e16507aa1ae07ccca6ba5bcbeaa18e0a1 SHA512 f0ffe45c5d6a7269e0d7f1eecd7dfe8433309c371e6ef38a259c9577d66e9a8c5e4f915a2cb63945cde61fb08e3e291633b696f6fa10031b3dc4940347c60f43
-EBUILD sabnzbd-2.3.5.ebuild 4185 BLAKE2B 91d735f2b9a747bebc4ed87bdcfbd9a51c3eb124f98fe1029ba83e58169632bef6fe928bb334264fa813d674b4c1cfc0473a85bf3f36e4addc965815998bf0fb SHA512 500f7b9bf57b93346d36489efa24c9907a6acd6c5299279063bb7e73187317d80ae651a23bd104d0b6e2decab5e1d7cdc8b9514a032b8795091f149377fcda62
+DIST SABnzbd-2.3.7-src.tar.gz 2740143 BLAKE2B caf165609a2122a19f0f9bb017789a84c5c5d508ca856c983de11f598717043560a0d6b44b44e5aafc3e9e4c50ae47dc78e00a65f253e88ad591dafad607e5a4 SHA512 5a9043abf54dcd4590ebe2bd97ec7ea7112bcf65874018f7962f15de0433805c4b5d4b2fd8b2ff737dac491134f082bd4f75f8c1e0d60d89988f09fef343a113
+EBUILD sabnzbd-2.3.7.ebuild 4182 BLAKE2B 5b23291c37a70486796494cab05dc8fdfe9b747a91e2c3dced08b04af8052c0bdc8673ae57a84423e0b9ba201018b7864fa99561920aca0cf41cdf28f6ac840a SHA512 c9fd52e74ff60a8b9bfc690d4b937ee2875c774ce12c7d375f0224aee72b7fb193934009fa09f91c34a70f74988d2cf9c21e78da6e9f2b9d528a36f200c304d8
 MISC metadata.xml 506 BLAKE2B ae36d43db0df97454127c4e195c5039b745ea2cbc5883bd9747f049ea63340e16090c671bbe7229895630b078a0d025729353dd457b3581f4a72672bf085ee2e SHA512 13c60fc2a77328dd1d8ae3d2036a84b72dc98a88093aad9a326fd904b41c795dcce84aec5dc528bc81daabba0341f10a7dda2d01788f70310bbaf801da831f53
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.5.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.5.ebuild
deleted file mode 100644
index 884817f2d682..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-2.3.5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.7.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.7.ebuild
new file mode 100644
index 000000000000..f0871da23b49
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-2.3.7.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 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-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 144946a1e183..bbf00de10ba6 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index ed3d1bee223b..3507ffe4559c 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,5 +1,6 @@
+AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
 DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
 DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
-EBUILD gtk-gnutella-1.1.13.ebuild 1872 BLAKE2B c704f54e9224f327610f05cba33c2eba849179c4ccebae84e054469299b2eec1f26732b852fbcad67b50f5d33abb7146398e1449383d5710736352d8595c6986 SHA512 7a1455c3e35e8044d2954d555bd5728490d037c089a422199eb2a0754487bd56322b08dd0ec2ba3df1effccdc229d22ad6ee951ed1494e670db6cb56e1acb615
-EBUILD gtk-gnutella-1.1.14.ebuild 1897 BLAKE2B 8fbf26c1666183903caf86009b9b6d1510bfbe92a26017ed8e8dc084eab52bfe0be0b4446ad111af88c07d529a1b0cd36073b365cc6e8cbe2331b1c743b8862c SHA512 c344633b7a9c3071afc6722bca76ee0b1f488357121347119f57f3714b29e3c27f53884e7d8e5dbede9a7dfba0f0e2afd42b584589dcf5b047312f5009c26bf8
+EBUILD gtk-gnutella-1.1.13.ebuild 1917 BLAKE2B c01b96371f81b051fec6a14c8836f49f41a0da8a12da335e3eeb43af1ac314667a5ce64a5c51cc85e3762e8e0dee55d3eb4f749367418c7f937fa13f18546921 SHA512 72c1ef037bec822301daf3755658c82b62458127e571d4009fedafc68eef437b6dcad8a285a593bfa36cb670f74332c109f686f01349adc809c911cd77878b5f
+EBUILD gtk-gnutella-1.1.14.ebuild 1961 BLAKE2B 035fe3946e0e8d9d6c0448a8d41de3686f9f4c9f61370b0c86048b15d11284d54db82d3049ca01e7a51e07ba2c9c998d5129a4d6d5afc68eab32235c184d123a SHA512 36a3cbebf84d120456f52e14fb818396003b2e490075c113fdd80319fc28bbdfa19561597646b05c5398363a6a291fc3b6346658c0013013bd838af4766978e4
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
new file mode 100644
index 000000000000..5d455887c04f
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
@@ -0,0 +1,38 @@
+diff --git a/src/lib/stats.c b/src/lib/stats.c
+index 8d0d87b8b..725986268 100644
+--- a/src/lib/stats.c
++++ b/src/lib/stats.c
+@@ -50,7 +50,7 @@ enum statx_magic { STATX_MAGIC = 0x560044e5 };
+ /**
+  * A one-dimension container (x).
+  */
+-struct statx {
++struct statistics {
+ 	enum statx_magic magic;	/**< Magic number */
+ 	elist_t data;			/**< Data points */
+ 	long n;					/**< Amount of data points */
+@@ -60,7 +60,7 @@ struct statx {
+ };
+ 
+ static inline void
+-statx_check(const struct statx * const sx)
++statx_check(const struct statistics * const sx)
+ {
+ 	g_assert(sx != NULL);
+ 	g_assert(STATX_MAGIC == sx->magic);
+diff --git a/src/lib/stats.h b/src/lib/stats.h
+index ba876467c..2a67952e2 100644
+--- a/src/lib/stats.h
++++ b/src/lib/stats.h
+@@ -40,9 +40,9 @@
+  * One dimension statistics.
+  */
+ 
+-struct statx;
++struct statistics;
+ 
+-typedef struct statx statx_t;
++typedef struct statistics statx_t;
+ 
+ statx_t *statx_make(void);
+ statx_t *statx_make_nodata(void);
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
index 6dc93535b3c1..0d716e9f88df 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.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
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.1.14-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
index 7e55b5198d14..61b7b1fcdeb4 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# strip-linguas
-inherit eutils
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
 
 IUSE="nls dbus ssl +gtk"
 
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 2a513b1f007a..2160a68df56c 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,6 @@
 DIST qbittorrent-4.1.4.tar.gz 7718217 BLAKE2B 46fc3ad230a74cc2f05bdfe5f53b6b39e0dcd99afff941614345ef1d85492f647080a6111c403f30746b24d1b03e1a6fd196015c7646dc5ab5c73027a8c8c5b8 SHA512 2621a9b6a19609bafd2d99336e5dc4c5f4aef9e5ab6ecebd9c622c759cdcea2a18999c08a70ac32d88fbd65c310749ea2254562152c1d3886285aa7c5c86bf68
 DIST qbittorrent-4.1.5.tar.gz 7719557 BLAKE2B d849227443843684d16ba93e65a64b2d637f1ce41c2f5c3a1ee46db74c7497d0d3cb6b627bfee79ce2e4f2b99ee252287b584542cd47003a1055a43bf0f63cfc SHA512 e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec
-EBUILD qbittorrent-4.1.4.ebuild 1522 BLAKE2B 635627177cb24d40dc1c6a580dc2ae956fb327f017e2d5f98c78b8ef11da635a9dfd35c087710c4fe434c9c5a09d81c2d74ab023ebc425fc149205c94b67afc3 SHA512 d7cf4877b11e8e2ce0551f283b9a8e525c887190d3d17be3e0a554f2824eb21cde05c536ada2aada1460bb11d9f4dca2d2f024371134049615f4bd351dc421ed
-EBUILD qbittorrent-4.1.5.ebuild 1524 BLAKE2B b1ffccd5412928ec9d01e98fec6c3e333e071c40b8069e12f0a55a30f700f24c1aca731774ddfb916402e980d75309c8a475aab2121e365edcdd32e2e5959a75 SHA512 99688a063f1507df125cc605c72b820b7cd0de3766e9fb727224f9ccdbc2105dd9fc2d63c93a400b13b4d4b06eca4e9c2ad7c819f70dfef3053b67b81c9579ea
-EBUILD qbittorrent-9999.ebuild 1481 BLAKE2B e44e1467247dd1e67b9595b354c137f5a0b6d5b7a61c0b00d1f05475dcb2b004d7f79aa76c9fa880bb6dfbe1c421723f76ef58c0bee19aaafa3ad899aeaab839 SHA512 d68658e22cc3e2eea08074f8e5ea45f646997c68c99dd72546f3b5ed14107a229acbfc9f0ff666891a49cfab3643856e31639b73b863b5d01d39e7a67ff70e8b
+EBUILD qbittorrent-4.1.4-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
+EBUILD qbittorrent-4.1.5-r1.ebuild 1522 BLAKE2B b1a43e0a3054fa22e18a99f589580b91bdd8111cdb4f2522aaa5106d94d6737e72c3b1132d6f7b5da297166a8d2f10b050b8b15b6fe3a69f3ea8fe1bd8b9ddde SHA512 2e48a9961f5461024e1f80d53b88eaa1626989ed6e4426153d877c102b85b3df1a69ce3c7615933bf4d1b5277f73f47b38b8159c974e612966e08f629af9fe83
+EBUILD qbittorrent-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
new file mode 100644
index 000000000000..e294819ff929
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
+	dev-qt/qtxml:5
+	=net-libs/libtorrent-rasterbar-1.1*:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf --with-qtsingleapplication=system \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	domenu dist/unix/qbittorrent.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild
deleted file mode 100644
index f990644fdeca..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	econf --with-qtsingleapplication=system \
-	$(use_enable dbus qt-dbus) \
-	$(use_enable debug) \
-	$(use_enable webui) \
-	$(use_enable X gui)
-}
-
-src_install() {
-	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
-	domenu dist/unix/qbittorrent.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
new file mode 100644
index 000000000000..5023499c1558
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
+	dev-qt/qtxml:5
+	=net-libs/libtorrent-rasterbar-1.1*:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf --with-qtsingleapplication=system \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	domenu dist/unix/qbittorrent.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild
deleted file mode 100644
index 970763d76f69..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils xdg-utils
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="https://www.qbittorrent.org
-	  https://github.com/qbittorrent"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
-else
-	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-	S="${WORKDIR}/qBittorrent-release-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dbus debug webui +X"
-REQUIRED_USE="dbus? ( X )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5[ssl]
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
-	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
-	sys-libs/zlib
-	dbus? ( dev-qt/qtdbus:5 )
-	X? (
-		dev-libs/geoip
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
-
-src_configure() {
-	econf --with-qtsingleapplication=system \
-	$(use_enable dbus qt-dbus) \
-	$(use_enable debug) \
-	$(use_enable webui) \
-	$(use_enable X gui)
-}
-
-src_install() {
-	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
-	domenu dist/unix/qbittorrent.desktop
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 2c128403ac6f..30188ae78c36 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-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
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
+	=net-libs/libtorrent-rasterbar-1.1*:0=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index b1360370a4b6..04fb3fa98668 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 5a89b7a38028..e69cc416d645 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,7 +3,7 @@ AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535
 DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.22.0.tar.xz 1474616 BLAKE2B 045f403bcbae11bd6e0b523d741d1494e6328dfc9386393f974ff82ba816972688613e5c68739dcbf7733aa19c9c063be777cb017dbd041d9c2f23bd21c9182c SHA512 6129c948db2499a300c44ce88a287d5296af4771fb42e991121aaf4eb1258e17f1092afcbb90e5dd63572db410169fed65c6217d1ecd0ba834018acb4ef39bfa
-EBUILD cups-filters-1.20.4.ebuild 3557 BLAKE2B d2e2ac9473a765973f9835cef621d9f3ad32653276db4e00c53d1210b017b8fb667fbc639d60b034724ca20efee37930de5cb7d63127ff914e4a28a4d61e7e86 SHA512 4b999bee8a162ba3d62e61d06a99939eae090aa78a34dd6c4a4949a62a6119ea88a7abfa0728a267f197d5e6de71b44c6e417cdb8b4b76d728d9805741657659
+EBUILD cups-filters-1.20.4.ebuild 3553 BLAKE2B 6703a6a8a65c1776b8ada4b49d752724a7d105c64bf0d29ea46b748daf9f6ea82f29e33706155adea3ffbee5ba919ec498fbdc4db5761657907a0edc749ac3eb SHA512 1d837c49b885fab57aa663866ed73ffda5a48d8bb945aa9df0b314ca6f8be3afa7b09adba3e44ac6859804d614a6a447093d77f17bf78be0ca3647b2c3d8b31f
 EBUILD cups-filters-1.21.6.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4
 EBUILD cups-filters-1.22.0.ebuild 3499 BLAKE2B 3ea73bbf734a1f283ee697ec17237a03eeebe616f7f1637a4f72bf0d016806041fa24bdb918729831f311f2a67516665d5a96f85d43fbf495eeca560b9d3a69c SHA512 0fedb0f04590ef6b3eccc3b9b1f5a4a3286b295d68f9bf641adc569d7fda412df187de34b69320153a835f259c2d5ee59fcdd08c6f38f1299b02ef98206d7cca
 EBUILD cups-filters-9999.ebuild 3593 BLAKE2B 3c0b740ca19190c0e788cc144c4c9ab85d1dfd7b7fd0fc19b4bc6bf0b837bfe56972ee512a1aa515a3885622d257ab2a63b1f2429fa85333a11846caab3c001b SHA512 325e825f45325b68b2a6a4ca6059d09f5f4899ef05063c8a0a79832f840f1141d9e0f7e4daa4205b573f067118d88e8ef31dab5d3a1c10700be44ba441f200e1
diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index 77b90c6efca7..42d6fce17e85 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.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
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index e9cc0019d0ce..2f62d9177506 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 913e5a3f1c3d..54ef356a2e48 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,9 +1,6 @@
 AUX haproxy-1.7-contrib.patch 1066 BLAKE2B 0fa639be8c0b816566f140970a73b360d58e38654744102609115184ca99828b78ec795ab75fe7af0fdf1af4d8f7f869498d8d712c34707732459bb984d63409 SHA512 a26846f3d970b288e6ba8c2cc67190242b41101ebb1b3b14a8ce543109b79d30a1f3257e1b2767033b3208dd223c1597b8a21824c622f16349bc849e9034f631
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
-AUX haproxy.initd-r2 978 BLAKE2B b91b4cbd1ff95dc4dabcd62646b2ad03b4cfac253c89326c8e3e38e6c60f3c2175a01aa204ad284e072ce120f1552451b79755a017cf7a2b4ae55b80734b6931 SHA512 039f14980fd6acba7db76abb3c0e0f341bd1a741b126aa956ef2d07670a8e8d79176e378d8c1545701ec11d9779ca0f57298052f74912c58de7801fb06810e73
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
-DIST haproxy-1.5.14.tar.gz 1345345 BLAKE2B b2971826c81716f126e3f9cef9861c425a44348fb0824ea65f55c82917f8b80441ee7752bff5e1c1c9cf22492577b0bf256b2955cba7c81f79e1e19616eb7a41 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798
-DIST haproxy-1.5.19.tar.gz 1362834 BLAKE2B 72543acf3e78b804e778746ae0dbd1a386e31c9f3f956d91da49e5c4c5f2ace8e46e99372148e7cb97f52a1812501c21319c06eb0230928522d674825b3b1e17 SHA512 3462458350d76fe5634428f7b443f21e2d8d4a171ab6254736db2d64587707d11d0df1d851d629c5a2cdfb2858e98cc9345d592859c6d6d8a352b57542dc465a
 DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434
 DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
@@ -13,8 +10,7 @@ DIST haproxy-1.8.17.tar.gz 2077525 BLAKE2B b4419d541a82399995df448410a8756301ad5
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 DIST haproxy-1.9.2.tar.gz 2350356 BLAKE2B ba147007999d65d214545e5c20567aaa3db67a292eb0df1e1e4aaaeeb7e1c90f593725b112cd222537346cec45b557a2a99e30ef5d4a91bb4b5804212b765121 SHA512 42ad5048c85ac9fdc7ba1b00917508255ffb66f63df1c24382beba6f77765d786b0ab16ddafe5e290f81ea07bd15c63277b5749c4bafab0721e57f837b1bebf8
-EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
-EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
+DIST haproxy-1.9.3.tar.gz 2353387 BLAKE2B c3b5d7c4dba4a2557dfbee857e8e2a7ab6d142423788c7cabf96c3d0a0dc4a2dde857db47b0036eac7288249d8416eba8252f0c08290739862457214497e3438 SHA512 5ece759d460d6daba8ed82039fb24037c2b8b36f7ce0f9c9a703ca049ac0d03807ba673b61ae2d74a9e7253b6fb1ca82c504734456c7fb0fec322b67e59ba835
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
@@ -24,5 +20,6 @@ EBUILD haproxy-1.8.17.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.2.ebuild 4999 BLAKE2B 068dd442f30c7b815164143fbc33a7bd390d0684a68b3096dde76b31e68cccf662a33589180a81006794e1e0a477dbb6ec9c62faa002ec56beda02bc0d3b062e SHA512 56bd202b4c16c9ddd2e2aa13eeb953e5a00b3975e5427ba7d02db2d78ab7f71857a13b3122cae77fc3b7c33cb58c12a48220b408ebca57622f47b7d497395aff
+EBUILD haproxy-1.9.3.ebuild 4999 BLAKE2B 068dd442f30c7b815164143fbc33a7bd390d0684a68b3096dde76b31e68cccf662a33589180a81006794e1e0a477dbb6ec9c62faa002ec56beda02bc0d3b062e SHA512 56bd202b4c16c9ddd2e2aa13eeb953e5a00b3975e5427ba7d02db2d78ab7f71857a13b3122cae77fc3b7c33cb58c12a48220b408ebca57622f47b7d497395aff
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2
deleted file mode 100644
index e58c7c1fbfb0..000000000000
--- a/net-proxy/haproxy/files/haproxy.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-command="/usr/bin/haproxy"
-pidfile="/run/${SVCNAME}.pid"
-
-if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
-	CONFFILE=/etc/haproxy/${SVCNAME}.cfg
-else
-	CONFFILE=/etc/${SVCNAME}.cfg
-fi
-
-command_args="-D -p ${pidfile} -f ${CONFFILE}"
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	if [ ! -f "${CONFFILE}" ]; then
-		eerror "${CONFFILE} does not exist!"
-		return 1
-	fi
-
-	ebegin "Checking ${CONFFILE}"
-	$command -q -c -f "${CONFFILE}"
-	eend $?
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		checkconfig || return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
-	$command -D -p "${pidfile}" -f "${CONFFILE}" -sf $(cat "${pidfile}")
-	eend $?
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.14.ebuild b/net-proxy/haproxy/haproxy-1.5.14.ebuild
deleted file mode 100644
index 6a343de9ba80..000000000000
--- a/net-proxy/haproxy/haproxy-1.5.14.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic systemd
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
-				pcre-jit? ( dev-libs/libpcre[jit] )
-				)
-	ssl? ( dev-libs/openssl:0[zlib?] )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_prepare() {
-	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
-		> contrib/systemd/haproxy.service || die
-
-	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
-}
-
-src_compile() {
-	local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
-	if use pcre ; then
-		args="${args} USE_PCRE=1"
-		if use pcre-jit; then
-			args="${args} USE_PCRE_JIT=1"
-		else
-			args="${args} USE_PCRE_JIT="
-		fi
-	else
-		args="${args} USE_PCRE= USE_PCRE_JIT="
-	fi
-
-#	if use kernel_linux; then
-#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-#	else
-#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-#	fi
-
-	if use crypt ; then
-		args="${args} USE_LIBCRYPT=1"
-	else
-		args="${args} USE_LIBCRYPT="
-	fi
-
-	if use ssl ; then
-		args="${args} USE_OPENSSL=1"
-	else
-		args="${args} USE_OPENSSL="
-	fi
-
-	if use zlib ; then
-		args="${args} USE_ZLIB=1"
-	else
-		args="${args} USE_ZLIB="
-	fi
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-		done
-	fi
-}
-
-src_install() {
-	dobin haproxy
-
-	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
-
-	# Don't install useless files
-#	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	dobin haproxy-systemd-wrapper
-	systemd_dounit contrib/systemd/haproxy.service
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			dobin contrib/${contrib}/${contrib}
-		done
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild b/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
deleted file mode 100644
index 7b4655b91afa..000000000000
--- a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic systemd
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
-	if use pcre ; then
-		args="${args} USE_PCRE=1"
-		if use pcre-jit; then
-			args="${args} USE_PCRE_JIT=1"
-		else
-			args="${args} USE_PCRE_JIT="
-		fi
-	else
-		args="${args} USE_PCRE= USE_PCRE_JIT="
-	fi
-
-#	if use kernel_linux; then
-#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-#	else
-#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-#	fi
-
-	if use crypt ; then
-		args="${args} USE_LIBCRYPT=1"
-	else
-		args="${args} USE_LIBCRYPT="
-	fi
-
-	if use ssl ; then
-		args="${args} USE_OPENSSL=1"
-	else
-		args="${args} USE_OPENSSL="
-	fi
-
-	if use zlib ; then
-		args="${args} USE_ZLIB=1"
-	else
-		args="${args} USE_ZLIB="
-	fi
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
-
-	newinitd "${FILESDIR}/haproxy.initd-r6" haproxy
-
-	# Don't install useless files
-#	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	dosbin haproxy-systemd-wrapper
-	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
-	systemd_dounit contrib/systemd/haproxy.service
-
-	if use tools ; then
-		for contrib in halog iprange ; do
-			dobin contrib/${contrib}/${contrib}
-		done
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.9.3.ebuild b/net-proxy/haproxy/haproxy-1.9.3.ebuild
new file mode 100644
index 000000000000..2212a12930ac
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.9.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index bce5d7e929e0..675cc07e4588 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -14,5 +14,5 @@ AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33
 DIST http-replicator_3.0.tar.gz 39291 BLAKE2B a97d8b6b32f5d4ca4feefa9abaa7da7cb6570f76566c79d7371134c0edd74b2333a02480deff02fa1bf5b6cd6f2bfbfe4aaa649633d70bd2efbdd22701422651 SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57
 DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c
 EBUILD http-replicator-3.0-r7.ebuild 3443 BLAKE2B 6b68836ebc6bb27f6ad76c9619b6b00069b9ea676ec9abf0b6b81a75d40e00062d650c3fdff1e8022b33ba5a517f590a440c7e159e498fa63379c6cdbb664996 SHA512 f2fca6973f801d66755cc5f79d19e44cab08d70211739d5cf0e8f4d25c66893afe79ca9126a8091477dbca75cfa797b334b6e11d236396c4505060ddbcf8a538
-EBUILD http-replicator-4.0_alpha2-r7.ebuild 2047 BLAKE2B 37791be4784f6399e0d44b45d635c0c877e23232a36a87d9e806a5595e874a1e150634dd477d079ca98eb1471ab4fcd562ebfff858cb89a8c183bfc7ce401672 SHA512 0c7e2976d2e43fb2050ae8829618db99de31831b79c1de670c49b1d8f8735c74f37a0dfa06c4f86fde07ef52bcc6f8190e7398c8b8ffed7fdc886dbbc9db4047
+EBUILD http-replicator-4.0_alpha2-r7.ebuild 2046 BLAKE2B a7ea7d37dc67951998104499919850f48de23845d71e3b57f3da2ce037f4d02b28b6fd7fd1d3ec35fbbc72a7d6b4bf9842cbcd45090c6351db4867fc86c20d8d SHA512 a7f243cd659841416aa4e4cb338ab99174f6d2badb86239c039915bd606ac3c7b72426e5ea9a31b91ff215a41e9e55fc230317c31e13da1780b4b9109dfdbfcc
 MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild
index d1b5659c5542..0e9e484f51d3 100644
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 25d2a3749c42..a47830fe3e52 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,10 +1,3 @@
-AUX mitmproxy-0.10-jsbeautifier-imports.patch 1505 BLAKE2B 3575de61b375031282ce4fbcf9383667a8b29fcbadbef451f5d80917e821f689584073235112735f358230d248046a91b437cf86f7194aebe7ba084fd663ae7c SHA512 863aa8d2ae27b866b573812421d6cd3e9cf45ae70c499005e688a17f09e5a9a65ebb36a5e05599cfe76e7d4f59361c4870dfe9dc6ad764a09847180c74a292ca
-DIST mitmproxy-0.10.1.tar.gz 3426109 BLAKE2B 0e0822310d8b97041e6f25cb760297fb83a8544c24b0419d8215a7a65874a1c6763c6095c2e80b89231dc1de2a946471d6436713c092a1b95e7cb441f0617112 SHA512 2bef02f07942177044afa24749c4e8e2ba1aae5ee33e2cbffbecc557a09351865b70dc92b9acfd285716a82c84026a3eb93f889176fd288c1e8d67a415a5c79a
-DIST mitmproxy-0.11.1.tar.gz 6253324 BLAKE2B a3d3e06834a545138574246887c1ab5dab90d933b3995a613dabee2f6c55a436dfcb2220ded90ef91f5238d6bfcb10b2a1f64dcf801baa93598d6a8c13fadd1b SHA512 f265441825b22e2a7ec3c8f2f3152d123fbd6ac463fd4de0e973e24b2ab9feaf28689d3c995bb361ff06a88a6d88536b642944463573117640b1c096b79f20b1
-DIST mitmproxy-0.11.3.tar.gz 6172130 BLAKE2B 9001882db499e1e4a6ec082fef661a3369a36a218f3f19c08fc75d403b29b6aff22512c159a25250894e5419069ef662b691272eb5a7fbd23e2fb3e49d269adf SHA512 81184b3034b78d51368b4066adcc8337fc59332c80ce085c854610f70cd96531612520c1b751135e26093265c5475c8fef5fcb0908b77b5a18a5c605c0c94934
 DIST mitmproxy-4.0.4.tar.gz 27131713 BLAKE2B 2748b0f3b66e1f5840aae792a1b4cd8ef8efa3673fa24bc0c3e15474b36d68c0f6b2203cf629b6444545b8c6223752232b2ce8526290fe5d74916946e8917a03 SHA512 e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3
-EBUILD mitmproxy-0.10.1.ebuild 1389 BLAKE2B fec1b89165a6223e24655fe4fe1623b03eb3fbfe7aa9b1922734f15dddd1bb238667bea835ef13f6996e88ee9c3fa682a579e02e17354fe9b48899bff3ba2e6d SHA512 3d0205bd73b8129a31dd70ccbc64f8b8b632e67f85cab0beabde3b92023b477470d641ece4b2ad527c9fbe0f7572972a8046adb551a67fbc8a6e7bc1df5766cb
-EBUILD mitmproxy-0.11.1.ebuild 1516 BLAKE2B e9543a5a8041a47947e8a463260d37629b7f6995a0a47bcb8a6e452167294191ca269d76e7de4b998325e844335d76fb2b3b60296bfc0f14183fc118c854c244 SHA512 f25695010fea1bbbfe139cd3f13c8be66913941f3bde96bc67b712d5ae001582a5685dba52337b9f61a50c6d3ecd92657df349d3e1153e17ca04eb1fa56aae47
-EBUILD mitmproxy-0.11.3.ebuild 1440 BLAKE2B 5a1d4efaab7ec09af0d3b72b5d2466790330d7fdb850fae973db10c518ba9557ab3fe3ac095f35bd0ae5ee23ab375b67bd01eed1208d72ea483f0da914d99658 SHA512 bb035673e7ea497660486e19547fbcd060dae5a2eeb6f181b65bcaab980c8cfd37b9f217541eb0d7cf2bf2f0983f4a4b6eaa41ad17c633dbd578faccfc7656fa
-EBUILD mitmproxy-4.0.4.ebuild 2517 BLAKE2B 8b62b47ec8127b3a48f89091de3f3dab53bde97e95d81c14285ac5d57783abebceb2e2ef4033d55fb224d45c8c1f0a538af04ca13969cdacb39d263a94da1588 SHA512 6cad8977b0ea0ed213b1c2b05f67f27b1461113d97affa3c1e10e6d3b964f87db4f422cee61a4f919a2f7a55f62935c038b63f3b5745f5ffaf7d461fbdbcc7e7
+EBUILD mitmproxy-4.0.4.ebuild 2522 BLAKE2B b6287fe9c18f33b8725944b01040800dae79ba8a81d5672e9056cb4aaf66445a96a86f1afb3fb417a4e215472a9e2a19ce8045768893353cec38ee267854e557 SHA512 63aaa26d6b3ab206b4dcc2281d69bcc17d06a7e9838c6a74c554a41142cd4ee3123e8419fa7919b075bd5a72a69ede2bf3c6ab4b32b5d6c8f7562087f87367ac
 MISC metadata.xml 318 BLAKE2B f422f86b4b441eca44aba5cbb5b26f619d779d04a9b0196c7308b38094cf7a1f71fa542dc66c431ff24922e510b30a9ca5c32dff68530f1bdbb3e64a4ebf6178 SHA512 8f7a5435cf5b7219e6f4827289dcbfb9ff4d4e5e1f70aa9694934276e9e4aa0d84a8a052c022eaa4358528b7869504037fd371d037d4e447d0d6c6536f46815f
diff --git a/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch b/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch
deleted file mode 100644
index bd6f65aa920e..000000000000
--- a/net-proxy/mitmproxy/files/mitmproxy-0.10-jsbeautifier-imports.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/__init__.py
-@@ -246,7 +246,7 @@
-         return sweet_code
- 
-     def unpack(self, source, evalcode=False):
--        import jsbeautifier.unpackers as unpackers
-+        from ..jsbeautifier import unpackers
-         try:
-             return unpackers.run(source, evalcode)
-         except unpackers.UnpackingError as error:
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/__init__.py
-@@ -7,7 +7,7 @@
- 
- import pkgutil
- import re
--from jsbeautifier.unpackers import evalbased
-+from ...jsbeautifier.unpackers import evalbased
- 
- # NOTE: AT THE MOMENT, IT IS DEACTIVATED FOR YOUR SECURITY: it runs js!
- BLACKLIST = ['jsbeautifier.unpackers.evalbased']
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/myobfuscate.py
-@@ -40,7 +40,7 @@
- except ImportError:
-     from urllib.parse import unquote
- 
--from jsbeautifier.unpackers import UnpackingError
-+from ...jsbeautifier.unpackers import UnpackingError
- 
- PRIORITY = 1
- 
---- mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
-+++ mitmproxy-0.10/libmproxy/contrib/jsbeautifier/unpackers/packer.py
-@@ -14,7 +14,7 @@
- 
- import re
- import string
--from jsbeautifier.unpackers import UnpackingError
-+from ...jsbeautifier.unpackers import UnpackingError
- 
- PRIORITY = 1
- 
diff --git a/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild b/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild
deleted file mode 100644
index 4dc54075e1b4..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild
+++ /dev/null
@@ -1,51 +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 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-jsbeautifier-imports.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove unwanted bytecode files
-	rm -r libmproxy/protocol || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild b/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild
deleted file mode 100644
index 535d1340404d..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild
+++ /dev/null
@@ -1,55 +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 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.6[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=( "${FILESDIR}"/${PN}-0.10-jsbeautifier-imports.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove bundled netlib and pathod
-	rm -r libpathod netlib || die
-
-	# remove unused dep
-	sed -i '/sortedcontainers/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild b/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild
deleted file mode 100644
index 9020f4791c05..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild
+++ /dev/null
@@ -1,54 +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 versionator
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="http://mitmproxy.org/"
-SRC_URI="http://mitmproxy.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/pillow-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.6[${PYTHON_USEDEP}]
-	=dev-python/netlib-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	>dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# don't run example scripts tests
-	rm test/test_examples.py || die
-
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG CONTRIBUTORS )
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
index dd3a3a0d8083..eae990245b34 100644
--- a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 6c986e55be04..cf93e51600a4 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index d1f7578be410..e6903269e997 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -9,9 +9,11 @@ DIST i2pd-2.20.0.tar.gz 1991174 BLAKE2B 37b85dc37299cd6d2f64050eb096ecc11d75ccdc
 DIST i2pd-2.21.0.tar.gz 1993520 BLAKE2B 616f4938d547e6a5d27292bec1741fa28131c37ad12b0f7c564e24ff0fd3b0a01974989ac6f337cd58cc1a618980fd171692c0164d22c3e97080540318e5df89 SHA512 a9c2f4bb1ec6459e7f8f48b74a48dd192af0962876fc6dcf998febe342918f98a21ae421cf48402d5e0c4570641eb3112d85522230dad34cabe6c4f367d6d8ab
 DIST i2pd-2.21.1.tar.gz 1993853 BLAKE2B 8686acf12464f892cb116ba6c14b67fc56af45315feec25b4c165c7b38238f48b7e1ca227f8b2b53dabcb4d9f46555e1528f4f11e675fbfc63aa3fad062280b6 SHA512 e73c0c1f624b468a4a30996de77b27f5a2166d16b57724ec58647e5630f9e988052b11962fa47f318403ccd4c675a8d7c8b0ddcaa79666cea9743a6437fc4fd2
 DIST i2pd-2.22.0.tar.gz 2263033 BLAKE2B b8b7fa0a1fc4e333824eed8c6bd5fbfe40b83b7a0dbf5db8001144ca1b672c6e33996ad5218ef53cca15e56738fd8447f1c10a90c109d86a2364ef7646cc1377 SHA512 da8187a5d68bf09962419da91eeeb12534eaa2b519139784afb5faf6f1c40e7b344181f987461614d0f7b6563d0a872c8180ecc8a122ed08688130de3d13b0e8
+DIST i2pd-2.23.0.tar.gz 1008677 BLAKE2B c216785d8642e1c8d7cdbcddd23e6dd0b8a1fe8d732ef8b8d19e3c7c55ad91285dfa85bcfab0934a0acc4c180750ff8e3f5730f948dafff7c283ed084afa3374 SHA512 b547fa5b4ab3fbdf51cded846966b702304cc3dcbafbf3b4fc0e93e1907e45a649dd19eabc851309dfb7d3aa8ef84eefcb2cf1a3cda8549f90200da54df06923
 EBUILD i2pd-2.19.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
 EBUILD i2pd-2.20.0.ebuild 3166 BLAKE2B 5a62ee83bd80beca39b265a8a6806c733d047066d204afe101ded329795b4f053af6dd13e93914bb22ab307729eda6ed72073a6cd0bd5699ed6f350b4ae136cf SHA512 24098b0bf0e114bbcda5eaa821906f7b7c4387b4202220526bf177c109979f6a0b65d0449a7e13bcc2d134a90cf9e8ca0fc2cd7db04620e1ad5a3115de36a017
 EBUILD i2pd-2.21.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 EBUILD i2pd-2.21.1.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 EBUILD i2pd-2.22.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
+EBUILD i2pd-2.23.0.ebuild 3140 BLAKE2B 91040336cf1b6a8b55bc720cf519e9c71c4feeee1e664d50fcf9a241957d8c23670ffe3082877c8f343197149a4fd98e64fe945279db2bdc437f860a9dbdc322 SHA512 17ebbb09fb555d6db61010b724e48acdd1603bb6e15bf20b5ea61ec6bed61addb323ac986c2906a764240ce249d2106117ccdb6062b83924416e96916f3bc7a2
 MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553
diff --git a/net-vpn/i2pd/i2pd-2.23.0.ebuild b/net-vpn/i2pd/i2pd-2.23.0.ebuild
new file mode 100644
index 000000000000..963416b932a4
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.23.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user cmake-utils eapi7-ver toolchain-funcs
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
+
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="
+	!static? (
+		dev-libs/boost[threads]
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+		libressl? (
+			dev-libs/libressl:0
+			>=dev-libs/boost-1.65
+		)
+		upnp? ( net-libs/miniupnpc )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		dev-libs/boost[static-libs,threads]
+		!libressl? ( dev-libs/openssl:0[static-libs] )
+		libressl? (
+			dev-libs/libressl:0[static-libs]
+			>=dev-libs/boost-1.65
+		)
+		sys-libs/zlib[static-libs]
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
+
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
+
+PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
+
+pkg_pretend() {
+	if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then
+		die "At least gcc 4.7 is required"
+	fi
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_PCH=OFF
+		-DWITH_STATIC=$(usex static ON OFF)
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# grant i2pd group read and write access to config files
+	fowners "root:${I2PD_GROUP}" \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+	fperms 660 \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+
+	# working directory
+	keepdir /var/lib/i2pd
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+}
+
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7803b3dfd3c1..2b1f72ec1b2a 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index e0ccdbd33143..775471051706 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,12 +2,14 @@ AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-5.10.5.zip 77373497 BLAKE2B 0716c2ce948a909959d52325d97f9fdbf867492e54bfc12f286659f825f3d5719d334612d71af4bad8d9f1ff076d418df54af8cea18019adbc32cb1972eb5ae6 SHA512 9c8da7fc8b1068a60e5702d377d9cfaa6ea8d90014c3b4e3478bfc0b6a3a1614853befa9cca08c78ebffcdaf4dad119b251c69c52eb8df44acdbe225a28b54ed
+DIST unifi-5.10.10.zip 91779017 BLAKE2B e33702665ca010127e16bb15a8bd06666cc122d13d0464b190d91ec9a948a7846d377db44944e63c52e5dc5cd5bf94f2b8a5acbeda5ae565904ef4d4779b4032 SHA512 2036e00ce5aadb768e3e8b2cad7fca6bc11795137c2f63b66bd4d26cfe9e08087f7bc3d123d188626831982dcf03da04ede5c24c28f8aa6e39647ea74ab53c59
+DIST unifi-5.10.11.zip 91776743 BLAKE2B 68774ce69859db5568447db502d993e5f0e88832ebd026558797634cf9ae98405eaeca2ceaa4d61bdd6de28c02e349391111b481d29ab3acc45036fe28696a33 SHA512 a8820b8d77c77c7c88bebe3172433114682cb1444dd8d472c06ffb23268d1119234ab02822fc215b1a578d6d832d3d8d5dd6e04cc0889bd711289d00b2ca34bd
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
 DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
 DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a
-EBUILD unifi-5.10.5-r1.ebuild 1840 BLAKE2B 263e0cc678b5200f68fad6fea72e1ac1e48f89adf73337b7df1f7b194c21c85fac4960dd52cc0309eaf7c7cd468b60f9e5b4d6de6498076bb85238e1aa1e6d0b SHA512 5c68ef5a3c6a6f6b7e6d65cb0818062977a32a3a4c638cacddca1c2b49869cbf45e46971b6b4cbe8fcf98f662692e75833a23dac377987499b2f728ec7f2b25b
+EBUILD unifi-5.10.10.ebuild 1846 BLAKE2B 3061303ee8acb1381ca9195b2332fb9c0f05b9c2e030bd34014c3426a4bda45556adaa28fb092a324eca8854ca9c383d3ba9bcf7783fb2b7e439eeee98945ab8 SHA512 74c424bcf16c5c2c3f2c54d59563d4cd889f55d3fc4ccffa3104b579642f4fdc0a480c87cf79efa656ccb8cfc11511f899207c589a2671019d7d6d506daab243
+EBUILD unifi-5.10.11.ebuild 1846 BLAKE2B 082d38c1259fd142815b1d907ff7527e653137c53a9fcd8a14bafa9d9622d3166f07dc0def0246509fafcbf13bc55e50b9d25ade4f2d514334177f203888d0c4 SHA512 91e98c597156f043536e8f27686245c625d6f97c4556f41fee2fb74d50364ec2fae08e4386ea3c0d0424c4d948b2da78d9b61583ba2fa29652c0e886a7152951
 EBUILD unifi-5.6.39-r1.ebuild 1721 BLAKE2B b3d2d6df884e5fdc1f09c191dda26eeb71cc05b4f2d51c3556d2b6bee834639f616d542a994f95a6c58bce8b9ae8374ace94d448751fed7fb5058dbdf8a6d67d SHA512 c7b7e8d2196319abacf2094ace35e5fdcb56feb9f22939b28839cc0bab8c40e6f7fe9e16cf2c8ae4992e64e9578f7bff7fcfe0011558c93625e73173b6cc992c
 EBUILD unifi-5.6.40.ebuild 1732 BLAKE2B 083dba38eb9f1007a2c596704d71b1e3064b1029e9c761c4603e32da466d8718d7a6f1cb4ce7a229916c1d89efd253539147acfbcfa43ca7cdbbeb2549ac2d73 SHA512 974837d60c8f133c8c266c0c7f51fdc7ce08f9ac51cb1f70126ba952e314927878a8200ac437a938296640cfd905e9e19266ba30fd6b3af8a62272738d6c92cb
 EBUILD unifi-5.9.29.ebuild 1845 BLAKE2B 68f13e0a721aba2a1ca2c6ad497dd5668337d1431979540549183491be516f3e976c05e57168b7388dd7959e872c6a648152b8038da8f708200de29991006678 SHA512 d52c718bcdd4062ead97594992fb089d34d35a87bfe6e22191c79c05f522da8bf5a75c1614c0f03c34cc756817df898a4c1371bec96ff8683410bbe5b9ca0a34
diff --git a/net-wireless/unifi/unifi-5.10.10.ebuild b/net-wireless/unifi/unifi-5.10.10.ebuild
new file mode 100644
index 000000000000..4d2a335ee882
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.10.10.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="-20316752b4"
+
+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.10.11.ebuild b/net-wireless/unifi/unifi-5.10.11.ebuild
new file mode 100644
index 000000000000..4010245a87b1
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.10.11.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="-6e1800b9b9"
+
+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.10.5-r1.ebuild b/net-wireless/unifi/unifi-5.10.5-r1.ebuild
deleted file mode 100644
index 0d79c61ec816..000000000000
--- a/net-wireless/unifi/unifi-5.10.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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="-6ba4d1bfe5"
-
-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=""
-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/profiles/Manifest.gz b/profiles/Manifest.gz
index 24db264b6769..f20477ca1eec 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index bdec03cbbba6..1082a59dd634 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -128,10 +128,6 @@ media-libs/gegl umfpack
 # Missing stable
 net-misc/connman l2tp pptp
 
-# Michael Palimaka <kensington@gentoo.org> (11 May 2015)
-# kde-frameworks/kwallet is not stable on arm
-www-client/qupzilla kwallet
-
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index deae9d880fa6..acc452b53e2b 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -21,6 +21,7 @@ dev-perl/Error test
 # Raúl Porcel <armin76@gentoo.org> (23 Jan 2013)
 # Architecture is unsupported
 dev-libs/libpcre jit
+dev-libs/libpcre2 jit
 
 # Ryan Hill <dirtyepic@gentoo.org> (20 Jul 2011)
 # graphite requires dev-libs/ppl & dev-libs/cloog-ppl
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 63c2777bb3d2..2b493a99c14b 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -22,6 +22,7 @@ dev-db/mariadb numa
 dev-python/restkit cli
 # not tested yet
 app-misc/mc samba
+app-arch/rpm test
 
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8966740a2cc6..975c2a938902 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -94,7 +94,7 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Nov 2008)
 # Netbeans modules/clusters
-NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
+NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target(s)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d20471503491..6ef493ec7318 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,10 +7,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (19 Jan 2019)
-# currently broken, segfaults, bug #675752
->=dev-lang/rust-1.32.0 system-llvm
-
 # Sven Wegener <swegener@gentoo.org> (18 Jan 2019)
 # Waiting for >=dev-libs/libressl-2.7 to be unmasked.
 >=net-libs/libvncserver-0.9.12 libressl
diff --git a/profiles/default/linux/m68k/13.0/deprecated b/profiles/default/linux/m68k/13.0/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/desktop/deprecated b/profiles/default/linux/m68k/13.0/desktop/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated b/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/13.0/developer/deprecated b/profiles/default/linux/m68k/13.0/developer/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/17.0/desktop/deprecated b/profiles/default/linux/m68k/17.0/desktop/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated b/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/m68k/17.0/developer/deprecated b/profiles/default/linux/m68k/17.0/developer/deprecated
new file mode 100644
index 000000000000..f89fa8f95f0a
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/m68k/17.0
diff --git a/profiles/default/linux/s390/13.0/deprecated b/profiles/default/linux/s390/13.0/deprecated
new file mode 100644
index 000000000000..baf48dfd301b
--- /dev/null
+++ b/profiles/default/linux/s390/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/s390/17.0
diff --git a/profiles/default/linux/s390/13.0/s390x/deprecated b/profiles/default/linux/s390/13.0/s390x/deprecated
new file mode 100644
index 000000000000..e7aff27cef21
--- /dev/null
+++ b/profiles/default/linux/s390/13.0/s390x/deprecated
@@ -0,0 +1 @@
+default/linux/s390/17.0/s390x
diff --git a/profiles/default/linux/sh/13.0/deprecated b/profiles/default/linux/sh/13.0/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/desktop/deprecated b/profiles/default/linux/sh/13.0/desktop/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/desktop/gnome/deprecated b/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/13.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/13.0/developer/deprecated b/profiles/default/linux/sh/13.0/developer/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/17.0/desktop/deprecated b/profiles/default/linux/sh/17.0/desktop/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/17.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/17.0/desktop/gnome/deprecated b/profiles/default/linux/sh/17.0/desktop/gnome/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/17.0/desktop/gnome/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/default/linux/sh/17.0/developer/deprecated b/profiles/default/linux/sh/17.0/developer/deprecated
new file mode 100644
index 000000000000..d3f97aaef8ce
--- /dev/null
+++ b/profiles/default/linux/sh/17.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/sh/17.0
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
new file mode 100644
index 000000000000..c48c34b15f2a
--- /dev/null
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Benda Xu <heroxbd@gentoo.org> (Jan 26, 2019)
+# native-extensions requires >=linux=4.6 for __NR_copy_file_range
+sys-apps/portage native-extensions
diff --git a/profiles/package.mask b/profiles/package.mask
index d0d70a949c7d..fb1f434a4ffb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,38 @@
 
 #--- END OF EXAMPLES ---
 
+# Jeroen Roovers <jer@gentoo.org> (31 Jan 2019)
+# Depends on =dev-libs/openssl-1.1.1*
+# bug #670574
+=net-libs/nodejs-11.9*
+
+# Andreas Sturmlechner <asturm@gentoo.org> (30 Jan 2019)
+# Dead upstream, breaks every other poppler release due to private
+# interface use, blocks poppler security cleanup(s), bugs #656108, #674808
+# Masked for removal in 30 days.
+app-text/pdf2htmlEX
+
+# Dennis Lamm <expeditioneer@gentoo.org> (29 Jan 2019)
+# Depends on >=app-text/enchant-2.0.0 which is masked
+=gnome-extra/gtkhtml-4.10.0-r1
+
+# Dennis Lamm <expeditioneer@gentoo.org> (28 Jan 2019)
+# Depends on >=app-text/enchant-2.0.0 which is masked
+>=app-text/gtkspell-3.0.10
+
+# Dennis Lamm <expeditioneer@gentoo.org> (28 Jan 2019)
+# Depends on >=app-text/enchant-2.1.3 which is masked
+>=app-text/gspell-1.8.1
+
+# Virgil Dupras <vdupras@gentoo.org> (27 Jan 2019)
+# Dead upstream, no revdep. bug #618744
+dev-python/fusil
+
+# Virgil Dupras <vdupras@gentoo.org> (27 Jan 2019)
+# Obsolete upstream. See bug #610466 and bug #645170
+dev-python/python-social-auth
+dev-python/python3-openid
+
 # Miroslav Šulc <fordfrog@gentoo.org> (23 Jan 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =dev-java/ant-eclipse-ecj-4.10
@@ -71,26 +103,6 @@ sci-electronics/librepcb
 # Requires dev-libs/openssl-1.1.1, Bug 674148
 dev-libs/gost-engine
 
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Superseded by www-client/falkon. Masked for removal in 30 days.
-www-client/qupzilla
-
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Package outdated for years, build errors, unable to trade with.
-# Bugs 544800, 592946, 610736. Masked for removal in 30 days.
-app-office/QtBitcoinTrader
-
-# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
-# Dead upstream since 2014-02-09, does not build.
-# Bugs 463928, 476890, 623172, 662270. Masked for removal in 30 days.
-net-misc/hotot
-
-# Alon Bar-Lev <alonbl@gentoo.org> (30 Dec 2018)
-# Upstream is dead.
-# Package does not support openssl-1.1, significant change to package.
-# Removal in 30 days
-app-crypt/openssl-tpm-engine
-
 # Lars Wendler <polynomial-c@gentoo.org> (28 Dec 2018)
 # Masked while being tested and reverse deps aren't fully compatible
 =dev-libs/openssl-1.1.1*
@@ -444,8 +456,11 @@ dev-java/jcs
 # FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
 # FAIL:07:02:35 (00:00:00) Dump/load of ./TESTDIR.3/recd001.db failed.
 # FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
+# Lars Wendler <polynomial-c@gentoo.org> (25 Jan 2019)
+# Also masked because of mostly incompatible license (AGPL-3)
 =sys-libs/db-6.1*
 =sys-libs/db-6.2*
+=sys-libs/db-18.1*
 
 # Ulrich Müller <ulm@gentoo.org> (15 Jul 2014)
 # Permanently mask sys-libs/lib-compat and its reverse dependencies,
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index bdbdebe73aa0..af8de6185855 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -6,9 +6,9 @@
 
 
 # Fabian Groffen <grobian@gentoo.org> (25 Dec 2018)
-# GCC-8.2.0 causes a problem with Perl-5.28 where Configure wrongly
-# believes every function it checks is available.  Need to revisit this
-# at a later point.
+# GCC-8.2.0 has a faulty libgcc_s, which causes C++ exceptions not the
+# caught in certain conditions.  ld64 is the notable condition leading
+# to configure believing every function it checks is available.
 >=sys-devel/gcc-8
 
 # Fabian Groffen <grobian@gentoo.org> (22 Dec 2018)
diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index d31399b7dbce..71b8a1e0a7be 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (30 Jan 2019)
+# Cygwin does not have updated patches yet, is not trivial
+>=sys-apps/coreutils-8.30
+
 # Michael Haubenwallner <haubi@gentoo.org> (02 Jul 2018)
 # Need to import Cygwin upstream patches still.
 ~sys-devel/gettext-0.19.8.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 98126c534de9..2f7a33101d85 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -112,6 +112,7 @@ app-admin/puppet-agent:puppetdb - Adds puppetdb support
 app-admin/puppetserver:puppetdb - Adds support for connecting to puppetdb
 app-admin/pwgen:livecd - Install init script for root password scrambling on boot
 app-admin/pwman3:mongodb - Add support for MongoDB
+app-admin/rsyslog:clickhouse - Build the ClickHouse output module (requires net-misc/curl)
 app-admin/rsyslog:curl - Enable http_request() function in RainerScript (requires net-misc/curl)
 app-admin/rsyslog:dbi - Build the general database output module (requires dev-db/libdbi)
 app-admin/rsyslog:elasticsearch - Build the Elasticsearch output module (requires net-misc/curl)
@@ -378,7 +379,6 @@ app-doc/tldp-howto:html - Install multi-chapter HTML docs
 app-doc/tldp-howto:htmlsingle - Install all-on-one-page HTML docs
 app-doc/tldp-howto:pdf - Install pdf docs
 app-doc/tldp-howto:text - Install plain-text docs
-app-editors/bluefish:gtk2 - Enable GTK2 instead of GTK3 even if GTK3 is available
 app-editors/bluefish:gtk3 - Enable GTK3 interface (default)
 app-editors/bluefish:gucharmap - Enable gucharmap dictionary plugin
 app-editors/bluefish:python - Enable Python integration for zen-coding plugin
@@ -2033,6 +2033,7 @@ dev-lang/lazarus:minimal - Don't build extra packages from the bigide component
 dev-lang/logtalk:fop - Support for generating pdf documentation using fop
 dev-lang/logtalk:xslt - Support for generating html documentation using xslt
 dev-lang/lua:deprecated - make deprecated data structures/routines available
+dev-lang/lua:test-complete - Run the complete (non-portable) testsuite
 dev-lang/luajit:lua52compat - Enable some upwards-compatible features from Lua 5.2 that are unlikely to break existing code.
 dev-lang/mercury:erlang - Support Mercury Erlang grade
 dev-lang/mercury:trail - Support Mercury trail grades
@@ -3213,6 +3214,12 @@ dev-util/pkgconf:pkg-config - Install as a replacement for dev-util/pkgconfig
 dev-util/pkgconfig:internal-glib - Use internal copy of dev-libs/glib
 dev-util/pkgconfig-openbsd:pkg-config - Install as a replacement for dev-util/pkgconfig
 dev-util/scanmem:gui - Enable the GameConqueror GUI
+dev-util/sccache:azure - Enable Azure Blob Storage support
+dev-util/sccache:dist-client - Enables distributed support in the sccache client
+dev-util/sccache:dist-server - Enables the sccache-dist binary
+dev-util/sccache:gcs - Enable Google Cloud Storage support
+dev-util/sccache:redis - Enable Redis support
+dev-util/sccache:s3 - Enable Amazon S3 support
 dev-util/schroot:btrfs - Enable support for chroots using btrfs snapshots.
 dev-util/schroot:dchroot - Enables the building of a wrapper named "dchroot", replacing sys-apps/dchroot.
 dev-util/schroot:lvm - Enable support for chroots using LVM snapshots.
@@ -3379,6 +3386,7 @@ games-emulation/m64py:7z - Ensure support for .7z archives.
 games-emulation/m64py:rar - Ensure support for .rar archives.
 games-emulation/mednafen:debugger - Build with internal debugger
 games-emulation/mednafen:pax_kernel - Triggers a paxmarking of the binary
+games-emulation/mgba:elf - Enable the use of elf utils via dev-libs/elfutils
 games-emulation/mupen64plus:audio-sdl - Enable SDL audio plugin.
 games-emulation/mupen64plus:input-sdl - Enable SDL input plugin.
 games-emulation/mupen64plus:rsp-hle - Enable HLE RSP plugin.
@@ -6595,7 +6603,6 @@ net-misc/gnome-online-miners:flickr - Enable Flickr support
 net-misc/gsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
 net-misc/gsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
 net-misc/gwget:epiphany - Build epiphany extensions
-net-misc/hotot:chrome - Build chrome browser extension
 net-misc/htbinit:esfq - Add support for Enhanced Stochastic Fairness queueing discipline.
 net-misc/hylafaxplus:html - Convert faxes into html email
 net-misc/hylafaxplus:jbig - JBIG Fax Compression Support
@@ -6748,7 +6755,8 @@ net-misc/ptpd:pcap - Require net-libs/libpcap to allow layer 2 (raw Ethernet) tr
 net-misc/ptpd:slave-only - Enable slave only operation (remove master mode functionality)
 net-misc/ptpd:snmp - Require net-analyzer/net-snmp to enable SNMP configuration
 net-misc/ptpd:statistics - Enable compution of statistics
-net-misc/putty:gtk - Build the PuTTY client which requires x11-libs/gtk+:2. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.
+net-misc/putty:gssapi - Enable support for GSSAPI (virtual/krb5)
+net-misc/putty:gtk - Build the PuTTY client which requires x11-libs/gtk+:3. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built.
 net-misc/quagga:bgpclassless - Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found at http://hasso.linux.ee/doku.php/english:network:quagga
 net-misc/quagga:fpm - Enable Forwarding Plane Manager support
 net-misc/quagga:multipath - Enable multipath routes support for any number of routes
@@ -8748,6 +8756,7 @@ www-client/firefox:system-jpeg - Use the system-wide media-libs/libjpeg-turbo in
 www-client/firefox:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 www-client/firefox:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 www-client/firefox:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
+www-client/firefox:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
 www-client/jd:migemo - Enable migemo support for Japanese
 www-client/jd:oniguruma - Use dev-libs/oniguruma for regular expression
 www-client/links:libevent - Enable dev-libs/libevent support
@@ -8767,8 +8776,6 @@ www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/li
 www-client/netsurf:svgtiny - SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
 www-client/opera:gtk - Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration
 www-client/otter:webengine - Use dev-qt/qtwebengine as backend instead of dev-qt/qtwebkit (experimental)
-www-client/qupzilla:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
-www-client/qupzilla:nonblockdialogs - Enable fancy non-blocking JavaScript dialogs shown inside the page, not blocking the application window. When closing browser windows with open dialogs, this can crash the application.
 www-client/seamonkey:calendar - Build Mozilla's calendar
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3a41a32fc605..51c5481f63f5 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 680ca17f9442..5873e116df40 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,5 +1,5 @@
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
 DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
 EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
-EBUILD gpxsee-7.1.ebuild 1540 BLAKE2B 0ba94919b68048f8ffe4c898eb37053a648cbef4445c3eab1bb5c381b320e9e6d0c9c7ddec2e81f658ec262beecb892a20f46efc460e900b048aaa1dcda2ab47 SHA512 63c95ed59603f3b34c55d80a0ffcca9040d075b8952b388b6ad490c350d33956558dfafd97c66e4fd8735a63c2befddadb5f78266f2e2d022053345ba4c867d1
+EBUILD gpxsee-7.1-r1.ebuild 1595 BLAKE2B 56ee4fc1ae26a1b7df8d20ac9c5a6b05416693ff90b9c25d99c19d1573024e5e84eaad1bf0118d376646152608584311f6afb18925e3899a80e781414ff3bd35 SHA512 b3d634a0888de422e0b912913323142b9c02673d610d17036854102c6213cd599635a61f30937a0d9255d8f8ae669eef64ab02b5a9935af922251ca9a953c0a4
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
new file mode 100644
index 000000000000..f37e65f5536a
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en fi fr nb pl ru sv tr"
+inherit qmake-utils l10n xdg-utils gnome2-utils
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="http://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	local lang
+	newbin ${MY_PN} ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+
+	insinto /usr/share/${PN}/translations
+	for lang in lang/*.qm; do
+		[ -f "${lang}" ] && doins "${lang}"
+	done
+
+	insinto /usr/share/applications
+	doins pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	insinto /usr/share/pixmaps
+	doins icons/${PN}.png
+}
+
+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-geosciences/gpxsee/gpxsee-7.1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
deleted file mode 100644
index f12eaf15a651..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs da de en fi fr nb pl ru sv tr"
-inherit qmake-utils l10n xdg-utils gnome2-utils
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="http://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtcore:5"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	l10n_find_plocales_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	l10n_for_each_disabled_locale_do rm_ts
-}
-
-src_compile() {
-	lrelease gpxsee.pro
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	local lang
-	newbin ${MY_PN} ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	insinto /usr/share/applications
-	doins pkg/${PN}.desktop
-	insinto /usr/share/mime/packages
-	doins pkg/${PN}.xml
-	insinto /usr/share/pixmaps
-	doins icons/${PN}.png
-}
-
-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-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 6f59f81207ed..d4437ca7a8cd 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,5 @@
-AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d
-DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
 DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
-EBUILD qmapshack-1.11.1-r1.ebuild 937 BLAKE2B e85730518ec6b863e90db2b77a24f2a4def775338a7683e80f7040e61806e3f2d6e0bc823afd1acdeb25641743261ea2a0cf2470795de1a20d2edcaefb3c5998 SHA512 148bab65d8f829d89e84f1df532701085d378fc9bda4f51fc68c8b05c9c48874e9acbc7ae721044db7a56b907ca9fe417094281c5460f571e7ebddad6cfcc57b
 EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
 EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
deleted file mode 100644
index 404f034176df..000000000000
--- a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User kiozen
-# Date 1528899896 -7200
-# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
-# Parent  f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
-[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0
-
-diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
---- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-+++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
-@@ -20,6 +20,8 @@
- #include "helpers/CToolBarConfig.h"
- #include "helpers/CToolBarSetupDialog.h"
- 
-+#include <QAction>
-+
- bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
- {
-     CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
deleted file mode 100644
index b3f1c55aef8f..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.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 cmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/designer:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-libs/quazip
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj
-	sci-libs/alglib"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-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-libs/Manifest.gz b/sci-libs/Manifest.gz
index dac2bbb19d93..540a4482d6ab 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index caee535a7abb..ec3432a4adc6 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,5 +13,5 @@ AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 8497 BLAKE2B 263ccfa2d5ec703d0a51adea18f3a4cdfa5d2a8808c04b30f37bc5cb674e8d5c2f2eb578c4942691610a3d509252967b16056a371929a0eb1490ef4922c15f49 SHA512 9fe9e0bbe01a40dcff87ea0aa6004c8f5ca58619227bd76349ed0b85406c23c6f0cef79021a7634cce10fd1072a1f8bc1d6f7e5a6b6c35cb4a1bf5c21d999a29
+EBUILD gdal-2.3.1.ebuild 8399 BLAKE2B 6ca20d8216c0efb8091ea610a379a0f58aa51796b8bc72469c08105c98c087cd66ffd0646bcca492b260b786e48ae0f86288de42a4404b4e65a4005311aa7e87 SHA512 9ff7532518e51c578075315bd962e2b9d404deb27a053c479f3143ba9eac364f251ff23c8eca8e6951e41aed0eec8f9e78cd28a574a5d3f970fd821aa5ad87d6
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 9f81394be026..89243a3e82ff 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -15,7 +15,7 @@ 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="
@@ -82,8 +82,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch"
-	"${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556
+	# fixed in 2.4.0:
+	"${FILESDIR}/${P}-poppler-0.69.0.patch"
+	"${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556
 )
 
 src_prepare() {
@@ -120,10 +121,9 @@ src_prepare() {
 
 	default
 
-	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
-	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
-	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
-	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
+	# fixed in git master or what will become 2.4.1:
+	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch"
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch"
 
 	eautoreconf
 }
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index f938da1b70d1..9e6711bdeadf 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -18,8 +18,8 @@ DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b6
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 EBUILD scipy-0.16.1.ebuild 4249 BLAKE2B 8335f8abb2453467099d68e97aa3aa669634f64b42e75b3c310f6f39178f90c9b8760a1ffa4bb76a3ff6285dc19806074e7408d16427416caa2bcdb9db6aed0e SHA512 adc049f57eb2c16565d8d99983409a6f64f57938aa649d89008587374550af06aa5d1f9476f61d9fcfbaa5615e60732381c1ed436b0dd9241aee00b43370ba44
 EBUILD scipy-0.18.1.ebuild 4254 BLAKE2B 156c9f9cfa488170e9be814e2238f1e4113f6e176f4458f3f659959ab6d552729afff18a3a0c392a579f7025c216a7ce354910f836a26549866764d86d070f74 SHA512 f20fd715cbb7667cabf636db6cf11b8b1de26c497ef87a6d4ee16324415867a9fe06f0bca57677eacb4622b621e60badcd97e8325dc74076492cb0e29ef8e4f2
-EBUILD scipy-0.19.1.ebuild 4247 BLAKE2B 98a7b7152c422cd5540aee58ad2c400471954396ad680c6bb642ceaba7715c93b1ee19772fa001b40b94b4d0a855265af61575c6f65afd51b8c77a965e380f45 SHA512 fcb4dfa545cf24913f402261a8ccbd8ea9e7ac70aa6ae0d1eb66f3e0187d4459394f40a7a864c24dcf8c1802ee191701bbb01b6f72f4c9a03dcee3296136edc5
+EBUILD scipy-0.19.1.ebuild 4246 BLAKE2B 985eef95193aaddeb640ce5e9f2fd0413ac51a1c85e78c2e038e18de174c3a5ea9889693a6c4ed7300e84900663e4a41658b7997f647b581c199e037e2aca48a SHA512 0d1e398342ccc28c2f957c4c33a31750c15d425857d20b62a2e28e8cb40ee9479ec92ff607f3a12922f3977d9eeac8b7ef8bbdd56dab3cc6a1e20d68ec6c702e
 EBUILD scipy-1.0.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
-EBUILD scipy-1.1.0.ebuild 4033 BLAKE2B 5718c17ddfe3b7bd2e37354e62771136ceab83d34f0483bbc258cc4a1d1528a78c4ef7458096e83cab1593287dd975675b3d6e3ed430f93c4fa75d71d65cc2b9 SHA512 198f6b4b1dbec7bcb8d2e843697d7cc805bbd28b4c0aa5b21d71032081c6c9d71a3492c182a417bc10aa2178b004ff52ec68901db8196656b7852ec630d9cb68
-EBUILD scipy-9999.ebuild 3615 BLAKE2B 83d9274d3c6cc56d1de623b99e15da74df3615aec38675912937cf0572a74ce5ad0eaaa945e541707d8a5444251d4009eddeeffb287cd4db89cf610188f0759b SHA512 55148129c46cacdca338380d7d26792dcdb5d7fa3128273de9c44e930d6bf83715574d26d8b065fec8b633f1efbda9d9446a5b6bae04bc9069d315a1ee85f385
+EBUILD scipy-1.1.0.ebuild 4032 BLAKE2B 8774ce67b6d3dfc74957a384852297e1fa1be54938ed02351632e4c0e330407d9c84230d1d21ae2707e88027e258881bd52eec8198c68bf5ec6171aa1c84af4f SHA512 c8a7cb23cbe23a50f37703d5b99af510bfb1b805b197e5fd6d91a69d1fd4d26dbdd0c7d74590e457188994735a1bf59413718e7e6f07792d95212467f6567e99
+EBUILD scipy-9999.ebuild 3614 BLAKE2B 70dd389dad2b78b79c867e50ed963f6e8d9f2fb560ca5b0b23463158267aef78f7c7a2eb30087f4600bc3449fa31cff81d752d1c41317f82fc28765b2c38c8ee SHA512 ab2ba2adcc5927528447aeb9a8dced497df47f8f646f343fa0b9337f89d02367ec511725f83b001ba5485fc94ed4e95dbb5c8e9bf25bd70bc33eddc6ff54f288
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
index c12cc341cc76..81bfc711b518 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index 0db065d7043a..6a801e838d63 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.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=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index b25250bfad33..1595b85c58b3 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 72014909b10f..2d9570918f4f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 7c890c23c831..10fceb94bcc6 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -13,7 +13,7 @@ AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b4
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
 DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
-EBUILD octave-4.2.2.ebuild 5018 BLAKE2B 31a4044ed79454e35188ca546ff21cac7868d412f3f9c8fe4230b4afba4d1c440da651b497753e6331e1ea018aa6254a9ba2de7544df1daa39925a720cf6df1f SHA512 02f48228c6e4b96ce09c860b6eb4ca07939cf813e1036314f63bd8c4f15b3702c70d16bcda94dcb6557c9ec875aa00e704bc6bfcdc943b2445e2ed57155c4bd2
+EBUILD octave-4.2.2.ebuild 5112 BLAKE2B 2f08b20c4557a30b1b8bb3608c400805cf21af1f438ffc8e5f8cc54576b5c6116bfc009bb29c33b9a4f69e29e0f423994fda8cc4b04967209179d4a90a7d7d7d SHA512 4a033bec4259b063ed3c5008881c6ff57e061e7e769b9481f3dd14af3e004711d0a9f221b0afc9fce83386d102062d84d0813fd01cee3b240f4266b0c0371039
 EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
-EBUILD octave-4.4.1.ebuild 5089 BLAKE2B e211985e5fa310a9259242762ff38e2c702c77abbf85c0b5f2ed5d873b8370560df1cf1777612c1e8e19b910c639f81de7040f87f2c85215cc3b6071c691618d SHA512 c3ebba7cbf16b3be54bd4b9057a44479b8d53c8981d97a7f6107a81d547a6d1bcb4a53407835699cd6a170c174521058cc529d12114f52d8565a68caa1f016f3
+EBUILD octave-4.4.1.ebuild 5186 BLAKE2B 7184fc80f07db1e5098a791e63682379b46024b4e0fd4b32ff0f09d90f078e51a5c0c4208bfe216a1a3523ba81a2c87f6358f8463b08215caf14311b9630ea27 SHA512 8466f20e81594f9d7189a2b19f74199dd529b0631dbd60907b920616c74f84242757389f933f78e0009cc9073607db4b21f1f426743ba14293060700d2b8b101
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index cf8556845539..f326d2dd1043 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.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
@@ -155,6 +155,7 @@ src_configure() {
 }
 
 src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
 	default
 	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild
index 3e298f6bd613..ac34dd412bb4 100644
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ b/sci-mathematics/octave/octave-4.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=6
@@ -160,6 +160,7 @@ src_configure() {
 }
 
 src_compile() {
+	export VARTEXFONTS="${T}/fonts" # otherwise it will write to /var/cache/fonts/ and trip sandbox
 	default
 	if use java; then
 		pax-mark m "${S}/src/.libs/octave-cli"
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index d81781d0d542..c66135ee815d 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,8 +1,4 @@
 AUX 50pspp-gentoo.el 171 BLAKE2B 32091c8c9db265cb3c37cae7a718128df3d187e01b6c0685ff929e7dbe1bf92b8759f0920264c786ad250e9c72724fba6ec0b22ee1c39802fc3aaf3b51720665 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883
-DIST pspp-0.10.1.tar.gz 7269109 BLAKE2B 5f488b1bbe9d4cf833d847cd035485827e7e518fb82f0e5df98418e919da54553475e91fd8529df8819ee71d853fb8bdd079e27a9b8587b40074701a7d71a8c2 SHA512 a7f4eec3858340743ff845e67028af76d79a58968ceaa19a87e0443751917b2d70251e53231ecce15c937c9640ac733e00603baa76b4266d693375ab70b870b5
-DIST pspp-0.10.2.tar.gz 7316470 BLAKE2B 9bbccfc8151d83613f5c4f49f285959c6b9e74bdc99edb95dc719561fb05c01e54b10fc5b3a58b9e5beeae199235d0d936a6ee08277fe7c710c3e40ca6c389f7 SHA512 7d6656c03da46b088e87cba7a947d1e56031ff50d704be8201a38563515cf5cf324a05f1d4999ba8aec7b2269a8fdbd09374a11374c9c1b9dd6d78d34fda4b76
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
-EBUILD pspp-0.10.1.ebuild 1661 BLAKE2B 62421db5cd1428a92bc6b5cb287fd83c1dd7f45bf89b8e802ea00feb951d77fcf466dc7136d2b9e24c40d247ab14de8476e9b1e9e8dad3a0b653198ebe6e6d27 SHA512 3d973985731036f3d9c4858cd5aa58cd1159c64a2f5f4f6f7ec48f00034c4340a9cbfe203a90228529d2a4677004b5da69c488a1a2683224e5450d3ed276dd29
-EBUILD pspp-0.10.2.ebuild 1663 BLAKE2B e3c38277b867d5a942021fc6341e4b99955ffbf11f9374e295580bdabca64330c6a3fe3da4c86ef80d678c7c3f066f6670e27d771d0810147832707043171357 SHA512 0279462e9e548d042a50f92adf568aaccc8286c90146cc904a1ee2b962b320f229cf24d96fd23fb86fb2898781e7548586815266f16c94a868106db654f90b35
 EBUILD pspp-1.2.0.ebuild 1690 BLAKE2B 0d1861cd7e5d7e5b28c4f485adba6f7ade2cec64f1ed2371f995924c3e7aefb1db1c1cb1633aaf7498960dcc93412d170ac60bd916cfdb9d0b28a2c752c0ceb8 SHA512 2cd9bd094ec054cca05cdffc7f524825d5ecc6c2c26da89fd363e3dd0e5a55db463bae374e0bcd6ac4e6ed072f1e808dcfc496163d7945fc14ecc4ee635039c8
 MISC metadata.xml 711 BLAKE2B a8a82a6226fd60e70e8f0c4af6fd1e84545e46d0743f3b13d29c54461bf62ca2b890c718482fee2aa26ca4eb86300b3a11b01e659584942b9bb57ea70ee42882 SHA512 51b64f0c307003cfea98971696f7b26f4770171768a4b90c44f6233696749fe4cce0bf09b0392ad079abff8235fb3680668534cb407df75e6626aab6167ffd34
diff --git a/sci-mathematics/pspp/pspp-0.10.1.ebuild b/sci-mathematics/pspp/pspp-0.10.1.ebuild
deleted file mode 100644
index f1d6cf513599..000000000000
--- a/sci-mathematics/pspp/pspp-0.10.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils elisp-common
-
-DESCRIPTION="Program for statistical analysis of sampled data"
-HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
-
-RDEPEND="
-	dev-libs/libxml2:2=
-	sci-libs/gsl:0=
-	sys-devel/gettext:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	virtual/libiconv
-	cairo? ( x11-libs/cairo:0=[svg] )
-	emacs? ( virtual/emacs )
-	gtk? (
-			x11-libs/gtk+:3=
-			x11-libs/gtksourceview:3.0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with cairo) \
-		$(use_with gtk gui) \
-		$(use_with ncurses libncurses) \
-		$(use_with perl perl-module) \
-		$(use_with postgres libpq)
-}
-
-src_compile() {
-	default
-	use doc && emake html pdf
-	use emacs && elisp-compile *.el
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc doc/pspp{,-dev}.pdf
-		insinto /usr/share/doc/${PF}/html
-		dodoc -r doc/pspp{,-dev}.html
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	prune_libtool_files --all
-}
-
-pkg_postinst () {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pspp/pspp-0.10.2.ebuild b/sci-mathematics/pspp/pspp-0.10.2.ebuild
deleted file mode 100644
index 4492cc326fbb..000000000000
--- a/sci-mathematics/pspp/pspp-0.10.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils elisp-common
-
-DESCRIPTION="Program for statistical analysis of sampled data"
-HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
-
-RDEPEND="
-	dev-libs/libxml2:2=
-	sci-libs/gsl:0=
-	sys-devel/gettext:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	virtual/libiconv
-	cairo? ( x11-libs/cairo:0=[svg] )
-	emacs? ( virtual/emacs )
-	gtk? (
-			x11-libs/gtk+:3=
-			x11-libs/gtksourceview:3.0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with cairo) \
-		$(use_with gtk gui) \
-		$(use_with ncurses libncurses) \
-		$(use_with perl perl-module) \
-		$(use_with postgres libpq)
-}
-
-src_compile() {
-	default
-	use doc && emake html pdf
-	use emacs && elisp-compile *.el
-}
-
-src_install() {
-	default
-	if use doc; then
-		dodoc doc/pspp{,-dev}.pdf
-		insinto /usr/share/doc/${PF}/html
-		dodoc -r doc/pspp{,-dev}.html
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	prune_libtool_files --all
-}
-
-pkg_postinst () {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 17fef48653b6..c14d0c966210 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 39f0faae622c..cdc629cf1483 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -7,5 +7,5 @@ DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8
 EBUILD cernlib-2006-r5.ebuild 2941 BLAKE2B 7f46ad84ae5459772974be17007071fd5049584943ecaf9a3d5ea73da7d424efebe3c85cd4482617d0bd78765af9d6f343b1b6d47c021a928ceac2050d8547c7 SHA512 5b5de782e64937d08d7b748d16efbfcd927f99fe05f127426e5bd52be3ce21f741f6ac42157efb6c95318acd38e217c714e39c2c736f8cd5335d3bf26d961557
 EBUILD cernlib-2006-r6.ebuild 2996 BLAKE2B 02602426dab1d77f98a8f70997d7357715f47eddc87c4a80c39dcf10684617db230a613396754dae7884eaed7805d914738a72aa12f29094bdf89a3d681c1c84 SHA512 d2721cd22118e0ab7bcbdd39cc94c2c5620f99775c089f3918e128ee23e0d34ae96238c0c1e0b80d2fe062c12434085993f7d84cd5f90bb4781ad130ff2e62a6
-EBUILD cernlib-2006-r7.ebuild 2996 BLAKE2B 250f40bd42379c1bb17530a4077c7cdc9e8c2293bdd9cf9221805a42180d9b0c102edcc8f8aa681b2bc6f9cba57d8d13cf4ce40683922818138e705ff10b359e SHA512 0da0b967504f8be9a184ea112a6bce4a8ea2bdeeff8f0397219dabc02908bb309707e75ac71893f7378678270831d8fa7690afb11765607dbc74d250966c28fa
+EBUILD cernlib-2006-r7.ebuild 3010 BLAKE2B 17f778cd95128e09252be544144aa732b9767f767f92096bdf6b3b76c81192fe330f999111e1569eceeeb5a400e58355701e701af1c995b12f5824bce3f24c9c SHA512 9dde5fc5814cf0ce917a0aab2a37c4d5a55b155cf98db3c29e285df87fb8527002541e98f3a5817a0614fa6be7cf7b2bf5d2665027ef9cf43e72a3f936b4093c
 MISC metadata.xml 759 BLAKE2B f01fad2a4cead94f4c422f4f2906bb26c9c960f4a85c07bb1cc900a058184fb2b0774251e93f3d92e105f9ff4675cf0c9035d4ffe0841c63d54e344bb0b0d149 SHA512 133dd51ec200866d1886a1c077dad4a1a7ec786d77b59e1da147a7e95a5b6e8c9f1ce41dfcfa35c406625ed4aa966891cc5247ef35d7a82791d9b42c91fc7477
diff --git a/sci-physics/cernlib/cernlib-2006-r7.ebuild b/sci-physics/cernlib/cernlib-2006-r7.ebuild
index ddc16413da29..216c3fda914a 100644
--- a/sci-physics/cernlib/cernlib-2006-r7.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r7.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
@@ -23,7 +23,8 @@ KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	x11-libs/motif:0
 	virtual/lapack
-	dev-lang/cfortran"
+	dev-lang/cfortran
+	net-libs/libnsl"
 DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c1f67c5c42ad..639be4d4508a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,6 +10,6 @@ DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 EBUILD root-6.12.06-r8.ebuild 7960 BLAKE2B 78811e6ccd29c98f1fba08a64c7bdd7f5497ff22da7fd264cceb2008fc6adaa39ef3be219843b22861b8dec1657c6496f34e2cd74d68edebdb67df714fc41060 SHA512 69c96c970a26957618db2759e15099892367f5411d3ab1db2f88743cf144445c4f8dabd51cfedc2a164fdacae86fcccbb507079a5d7ec375fa3647a3cbe014ce
 EBUILD root-6.14.06-r2.ebuild 8196 BLAKE2B b686e1e20afb4528e8df24040f86cf2260d9d2e0b9adfbe495fe6eb70248b6ce9bf8612d762c2ace2f198dbde4fcf2f7907f39510ebd91582f7892db7b1b04b0 SHA512 712ef6de41924d93bca6642f4b9bc1d0efa6bb7d82c204a7be516b2b9d27427cafe3f4e0e85f97fa5fa5b8941234abb7de0260878577e4528dce5b2025b723fb
-EBUILD root-6.14.08-r1.ebuild 8203 BLAKE2B b619185ed606ef71bef54b16b61c139eeb0dd30c5612ed2303e3298b2aaf65b853b0bcea484f86c9d35906de31936021aa04a07b27b8e269f8eb5698d47d5000 SHA512 279c54b6bae5f5d6f3463bf97fbb00a6f5208b23e29f81d3ba2fb3058d6bc4d775ae14805607876c806afa66cdfb8bf4519014f57b5ced34ebd77ca215ee3f76
+EBUILD root-6.14.08-r1.ebuild 8322 BLAKE2B f2007da7527df847d1dcbc0b313349f6d5832086367d8723d81d6fd42cf22109c125d3827967f7837af0bb3b6fe45ba889456ba2afe0303f5dcf9f3aebc5d7fa SHA512 5168e8c5ed63dcab7cd058c4d1c7ceed3bbf062aa15cece2f7ca89ba1c860cb78cbaffcea68e36e7c480452b995ee3b98a9b007f8dcb73cda56d6ce5b3d55f4e
 EBUILD root-9999.ebuild 8307 BLAKE2B 1932ca3501767e729fab5658681c75d75ea7b839fda2f43777f5ff76d9cfbdd589793378cda3119f5e1457d48ffe42d116d628ccc36148c270b67e56af407068 SHA512 b6ee00de46d9ced77e54182b750810bd7548de48ce8aa63f4a898b5df7604fe06685cfc7015b2a61556ae1c8284f93ccd5492559285ef232b14881ac9c461aa5
 MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a
diff --git a/sci-physics/root/root-6.14.08-r1.ebuild b/sci-physics/root/root-6.14.08-r1.ebuild
index 303a28a35928..591ae2768d3a 100644
--- a/sci-physics/root/root-6.14.08-r1.ebuild
+++ b/sci-physics/root/root-6.14.08-r1.ebuild
@@ -134,6 +134,8 @@ src_prepare() {
 
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	hprefixify core/clingutils/CMakeLists.txt
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
@@ -318,6 +320,9 @@ src_install() {
 		rm -r tmva || die
 	fi
 
+	# Environment variables are managed by env.d.
+	rm -f bin/*.{c,}sh || die
+
 	# clean up unnecessary files from installation
 	rm -r emacs test || die
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 605fd60555c6..88b28d78458f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index e9bd71c7cb1c..8627bf027f0e 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
-DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
+DIST debianutils_4.8.6.1.tar.xz 156604 BLAKE2B 100bc458609273eb94da46e267395fe4ea16e499805b0d5a29f6144b8b7d2198ccb47b2048cdb6d311014c7b0ac373283cf6034a773ddbd95121856eb0dcbf83 SHA512 158f024311b3de292bd20df966c0f61285c748597101cee61e81883e0032c1e6a4baccb5c231b28f00ce3afc58a4aaedd64a65641351974c37fdb5f4952b0d2a
 DIST debianutils_4.8.6.tar.xz 156532 BLAKE2B 2add390a0e38aa3d7103e09b3b65fa2b88c3965ca411c5789409454519791bccdb12d89b1bea4d07417f733d23d0662d4f510750ab404d7a4e8f20c2bd3d7ef4 SHA512 5913729cc3c56962e8939b71803258952df0d7204df8090a7504fbefc7f5d1da8e749d606fe23148ea3294909ef172bc1f4f821690169e861729caab70921a2f
 EBUILD debianutils-4.8.3.ebuild 935 BLAKE2B 19d3779d81f7e10dd3a034ff3e1f4a4c1b15210c923796afa0535a062d7006418e4ef69d5a46577a916605979c15124607bfc68569b7e1bfe137612c3b20098b SHA512 24cbab98f62055e1298a3dfa1f6de6e9f766e593713f496fae07b2351bac6f70aed1643c1c0bcf07747d034d35538c4ca324bd41efef2bc97dcafc6f795dd4ba
-EBUILD debianutils-4.8.4.ebuild 952 BLAKE2B 64f141755102fb12185391882622e3d03fd0d84ed57fff2b919afd8fbac284876dcd31b16e88410580af38dc690bb411e7a94d200d55c78e548768f847c0dd27 SHA512 ad554fb4e84eac5694dced450b2c127c2e634e8390292f94478c4c8b0cbc908fbe52244d9cbc7f6ea838ca3a2c0350ac0e0efedbdb412ac4dcdba112abfbe25f
+EBUILD debianutils-4.8.6.1.ebuild 947 BLAKE2B 337622acf877255daeafed7aba53933e16d5e11af4a4e7d9566604b555bfeeb877d8961b6851724972eb9792406d54bb5ef001355b190841eebdbe0ca68f3696 SHA512 0de413925a618491fa81612e43ad67eb9c8707fec09beb5348e8858b40b5e681b3b82f9f04d5421b38622484f57f3ab826c0983bb4d2f53bc1a18160ecddfb74
 EBUILD debianutils-4.8.6.ebuild 930 BLAKE2B bd761c4be9ae3d008d661935c3343c3272ee77ebebd9b614b17fe4142f1f090f5148b40ccce5da437a7daf1b23be4c9882467e8f98ef1c49c0599d57ce71a247 SHA512 61a2f7e81b6a0262744a131a9aeb74e1f6e520658743f076eb73d048d553492d9b144b1c73a0f36cec80554f3371f1cfc9ad396297f603eb47b0eafc67dda3a4
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
deleted file mode 100644
index 7e8e9b8ca458..000000000000
--- a/sys-apps/debianutils/debianutils-4.8.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+installkernel static"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-	if use installkernel ; then
-		dosbin installkernel
-	fi
-
-	into /usr
-	dosbin savelog
-
-	doman tempfile.1 run-parts.8 savelog.8
-	use installkernel && doman installkernel.8
-	cd debian || die
-	dodoc changelog control
-	keepdir /etc/kernel/postinst.d
-}
diff --git a/sys-apps/debianutils/debianutils-4.8.6.1.ebuild b/sys-apps/debianutils/debianutils-4.8.6.1.ebuild
new file mode 100644
index 000000000000..3d28df99ad7a
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.8.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+installkernel static"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+	if use installkernel ; then
+		dosbin installkernel
+	fi
+
+	into /usr
+	dosbin savelog
+
+	doman tempfile.1 run-parts.8 savelog.8
+	use installkernel && doman installkernel.8
+	cd debian || die
+	dodoc changelog control
+	keepdir /etc/kernel/postinst.d
+}
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 89dcf617a9c9..390aad1010dd 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2817 BLAKE2B a9ac31d7ac1418500e11d848e69dc01c8c3dcf29a2166f1b92f5d0f8acff38e864930f0b5a5da8b9f67a61919fabd4d949ae6634d47cee5cc2b2751370c9db14 SHA512 29effbac577cfc35102ed96ed52e1a43d4d02f0dbd94bd149131b4197afb5d48bede1484d290f6d2f78635b0017b66ffade729900997a3a3421bd9834e96f47a
 EBUILD groff-1.22.3.ebuild 2528 BLAKE2B 316bbf572fdf95b1be2eae306604f85706422966b052b7f2a1efecf24a453e94171936a941783c91f42c485e3292a8f4f793cb2fae09fe5f78311c1fe249c4c6 SHA512 2b269a1ca0f454b001bdbaa9939784d4863c84847900e38f7aa233570508731b0ad2cc2e8d7489eb9d8efcc318270ce191315b7753de08ab70dbce1d37179fd0
-EBUILD groff-1.22.4.ebuild 2760 BLAKE2B bdd135ec4436184df9593b102432de88748a3ad021a0f60649f2bdfbca9b569fd6084ac6bf04269799587b0bc887ac572089fdd403df8d6756eb61fcd56ecc23 SHA512 1d86f9e4804fa0a50deed2794384ba7544a043dae43310c8623064021e941c24ef88c762e73af7ce3f51855e72e2d00f96bf9d84e1f0c89f0b50b7bd040687bc
+EBUILD groff-1.22.4.ebuild 2586 BLAKE2B 8e3216a801e250cd03098fd1dbe211b6d4a5132f98b4c55c6ecba01a10a221feb68fc5ad07348178147c1fb00f85920584d885ca5c8fa13c4c3e3d384dd46f71 SHA512 04baa99b5fa305145f162fe834f7c3c0ca7d33c08ec61eaeef7fd5b78a4644b95259f581882cf40bd7fd2a34486d350f914fcd85476135e4ad7165d128f42882
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 8ec07c8c1ad7..3fa2e5096624 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -47,18 +47,6 @@ src_prepare() {
 		Makefile.in \
 		|| die "failed to modify Makefile.in"
 
-	# Make sure we can cross-compile this puppy
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
-			-e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
-			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
-			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
-			contrib/*/Makefile.sub \
-			doc/Makefile.in \
-			doc/Makefile.sub || die "cross-compile sed failed"
-	fi
-
 	local pfx=$(usex prefix ' Prefix' '')
 	cat <<-EOF >> tmac/mdoc.local
 	.ds volume-operating-system Gentoo${pfx}
@@ -80,7 +68,18 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)"
+	if tc-is-cross-compiler ; then
+		local CROSS_ARGS=(
+			GROFFBIN="$(type -P groff)"
+			TROFFBIN="$(type -P troff)"
+			GROFF_BIN_DIR=
+			GROFF_BIN_PATH=
+		)
+	else
+		unset CROSS_ARGS
+	fi
+
+	emake AR="$(tc-getAR)" "${CROSS_ARGS[@]}"
 }
 
 src_install() {
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 486b2bf1e256..93d1ac6e9dbc 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -8,7 +8,7 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
-DIST lsd-0.11.1.tar.gz 29838 BLAKE2B bfbbc82847f68218c37ce45eb92d59ca41fb62bc02161415deb981666ce7e2f14e615ad91a89f7d7a22dff9c3c3e744614893c54c5e9276dd3571cfd87c04c8b SHA512 751098ff9296559b75d2c849194418c368c722a22021015d5adbb6c0a4b56dabff4a7597b821cb57ca928ffb635015f08e20e052f8926016f48788a6dbf20fd2
+DIST lsd-0.12.0.tar.gz 32067 BLAKE2B 57683d0555774950e18a1119abf1053a8c934d23a9945cea820c39319329ad09bf464c30084a4a6530ac5df6cb9c1f067e86383052869ff7225c57686120b6eb SHA512 b5bac177f3116ace5fed07fbcbf277b4657dfe15e7e66799844f3c0fc049673f9d99c0e9c27768704b0c35cd8bced2c1915b8d1bcbbef7c1052dd072e4965ea3
 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
@@ -32,5 +32,5 @@ DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6
 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.11.1-r1.ebuild 1144 BLAKE2B 42122bdbfb44f03b9b375f6ca9e528211bf291dc14c2ba72b346a0fd53a10388082e3f0587625a3d4c2022fb978ef5209bae7e83dc8cb62bc09a3106698a32e4 SHA512 b93745a3bd245aa12f8bf2126385a9183f1c5bb16d817a74f155a7208bb7e6adcd37d069707ae28397b372e1aa92889c51b3032ed4e9afe7cb98a33ebab3168f
+EBUILD lsd-0.12.0.ebuild 1153 BLAKE2B 1d8b12141e7e742cef70d0e3205db4b02f163d714530857af2d0e24655d21e1c5c51f31c60dcd4c8ed4aa2ffe3349f29a252bae03a0b9c32d65ed3cb54401de2 SHA512 bb802fb4944000d3735f4d14c8b54e7e3fae789f8f082303454439049bd921a7c0f77403dfffeb897245e717f8c5a556118762872ee1b7adedd971ecc14b58cf
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.11.1-r1.ebuild b/sys-apps/lsd/lsd-0.11.1-r1.ebuild
deleted file mode 100644
index ae0713c96a74..000000000000
--- a/sys-apps/lsd/lsd-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-kernel32-sys-0.2.2
-libc-0.2.44
-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.8.1
-vec_map-0.8.1
-version_check-0.1.5
-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="test"
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=">=virtual/rust-1.30.1"
-
-QA_FLAGS_IGNORED="/usr/bin/lsd"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/sys-apps/lsd/lsd-0.12.0.ebuild b/sys-apps/lsd/lsd-0.12.0.ebuild
new file mode 100644
index 000000000000..672d6292a66d
--- /dev/null
+++ b/sys-apps/lsd/lsd-0.12.0.ebuild
@@ -0,0 +1,63 @@
+# 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
+kernel32-sys-0.2.2
+libc-0.2.44
+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.8.1
+vec_map-0.8.1
+version_check-0.1.5
+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="test"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=">=virtual/rust-1.30.1"
+
+QA_FLAGS_IGNORED="/usr/bin/lsd"
+
+src_install() {
+	cargo_src_install --path .
+	einstalldocs
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9c4df1c7e829..eb3c836f5853 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,15 +5,15 @@ DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b05
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
 DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
-DIST portage-2.3.57.tar.bz2 1019074 BLAKE2B c7ced224a8ab5720b101ba791709668216f6fb164814236ce5cef3c5af489889b71bfc5396521411b377f798c2529f7178a84ab322efe3df44066e0ccc30eb20 SHA512 14e67dfe4a339f0374a7e31be840f94476eaeab2572dc0b4d1b07bc50cee4681e99f8a4c873b358feed584d056d7eb29832b6ed22b4c7d72066f83d3a4b23123
 DIST portage-2.3.58.tar.bz2 1018510 BLAKE2B d1fe49bdb7b7c24cd94c315596ba81127b9b17bcb3a56d101af37873ba1e788a5648f62cdd3a79e536221c5df36417885130ac8734805f691a52199118c1429f SHA512 2720ed0c5119cf24cb80501820ebd387ae7a5c17baa87188d38003580cf752f03990475caf4ee5a4d1e78bcf420c67e113a45d5cfce85af377197e833020d484
+DIST portage-2.3.59.tar.bz2 1019295 BLAKE2B 705e51343be5a522cfb9d4cc7935042cd1e5b697b2d78aa283bcc6cbdd3163fa54a572824355221915141b14c2f847c3810e5d4088e8784f23a0111d2bcf321a SHA512 abd188a6b6e4a2c19379e15278cfea31f45eaeb327307e6011877b1babf8460066d6f2b3879d77b5d4aee5120387beaa0318ec2764d2039cd10a3aeb26973658
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
 EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
 EBUILD portage-2.3.51-r1.ebuild 8934 BLAKE2B 4929d861ef8569848abb8eb79f3326cb23d8ff66eef7895fc1e0cbeb69f0310f97b0b3094610f1d97919c09ecca077273671b5879b3bbbce807ccc7b52b643d4 SHA512 cb55dbc52d5b7af35083e60c83a7085458686ff03f03d8d1f5d03e42c4437bf8c14de026cd11ede70389d0c039320c08fcf901175b40413e09c01a0cd46c43f9
-EBUILD portage-2.3.57.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
 EBUILD portage-2.3.58.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
+EBUILD portage-2.3.59-r1.ebuild 8929 BLAKE2B 2b9eeb790a2b41514d80ff8f9a6d508e31eedab202718d70ab8b2200fa8690127efb7698c1bb1ec8d4130f7211a5da4e88c37c079fb0e3451d13fa3eac8624f5 SHA512 aef477c7c1cb3b66435058ea12a5b8f67de7fd99f791c411931d7e0ae30b14aeb271b07e898502f96fee23b97e647073d17056a5bb0be479c7200ad8343c7b05
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8686 BLAKE2B 828f8099e038313c4bbf4a17361f1ef42d71c288f8973f59ae18adad176473ff32e869749d48793a5e6e0ae7e139b8560ad06b508718a73d68081520e57ee3ca SHA512 17a3682b8e897219bb29b6ecbc39d2ce53bf7c949ad0ae6faf36f948730bbc25818f59e23622802f09b078f61bb85814dd3ec1c588fef99bd87d057bab129fc9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.57.ebuild b/sys-apps/portage/portage-2.3.57.ebuild
deleted file mode 100644
index 4bf3a6b2dedf..000000000000
--- a/sys-apps/portage/portage-2.3.57.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_4 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 ~mips ~ppc ~ppc64 ~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_4,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.59-r1.ebuild b/sys-apps/portage/portage-2.3.59-r1.ebuild
new file mode 100644
index 000000000000..20086e941716
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.59-r1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 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 ~mips ~ppc ~ppc64 ~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_4,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
+
+	# apply d66f4238e6b5 for bug 675868
+	sed -e 's:OSError:EnvironmentError:' -i bin/pid-ns-init || die
+
+	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/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 32ecd4387c49..743650c2a3fb 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -84,5 +84,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 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 ripgrep-0.10.0-r1.ebuild 2686 BLAKE2B 7cff043b4373e613590c097862603c36144a70de30aa96d79eb98c2917cd3da875b999461bf03b4ba403a43fa8e19d2406ec6c99ada2e364d0eedff3b4c69e09 SHA512 b5d2f7284248626d2eab0f9124db37d20127ad7b045fa9fd20b8ac7606e88bae136e3cd8fff3e5470261dbc909f3cf6309d94ed1bf33f2d92519a32910ce3da3
+EBUILD ripgrep-0.10.0-r1.ebuild 2693 BLAKE2B 35de4a501ed477c27adb81be751555d36ea78840ffb14a29133fa92c2b62537274f3b1f8f1daac5356058c55079d2af866532876bca758c507b62ee9b76ddc75 SHA512 42b3574911dad3fff0b5952f0e92d99849adc7542feb426360f50affe34e314b85d49da5e98c0ec24c5acf45203af2902c71322043574182563dd29e6f0e5284
 MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
index f7eda9ddd13b..481bbb1ae86f 100644
--- a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
@@ -100,7 +100,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+man pcre"
 
 RDEPEND="pcre? ( dev-libs/libpcre2 )"
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 86e31c8b5610..bdc26c4470cb 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,3 +1,3 @@
 DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
-EBUILD s390-tools-2.4.0-r1.ebuild 1234 BLAKE2B b62d37902e487a35ea6298d65246887e5106bc237fa806db58590e85a549f4c6c62d1ff6ba9c80bc24617af631e2247ea88571418f50dc74c683325e9e543ac8 SHA512 11cc46fe301b2931ecb034839ba2802e7748c14e680b19c09ad300d810a60ab94a4fc577d45d3aee372f8e42a99a817fa34d95d6421b5e638620df9502780434
+EBUILD s390-tools-2.4.0-r1.ebuild 1233 BLAKE2B 82331257afb498cf718b48fa069892f682e1c20723dc025ace9a355a34b4ca5fb236707f50a8c25ccf961fca7773fe7898f462b01b7f9d1fcabf05a6d158effb SHA512 c6b25efb678dec39deac897caef68e413477c0f36a56c17787ac3034e56a3546ffc670283a31a0e71314cfefe553399be991be3c2ce8de5348c376ac8b39873b
 MISC metadata.xml 726 BLAKE2B 3d8b378dc8713cacadd8c7a16657bf7b49056284f1cea9a71151492fa8fdbb34ab00673b71c142057b19c520477ff17ea17417941d8939427f71bbb4f003c091 SHA512 9fe97ad8e4d179da9351268abad46e38f0c7d19dd93f35b8b86669c7a636b186b575b8cab72634492f176d174292892be8b3ac29f7a279c401e3f4350e43e385
diff --git a/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
index e970ee55b2d7..48255ba2fb09 100644
--- a/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse:0= )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 7b221bd98fcf..4fc77341c229 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,9 +11,13 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01
 DIST systemd-240-patches-2.tar.gz 28099 BLAKE2B 2e497ed729e2482ef3cc0d010504314f2982a9af19341d6f4efa06b24b3c01f9f69996d43e5b484c641777d00a8a0ba4508bcf6a0296a63d4fc57440f2d3708c SHA512 1be0432d918a4866056ffc65de6e8b412784e5018490c0349a98bba801536d2689c5b2ce41ddd5adbb945aac71bfd0168f94c1daf0788661cd83b159a8c975b8
 DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
-EBUILD systemd-239-r2.ebuild 13285 BLAKE2B 441348e52b56c2124c16377fbe11b639c80b4469e87a0b59d9ef02ee19594eb3652d7868e27a1ab94e76c0f5a66305642bc4e579eb1777ebfa731f6049400280 SHA512 1bd64fd100439fdf1e7beb5dfb55c24aa03cffa7cacf453f65e0f8c450ec5c911e7cc8115d82b6d0df48f7b8cff570563c261f097fde559d703fc24c09fbe9a4
-EBUILD systemd-239-r3.ebuild 13286 BLAKE2B 7fa40d2892be087ea72b5d4bcabfc8bdba0dd161a131d9308aad7ffa617bc80169be7c0fa4ee99a38d82451750dcd25dff4a7e505bc418e99c351d9d847a9b27 SHA512 e945d4cefb276ef50e0c702714a413fe8e98fa3885b76d5e63122b5c8406cb409b6c01dcd64e44b60f85930431b7b7a1fce77f0f7363e73f1c2cfe824040c0f7
-EBUILD systemd-240-r3.ebuild 13371 BLAKE2B 1a331b96eb22fc07804cfabb39f47c5ec359ddc512f4c178338e3db8782f1ff808875a5790e04ee6f543a4bbe8db3ab64464535a2367ce8167be3e95e0fc5a14 SHA512 115410f96590b90726fdb52dcaac7b5200300c81bcce486e73b01a2b0d0d73885d6928196d39eb3f06d60049508ee9a6ec727b36daba39d9f9c04de0504806a4
-EBUILD systemd-240-r4.ebuild 13371 BLAKE2B c433b7465783932aa13b534eb89621bd4f6a1c010fd35b80f2bb24312ee13e2436d5660b2c24d792d5c165b22084a1e9ce639d84badcfdc3ae601c4e376edaf4 SHA512 2ef8cb4779a0034e497cb0cc9fe5d4be36bdb3d44ea7653d3520ad79f4f70483cbed29eea810d69b122b972848b28eca84e13834d755888927b40f588a9d7c90
-EBUILD systemd-9999.ebuild 13310 BLAKE2B c295b6142d4174d8869fa2f0297beceb266fe0a1185f81455e57ed13dc88c49725c06a534f28e83f2e796c40083bd65d42fd7545e952d168da26aa817f3b89c2 SHA512 56d61973e251ef23e83cf769f2716f0511d9627624267a91ab702af1e1610759f1f7aa286ed86f41b328a15857ac99b764739a65e6d4afe807fe580c09d7cf7c
+DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
+DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41
+EBUILD systemd-239-r2.ebuild 13285 BLAKE2B 7e7f55aea8c3d5670867a775c4941f1ed07fbdf26e6be8d11124a43bc6bd1352a4773578f93e797907c2b37c81564c2876f1e7d7d4ffa998f481c57bdbd825be SHA512 de7011bc15bcdd0080204a003fde07e62c093b7bdf2ce49df6e2359fb513a1d996efacba53bb1152b077a5513d494eb7a19ab2cc637c1e2470f08525b67cb0f2
+EBUILD systemd-239-r3.ebuild 13285 BLAKE2B 831b7d2cd265398238077505749e0b8b474403275862409cb9fe27e7c3c8e05be48b855a96c8de6f5816b0691dbd94e99287bc04d65120f57479a38df2f07721 SHA512 3743f5b6d52b9306bb581c35d10f18e2c1cdcd2af95f465712d17f35af29aaea1715ad668c49317e83db78e4346ad5651f885e5a2156f728276ec13fb08a1345
+EBUILD systemd-240-r3.ebuild 13371 BLAKE2B bc86925f04294fee6c9c53ac2e793338b34d8dd1b51c1bca1daa222440b35670a98d062a4059568ef43a010acb2746a467b54abccd465fb9e910453c590b800e SHA512 91d64b30469a5c54355c887c3f7ee12906f7f297ecfd0804116f753db6d8d4f8d7249ee589185b6cba3708ecc27a91c616f48811f32662b25930727e367f5ba6
+EBUILD systemd-240-r4.ebuild 13371 BLAKE2B 5f6cb24820ba54d2ea130c890eedfa67d326565d6972fffa5a0c395d6de37c2d338879ad9b33153a4810ddf115d837104519b93e46f9c5e9c2c15d256dd7522d SHA512 9511413346e3e6d36ca141253315b5071635834b55d0892901657cf319afa62dd4169dddf861ebff0564156e812b3ef5e53d61d07ac54aa0c76afff7bcba219b
+EBUILD systemd-241_rc1.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0
+EBUILD systemd-241_rc2.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0
+EBUILD systemd-9999.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/systemd-239-r2.ebuild b/sys-apps/systemd/systemd-239-r2.ebuild
index 6a8e5b4b5cda..c88520b0406e 100644
--- a/sys-apps/systemd/systemd-239-r2.ebuild
+++ b/sys-apps/systemd/systemd-239-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2011-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-apps/systemd/systemd-239-r3.ebuild b/sys-apps/systemd/systemd-239-r3.ebuild
index bdc9ec40570f..4c6312766b3e 100644
--- a/sys-apps/systemd/systemd-239-r3.ebuild
+++ b/sys-apps/systemd/systemd-239-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.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
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-240-r3.ebuild b/sys-apps/systemd/systemd-240-r3.ebuild
index 2dda532141b7..97922c3f4ed6 100644
--- a/sys-apps/systemd/systemd-240-r3.ebuild
+++ b/sys-apps/systemd/systemd-240-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/systemd/systemd-240-r4.ebuild b/sys-apps/systemd/systemd-240-r4.ebuild
index 2fe824b0e42a..26988cc328f2 100644
--- a/sys-apps/systemd/systemd-240-r4.ebuild
+++ b/sys-apps/systemd/systemd-240-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/systemd/systemd-241_rc1.ebuild b/sys-apps/systemd/systemd-241_rc1.ebuild
new file mode 100644
index 000000000000..852df051610d
--- /dev/null
+++ b/sys-apps/systemd/systemd-241_rc1.ebuild
@@ -0,0 +1,459 @@
+# 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +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= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	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
+	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
+		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+=(
+	)
+
+	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)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-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)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-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
+
+	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
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
+
+	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
+}
+
+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 [[ -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/systemd/systemd-241_rc2.ebuild b/sys-apps/systemd/systemd-241_rc2.ebuild
new file mode 100644
index 000000000000..852df051610d
--- /dev/null
+++ b/sys-apps/systemd/systemd-241_rc2.ebuild
@@ -0,0 +1,459 @@
+# 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +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= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	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
+	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
+		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+=(
+	)
+
+	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)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-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)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-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
+
+	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
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
+
+	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
+}
+
+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 [[ -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/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index df6e7a98ecda..852df051610d 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
+	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
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 2be3aa1a1cee..46a4eab642f2 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,20 +1,11 @@
 AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9
-AUX inittab-2.88 1928 BLAKE2B abf5b94c6021f8d46543e9028e89359e4c6aff2ebed7f6dd20b3529a73a7885d0c1acf9417bda1e5ca7fcd191a3020419631b15c6da3992567bddd61949bcf0b SHA512 71476e1e07e288796887c7cfdf359523403816adb939c5c364b4fafef3dabd3e7eefb354bc09343606af4804a10247b5f345b404a5490fcdae8937287a84a990
 AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
 AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575
-AUX sysvinit-2.88-makefile.patch 1546 BLAKE2B 4634bc8e62bf8a38778f0fd186a0a380159ae52cdfc089af9b9bacdf4a9db5d5d5f8093c68d2340852f2f080193eeec5f878e4aac3f019a5740850691ee36a87 SHA512 8cc6d2b3fe43d9040aa9f54b2ac448c3dbe986de629638052ddc294b2589ed283b51cc25d9b73e8dac5c5183a5c0675799fa425cf44523636c3ad1a943f1e4a5
-AUX sysvinit-2.88-selinux.patch 1041 BLAKE2B e5c6f981cbc73dc78ffc6593faf1c96c7629e4977e504637648236fc4810d04c64274ff00f5533ab88a82cded686308ffc73d5ff406d7c9c401a5b29a2863c3b SHA512 46eeb3ab2dd25f314b9f60b2dc8a7da2aa2aafb978953a730ccc36456d240e317930e86df69ce2592cf45978f3307dfc2522b24ae1158e64ff17dfa6ed84dcb8
 AUX sysvinit-2.88-shutdown-h.patch 1626 BLAKE2B ba9aba1854f040c31862c5a1a0c9d1ea3186ced2415f9e0fe457a34fa4eec9d56d024467d7524133da858dc313b079ae5d3b1c926b8247804414fb4f23cbffcf SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe
-AUX sysvinit-2.88-sysmacros.patch 224 BLAKE2B c25c63e72ac15b4e5a518acd55ed792227596ca399c6704a05bd4e5137b74f256dc4146500021ef0613284d4565a8d75f6da183bfad5d3d739e4b12395e61a65 SHA512 217fc75d34a19caebcdc56967f7cc9664d46d1523fc09b17369d10d61389dd7b93b8863ec292427603ed55aa68e86d5a81839f1da480b7654d78a4b01d83df43
-AUX sysvinit-2.88-ttydefaults.patch 266 BLAKE2B 037f77b059dbd593b9f8eb683a0be57c73c62ba421895386932b5c072457e30ee145977c6eb145ebfb0097ebeb483c002bf346e751629398c5e5cb48504bf2ff SHA512 d27c0f0ae4d2c6ddb9622c76571c0a4260b2c537ec7fcbc3c56b4e461f43238e5c9f8072f2db582bf5e625320e963e840aac247c83ec2438c3454d7cdc1b3198
 AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9f6d828b5477d7b80668b279b29d036a292584965191bc204054fa71b1d53b3e9d83475ba8a1c09b92152fd9fcb29c40c0d1c6 SHA512 52d172aab471a0e2e8057292bfc401eade032da8c5058e22f35015e58635b8fe45ee8425c2a6cd7466942acd168f28c53c8c34f3b781a5c8c6c8b5714096439e
-DIST sysvinit-2.88dsf.tar.bz2 105551 BLAKE2B 2378a7ab96d059fc781b8b7dd130f4c6311a83527e80e6d40b0970140f0f6c0b081eec502b0c9e461fe5ac02cc064437c2bef2237b20209c8c5f8535a45e50d1 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf
 DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5
-DIST sysvinit-2.92.tar.xz 117560 BLAKE2B 300c9b7dffb5a07ece9b12682bf49816143215953527b69fe80c4f7f9b487de6c812213c9a851c5636de3989889b3179ace9a17b35c985729655a7c877b67170 SHA512 1395943540bc52d999de64c426c7f807d7688166591a8104e6c8cec2f45f13e0e3dd3d182b91194402c38172f412424a6c7d8c09662b3b5169ba6f928b5592a9
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
-EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5
-EBUILD sysvinit-2.91-r1.ebuild 3342 BLAKE2B 3ee7748062e79ed15102859c4c72beb8f839569d0f2c6afd6b25421df2972721546cd609e9315072d46113ec208922b3a460d9c5c2271f69e534f9837b111ece SHA512 a4b031a288292461adb5f066cd0ca4b4b9d860b427c8459df33f6512604bdc8a04090eff0bb6358869678c39754eb77874d16731e9893493a7619ea277c5a4d0
-EBUILD sysvinit-2.92.ebuild 3464 BLAKE2B 6fd231bcbcf3fa9be8337e68af8ae5da6f8993ad3122a5cd07646ee3dc1eb55281025be67384db811f9fe20406539be7e77140464c8d67d9fc4aaf989b4d4d44 SHA512 22d3979f202a9b4e0d3a30242da0c12ffdfa53d6803d1cac880b86797a80c2f28066f0f483bac16dbf21f5bbad32468ef8dd503ea9d96ec66992ac42c8af0fe3
+EBUILD sysvinit-2.91-r1.ebuild 3340 BLAKE2B df7dab50132c8fef9c2bca3c09c4cc4dc1d2bece75ebf85858690f9030ba749a44da731a887dc9b0e4f84b23e40327da5065933faed68bd3fe3278c32fb6907f SHA512 e5ad8dc291b1497283ce0d0f6b572e0111a8a3c0ec9bf0f0d4d5e639fa5b9759a8dc680c75a8f841c4f71c45c6208e997ba8bbb434e910305312a0640bbeb16d
 EBUILD sysvinit-2.93.ebuild 3588 BLAKE2B 84f3bfbc114740022d746d30a2ec142a1cfe79174ad34088fce5dff6d0e6f9384cb3f601976d5e7aa2e8ef271f181ff8f263cbb3e28055aadc469ae4f2d0e315 SHA512 6cb6b476d57b291070dd337fc26fd142d3a7623b7ce96911cdbca141a898fc8de7f490182aff9a1a6acdb7904f5806b1b11ec09c10d18bafce82aca0c7c5f4ea
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/files/inittab-2.88 b/sys-apps/sysvinit/files/inittab-2.88
deleted file mode 100644
index baab75b31acc..000000000000
--- a/sys-apps/sysvinit/files/inittab-2.88
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by:  William Hubbs, <williamh@gentoo.org>
-#
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/openrc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/openrc boot
-
-l0:0:wait:/sbin/openrc shutdown 
-l0s:0:wait:/sbin/halt -dhnp
-l1:1:wait:/sbin/openrc single
-l2:2:wait:/sbin/openrc nonetwork
-l3:3:wait:/sbin/openrc default
-l4:4:wait:/sbin/openrc default
-l5:5:wait:/sbin/openrc default
-l6:6:wait:/sbin/openrc reboot
-l6r:6:wait:/sbin/reboot -dkn
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/openrc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-#x1:12345:respawn:/sbin/agetty 38400 console linux
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
deleted file mode 100644
index 73c0160803a8..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://savannah.nongnu.org/bugs/index.php?29758
-
-From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001
-From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2>
-Date: Tue, 4 May 2010 07:50:12 +0000
-Subject: [PATCH] Fix sysvinit bug #29758
-
-git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2
-
-diff --git a/src/Makefile b/src/Makefile
-index e2b8028..19675c5 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -92,9 +92,9 @@ all:		$(BIN) $(SBIN) $(USRBIN)
- init:		LDLIBS += $(INITLIBS) $(STATIC)
- init:		init.o init_utmp.o
- 
--halt:		halt.o ifdown.o hddown.o utmp.o reboot.h
-+halt:		halt.o ifdown.o hddown.o utmp.o
- 
--last:		last.o oldutmp.h
-+last:		last.o
- 
- mesg:		mesg.o
- 
-@@ -109,7 +109,7 @@ sulogin:	sulogin.o
- 
- wall:		dowall.o wall.o
- 
--shutdown:	dowall.o shutdown.o utmp.o reboot.h
-+shutdown:	dowall.o shutdown.o utmp.o
- 
- bootlogd:	LDLIBS += -lutil
- bootlogd:	bootlogd.o
-@@ -118,14 +118,22 @@ sulogin.o:	CPPFLAGS += $(SELINUX_DEF)
- sulogin.o:	sulogin.c 
- 
- init.o:		CPPFLAGS += $(SELINUX_DEF)
--init.o:		init.c init.h set.h reboot.h initreq.h
-+init.o:		init.c init.h initreq.h paths.h reboot.h set.h
- 
--utmp.o:		utmp.c init.h
-+utmp.o:		
- 
- init_utmp.o:	CPPFLAGS += -DINIT_MAIN
--init_utmp.o:	utmp.c init.h
-+init_utmp.o:	utmp.c init.h initreq.h paths.h
- 		$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
- 
-+utmpdump.o:	utmpdump.c oldutmp.h
-+
-+shutdown.o:	shutdown.c paths.h reboot.h initreq.h init.h
-+
-+halt.o:		halt.c reboot.h
-+
-+last.o:		last.c oldutmp.h
-+
- cleanobjs:
- 		rm -f *.o *.bak
- 
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
deleted file mode 100644
index 91b7435b25ac..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90
-https://bugs.gentoo.org/326697
-
---- sysvinit/trunk/src/init.c	2010/05/07 15:16:26	89
-+++ sysvinit/trunk/src/init.c	2010/05/17 09:44:34	90
-@@ -54,10 +54,6 @@
- 
- #ifdef WITH_SELINUX
- #  include <selinux/selinux.h>
--#  include <sys/mount.h>
--#  ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */
--#    define MNT_DETACH 2
--#  endif
- #endif
- 
- #ifdef __i386__
-@@ -2872,11 +2868,9 @@
- 
- #ifdef WITH_SELINUX
- 	if (getenv("SELINUX_INIT") == NULL) {
--	  const int rc = mount("proc", "/proc", "proc", 0, 0);
--	  if (is_selinux_enabled() > 0) {
--	    putenv("SELINUX_INIT=YES");
--	    if (rc == 0) umount2("/proc", MNT_DETACH);
-+         if (is_selinux_enabled() != 1) {
- 	    if (selinux_init_load_policy(&enforce) == 0) {
-+             putenv("SELINUX_INIT=YES");
- 	      execv(myname, argv);
- 	    } else {
- 	      if (enforce > 0) {
-@@ -2887,7 +2881,6 @@
- 	      }
- 	    }
- 	  }
--	  if (rc == 0) umount2("/proc", MNT_DETACH);
- 	}
- #endif  
- 	/* Start booting. */
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch b/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
deleted file mode 100644
index efbe47a30be2..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Newer C libraries omit this include from sys/types.h.
-
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -32,6 +32,7 @@
-  *
-  */
- 
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch b/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch
deleted file mode 100644
index 5db809067e13..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-ttydefaults.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sysvinit/trunk/src/init.c	2014/01/26 16:40:03	134
-+++ sysvinit/trunk/src/init.c	2014/01/26 22:00:42	135
-@@ -49,6 +49,7 @@
- #include <utmp.h>
- #include <ctype.h>
- #include <stdarg.h>
-+#include <sys/ttydefaults.h>
- #include <sys/syslog.h>
- #include <sys/time.h>
- 
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
deleted file mode 100644
index 06533bd44b12..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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}dsf
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
-	"${FILESDIR}/${P}-makefile.patch" #319197
-	"${FILESDIR}/${P}-selinux.patch" #326697
-	"${FILESDIR}/${P}-shutdown-h.patch" #449354
-	"${FILESDIR}/${PN}-2.88-sysmacros.patch"
-	"${FILESDIR}/${PN}-2.88-ttydefaults.patch" #551626
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	sed -i '/^CPPFLAGS =$/d' 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
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}"
-	cp "${FILESDIR}"/inittab-2.88 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() {
-	local myconf
-
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	use static && append-ldflags -static
-	use selinux && myconf=WITH_SELINUX=yes
-	emake -C src ${myconf} || die
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	# dead symlink
-	rm "${D}"/usr/bin/lastb || die
-}
-
-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
-		# 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."
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
index 0c70180b3840..18216a730727 100644
--- a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-2.92.ebuild b/sys-apps/sysvinit/sysvinit-2.92.ebuild
deleted file mode 100644
index b6ea9ba1c916..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.92.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 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 ~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.86-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-	sed -i '/^CPPFLAGS =$/d' 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
-
-	# 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."
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index becb996fda05..a5163d4f78e1 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -7,7 +7,7 @@ DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
-EBUILD util-linux-2.33-r1.ebuild 8368 BLAKE2B f07012c410db4b22894c0ff0c52f22ecfe87502e99c958afed389fce6558c1f2c5e04de0441afd1a6ee9cd0af2d64c03db8072bebc4f395ae17e5e686b283704 SHA512 7b171ac1750f67d666da7ec2de3708e9a1e3402d505a5be3797260feb9bd48888b23ffd64700efe4832814ba87bef5667a89045f98459d6551d5b9287c1c8f56
+EBUILD util-linux-2.33-r1.ebuild 8366 BLAKE2B fa003e6f9a79aa07cff4e5bff4bcfe31aa65c31b3f53a480792dd7f9bc2b923f0c1d508775115ebbbac36b81764e20b6595755ccebf03d539caa244ee95a083e SHA512 b2bb10ef0d1df01a3c24659d5fbb490b1aa2da0ffed9c5dd6d61b241ba2ed17a281d75a9bdc8c19520488fb09e1741a3f3910810ebe116b16ee69c6f3274378b
 EBUILD util-linux-2.33.1.ebuild 8240 BLAKE2B 5809b713cac06b5b13c9269851327dfef2122789f26059e2ee6980c7cfb9153a2647107264d804a7959fc0b5b10bdab5711e97027a821bf2c7939103d734ac4b SHA512 d17d2959f137216ee08b55e8aab293b4c97be8cd228732b0fb8b70ed0fe9fe11b72594e5f5c9232a22889c950cabe36a562605921426ac96905c9918fe67bfa5
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
index c7a962801b2f..b3caca4dc336 100644
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 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
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 2c81366dd145..2e5b33563251 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 922fdca23888..bb8978e76f72 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -6,5 +6,5 @@ DIST elogind-239.2.tar.gz 1171060 BLAKE2B 4b7b0e4867ce79aeaf480cf56c473254a3ae53
 DIST elogind-239.3.tar.gz 1171080 BLAKE2B 95d158a861641415f2c6ea3648bafd32ee3da80b0258e33fb7b88cf834f42c4d76b634af055f81dfba7c6477423edf73ad7c0d79e5e3608938e90a713bdff00e SHA512 61399f82d6a93d77e0984dc67b9c7ebdda27ba2254810be9725a09f91fde41c66adb53a5fe7989f53d6b156b70f147471c89fa64a432bccc482e8057a0cddf84
 EBUILD elogind-238.2.ebuild 3470 BLAKE2B 85e9183f674fc4d40f4c617b7387a07eb10ebfc191cc79d407b168d0d454867558b4950a9fe085291ae09328b4fb0dd76c482b504f24e18318326dd88c1c109f SHA512 264f2fd1f695a183f20e300a781cb740617812a0d907c06a4d1c8b6276504450379e7cc0ed8762d1caf615c0cbdd0ef10ae900e9b4900cbafe7abba15d1b234d
 EBUILD elogind-239.2.ebuild 3428 BLAKE2B 445b22ec9c8c3a2cc4a6b4b0ce60f44f86b3ba2b984e314fe5cd55e00151310a217318d4f7b1ff41f9c06be7527c0c323b18c6b86edf09ca3d10322f9542c009 SHA512 fef3919552f9bea4e3b87f8c2cac9495424f35c07e64d822f46938bf0df492dc6448053424c59764e32d4598a744926a761bb3cb288ed39654958c390a9fbf3f
-EBUILD elogind-239.3.ebuild 3428 BLAKE2B 445b22ec9c8c3a2cc4a6b4b0ce60f44f86b3ba2b984e314fe5cd55e00151310a217318d4f7b1ff41f9c06be7527c0c323b18c6b86edf09ca3d10322f9542c009 SHA512 fef3919552f9bea4e3b87f8c2cac9495424f35c07e64d822f46938bf0df492dc6448053424c59764e32d4598a744926a761bb3cb288ed39654958c390a9fbf3f
+EBUILD elogind-239.3.ebuild 3427 BLAKE2B ddd33ed5b56ec6c4b305d0c7fbd1bea85ae7616997b40109bc30c8157382748da992fbfd66ef3ec223a10808b1c7405015aeef09952454a40acc886066594fa1 SHA512 df0fc9ff5055f22f53a9b48c6105b85746de5fadc986d87b5c96f112d6e8eceb1bf13ec35f18dbb9309870262c0f0a39ccc3618ec5efd70d11c617915b1af190
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-239.3.ebuild b/sys-auth/elogind/elogind-239.3.ebuild
index f9136f937f10..3524b01a1b83 100644
--- a/sys-auth/elogind/elogind-239.3.ebuild
+++ b/sys-auth/elogind/elogind-239.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/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+acl debug doc +pam +policykit selinux"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2c5c64ffe319..175db622800c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index cb22309b7397..7b4e960c2fad 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,6 +2,7 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
 DIST cinder-12.0.4.tar.gz 5349921 BLAKE2B 168beb53879656956a97a4e787aba200b119e80e3b787fa94534c7ca8a68fb641df47069e19759ef022103a3f306402711ec315bc61d6387b427c6f5672919fc SHA512 0a139c25458020a869ab9395f42cd31b83cbfb65640a41ef0039aef48a92fd641a0084c5fd8fbdc35b6c8b6e9250e1d0a845816b92a882358acf4e2793be536c
+DIST cinder-12.0.5.tar.gz 5358388 BLAKE2B 7ee078eb4cc4c4b16053453f1f3e5bd37c29766f80bedd1b3fe6e9d44387c8215d0fed1f79d92576254bf51b567227193a7175db7d06ef35d7f3fff5d82dd4da SHA512 80788d2b10a4a0bf83e61db8e58f54dd8bbcd9fa06cd4025d37809f310bc7ed148ea9c180f4e6f02cf06f8b388384cbb9cb8a8f29a327acfe8188503550a7097
 DIST cinder-13.0.2.tar.gz 5463591 BLAKE2B d146e43bdd97bd15aeaf7c582c8cbe37080a7a1e8b5090c2727fb2dfbfc953121c0bb4c2adfce5f09d3e43e02093335dcce655dcc64abfa98d58b08327257950 SHA512 04ea9c0dafcc98858b587bf94e5afa20cfbfdd1aebd615ac62cfc7821a8dc6106b695071d68dc369bff014e877fc188216f3b05a9a08ea94a1b99712eca25c92
 DIST cinder.conf.sample-13.0.2 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
@@ -9,6 +10,7 @@ DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd50
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.4.ebuild 8042 BLAKE2B 16b2d4ec01110d1dd9a7f176963182b2d9aaa76866cec22030aa263c96a1929a106bc08c48928ccf27301266abac1dbeb21080be0964cdaaf75784933cb87a05 SHA512 e7f2182ecb303de8e92a5e8a30d4bd5ab842b3592e32088fb6df9b5f071331b9ac9eb884490d02af6f742b57197b6a0768096f05b0298c02c34f25436aa7b8dc
+EBUILD cinder-12.0.5.ebuild 8044 BLAKE2B e12250aa2852f1d0ba198e11c4bf33b44ed49c1f0fca75228936e183086516cfd34480d866bacf008f545f530ba8dda64e7b8594e778ac58db304a8a817db01c SHA512 1004caa549463427c6f1337f63942426c9a1536d53e4687dfcb789cab526341e2e0d17222a949fcc1c29a1a2431781dcc21d51e93bb2dc2b0ba5ea0c523dfab9
 EBUILD cinder-13.0.2.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
 EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
diff --git a/sys-cluster/cinder/cinder-12.0.5.ebuild b/sys-cluster/cinder/cinder-12.0.5.ebuild
new file mode 100644
index 000000000000..7d5ccdd03cde
--- /dev/null
+++ b/sys-cluster/cinder/cinder-12.0.5.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
+	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/queens-cinder.conf.sample" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 4defeb95757c..d779e6bf737c 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -2,8 +2,10 @@ DIST minikube-0.30.0.tar.gz 9180859 BLAKE2B cd6efd166e01ea14b7593530ac3b7448851c
 DIST minikube-0.31.0.tar.gz 9213283 BLAKE2B 97440d26d724e54d265ee9c3602c2dc0cfd455d75616b4053d1ab8a04efbcbe93c74535577c3a881d665374dd753d629f16f90210c50066180e1fe2baaa733a0 SHA512 5f2d911deac1e51f82e27d174bf8be4dd1ceb5ce29aa45865077e0cf3524b8f62b2717e95a19d636e0c65d39748ef7522c9379a9d85839c7c97f4fe67d2f4a92
 DIST minikube-0.32.0.tar.gz 9216759 BLAKE2B 0b823ea3e9d912d3caeb7fe4cb28390c718fcc77c509bf4fac9b8e318fc70ca8152795de28c56f1a117f42181b4e668f267a710c058003727f4e07a1be2ea0b4 SHA512 e760f92155accd27b5851e45931207222170027ac26e16285df0cb876fd6f49f51c5c258a159cb2595656f5a0f20115cb94f34e8368c344f2ecc39c863d6f67c
 DIST minikube-0.33.0.tar.gz 9433237 BLAKE2B bf05d05d6323b3a4d656a7522fec464d01c1d02d69c6079dc520a6e9ca356a25c231cb661aaf037d2a20d2091ca1b030fc7e3609576644efe1413f620eee0ef3 SHA512 1204618591048878c9160f2b3d69f6cb6e6139a603071407b5539e9747a79eb73481cb515e7cb413d7925b981f69ced044eb8a0a7dd3aa3fee9042e75372b13e
+DIST minikube-0.33.1.tar.gz 9434081 BLAKE2B a29c3293f67e33fa0f5ece632db1a852a3bbd6f2c522699e59148a41277bf819c20d5d27034c71f89df2a5d7895c2dbf3166c11661e98be38267fbd5b2c25ab5 SHA512 c4a266c2d68264155ebc6dcbd3788ed77678c86310be469e595cd6f1d89677082cd8445e9dd456ec7d7433922fd0e7d4315614c2a62640ce9efc7adceb0e7cb8
 EBUILD minikube-0.30.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 EBUILD minikube-0.31.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 EBUILD minikube-0.32.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 EBUILD minikube-0.33.0.ebuild 1622 BLAKE2B b2273eeb591682b876038d482d59e1c1c87ae2fac757898989381c7a5222441a91594037fc3d359c7136fd8ae77a13180997dd8c8c57818c7e559faea962f44b SHA512 6e22477460f56a96428ad103b22c9df7daaa8fe3d04269206ca732826b3ec9ea3173ecf050bcaa6015a1d5094cb878eeea4e40bf46626f6ae4a63f2fe37a6691
+EBUILD minikube-0.33.1.ebuild 1622 BLAKE2B b2273eeb591682b876038d482d59e1c1c87ae2fac757898989381c7a5222441a91594037fc3d359c7136fd8ae77a13180997dd8c8c57818c7e559faea962f44b SHA512 6e22477460f56a96428ad103b22c9df7daaa8fe3d04269206ca732826b3ec9ea3173ecf050bcaa6015a1d5094cb878eeea4e40bf46626f6ae4a63f2fe37a6691
 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8
diff --git a/sys-cluster/minikube/minikube-0.33.1.ebuild b/sys-cluster/minikube/minikube-0.33.1.ebuild
new file mode 100644
index 000000000000..dfa9435d5830
--- /dev/null
+++ b/sys-cluster/minikube/minikube-0.33.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1 golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/minikube"
+ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened libvirt"
+
+DEPEND="dev-go/go-bindata
+	${PYTHON_DEPS}
+	libvirt? ( app-emulation/libvirt[qemu] )"
+RDEPEND=">=sys-cluster/kubectl-1.10.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
+	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOFLAGS="-v" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	newbin out/minikube-linux-amd64 minikube
+	use libvirt && dobin out/docker-machine-driver-kvm2
+	dodoc -r docs CHANGELOG.md README.md
+	popd || die
+}
+
+pkg_postinst() {
+	elog "You may want to install the following optional dependency:"
+	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9ce2ae0b27d4..58171e3b77e4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index e8f2fc33cf19..47e36c54b7b7 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -9,7 +9,7 @@ DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf5
 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
 EBUILD autogen-5.18.10.ebuild 1144 BLAKE2B f10a7b680ad7c3f0d50a7abbc7cdb22f057006d60791fff8ca2af146bdf35a981ca1648642631780d2fdcbfda2e64066350e4da10527807ac90f82b6c781dd5e SHA512 cd281ae6ce63f836774d82137f8326cd215f946a7827d0e2c318de7f507d74f6218c4bf1bf059c25c9d9a2cc089119b84e4b03c8c6f69d4cf96931c90e43a1ec
 EBUILD autogen-5.18.12.ebuild 1203 BLAKE2B b66487c33b2e9929b06357ed1964a7bac33f982fd10bcce2f1060776d0f4b4c7eaf351feb88120b131670e2db3d69b64d0490ae7827ca9f6a19513dda969977e SHA512 e2699dd820942e1eaf147e32f92ba7f66d02eadb4dde7ca1817dded7560af787868fa195038cce70448e818aeea198f70b5b1b7451a7d6f42fea5a4641cae13e
-EBUILD autogen-5.18.16.ebuild 1573 BLAKE2B 3f310e6d1bf7d6cdf945b41d182d7102d2c61fd4faad72234d9342dbee9659bda65f8163ba641f57d9719f66da78a22845599c2be0309aeb310b00a7f0acd43c SHA512 5b68dfafe2676f83f867b7613fcc2db3c937013435e6ead94d3e33b34a03c7a00445a23bff1bafb602282d83a08b16d60052131bae926c3d21412a9b52847d3c
+EBUILD autogen-5.18.16.ebuild 1572 BLAKE2B b3802583713b7e83a6845b25542ea6e3763bd23485e1616f458f8ad763dfb2e706acc96e4544f1364d5848c87f5d33c6e94f7f4386822009aee171a7fc9c244d SHA512 6e182394f1e7221d2e10baf6b03c8d0d16f28b0cdbc87a713bf0b2f55d41ed28913f1c2f064555a1c20346f808e9aaa1b7fedc1ce3553a8989e8ee1e8494fcb1
 EBUILD autogen-5.18.4-r1.ebuild 964 BLAKE2B 61f358436309dea7b7f8f7336e9d1bbb689f4c5b901fe0997cf01f8f682e2d8d40a69555f71a1dd57067301e3be520866f1abe7cb59a16643ca97024144c7c3d SHA512 ff910273519ed23d1307b1e37180eb2678c3b2474db7458a62caf187480b076187c1129e32274d7ce11058f92e79c0dfefefd91ad17046f2239c39a91c5e7567
 EBUILD autogen-5.18.4.ebuild 977 BLAKE2B 959781466ca3fbb9b5a1a1817502c674628dee24c021fe37ff84294355a604d1015c22191a15e1dfb740b9dac03ba827d9e581bcca3431c930aa601180933d7b SHA512 597b14fcaefb0f95a8add36e74418060857abfb622769b813f1701a87c6ea8c3d78a61a71183e9ee60c2e348643696233cf47a6647860615ada22c0bd50843d3
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
index fac3fc1f236e..153b4b5cab48 100644
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 5734313cf205..4a20dc40f053 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,5 +1,6 @@
 DIST binutils-apple-LP64-patches-1.tar.bz2 10235 BLAKE2B 3352170bcfe73c574217597233ca58c7d6ebeedf9dfe9da1399953dfe1a0c87fc26e9ba8864620ddd67c6f38e48aeb6950737637605f0b860eb4a0d246f3aff7 SHA512 5632d4033c39e47de3ec275d02100ed53408a63122fe722c26dda1b02275c397524b113e51e1334d3235fc7f0a3bb8e53d4ccc1c2e40f24c6129282846da22e1
 DIST binutils-apple-patches-3.2-r0.tar.bz2 4137 BLAKE2B 9cd7afbba5337cb9c395556b2691e4acd73ee323d643da4335f6465ccc29b06f889d01fb42c7778576607bfdb859e2df38d3ebf82d4bf7f0971079da6985f237 SHA512 5381a93d61c39993cdb294ecb238016e26cdfe283fae553f75ddc6662812709301d5208c770ac0992d1dfab92e4802c660e6fb4336ad891335ab716d3b042805
+DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
 DIST binutils-apple-patches-5.1-r2.tar.bz2 51642 BLAKE2B 1b44020a05e0a91cfe569273f1e3dc65afaeac4bcdb80a626bdcc1f30cf8fbba6cc7bb522ece93126d4035b2d309defefd17fe0cee5bcaadcc58c4fa0feb4827 SHA512 37ba0dcae6c10b54a07c6208f6893ab80b0de1bd1c2f677902f707c8290629f7671a481e256b57a18bf304b95e41e4d59519bc1c88f15de488c0ef7e142f5cd8
 DIST binutils-apple-patches-6.1-r1.tar.bz2 42189 BLAKE2B 8505acaff6343b2f4dffe9c1dd78e360762f0ad78d39fbc0227265ed8b6768dba62c1a7d6784ca685934942e1a211c70275474001b066e3292c579fa0aa2f356 SHA512 be8ee5af5c8c9f9228cf6980f032aa101058ac1a414bec89401dbc4ff32ea96d6ebf96b7b79285fa1e7b4037a9ed68b285dbe59ff8e3d3e62bfc0145199e72f3
@@ -9,6 +10,7 @@ DIST binutils-apple-patches-7.2-r1.tar.bz2 2924 BLAKE2B 167fb37e5cb4cae8fe6777dc
 DIST binutils-apple-patches-7.3-r2.tar.bz2 44551 BLAKE2B 036cd2a2e4a66b046467f2984cce1c15f0d07c6b66aa6c8df3e07360943104aabe6f2555a0094973df71a5844496cb69d97a0ff13366043e02a01d8fbb0b0239 SHA512 219c26aeb54e89e23ab91706dda0803cf0c9f2a33acb5cc676db2d2ea33ad22af0661ea19450ad8f1f006f6c1703269fd95c98c52a7bcfa0c6491bc1cfb1a0ba
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
 DIST cctools-750.tar.gz 1947990 BLAKE2B b0fe71ae6972bd2b21c1ecf7a699104c51519babf67bb5fc45e31ed1d17108e7627cb46b5f65d48c33dbec9e9032e703924e9a9a687ec19bd384a3cdea243a46 SHA512 298a447757d926b3d156aaf8be27ceadeb4242336b66cb0bee0fd2dc8bb4ad3f167758ff526e4bf3fe458cb72391f5dc38f9112171883fcf28d49a18d671296a
+DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-822.tar.gz 2024412 BLAKE2B 6b58499a9dfc2a1b166ff428f1e263cd44e03c50cdc8f6e467cfee93bc2dc2a9c81bf7626479dce195b152f04217e2d3a427afac45484cba4c5f2bdfbb7e46f9 SHA512 8b02cc837d5e0520f35da445f25ba86b5042d5caa27b49a599e829ed89428cf78dbd1831bcf6c18301f941fbfb31ac2114e248041d98008a466e1574f4fe1586
 DIST cctools-855.tar.gz 1699635 BLAKE2B 4d98cf2bbced6894083dc2733a35cf9a4c47f71172fe98265a8f047218cc90276085919129553e3a1ea0658416eebf3b7cf0908bd32ac1a224480554257999ee SHA512 50f5d015ce807aa5ca274dd2deea810b8b375110e60b5e334ca4b2170526b738ea5f86a5436caebbdb748badc3b89601d0f450f5b867d8393c89e336a3db4b3f
 DIST cctools-862.tar.gz 1702345 BLAKE2B de84058aa78824562b0eabf93a29badaba0908a7140336a281a6ea46a9b09d893433a908c299e8de866a76e0eeb98b730570958fc8fac559ccc6e35f5138b121 SHA512 faa401c1dc55bfb9cd2a9a9cc7bc9d473ee63b019607967c8b0da325514d6a1f7b1f52404370bcc018e86d30d75a4b01183f49b793f577110663efe43871360a
@@ -18,6 +20,7 @@ DIST cctools-877.7.tar.gz 1720523 BLAKE2B 78e4d387b34504a001a5dac2db5f791fcbeae7
 DIST cctools-877.8.tar.gz 1720708 BLAKE2B 97bce69d7c88a917ad1351635b4bd0ebd3273f7a62b10dd3d58a0df7e1de2e05dc3fa04b014dff6966e77b85e264d1be181ac4d5dafc069c72c79d803393176a SHA512 3f75fbe4eacd89f2e6372a3167ed197e2b8bda9faa10fe6bce0cf9d3d3eca536f0af5fc4ce1e4bc6a24eb68db36f5d0b1d0bc3f9807e285e67cfaa2d336d81ef
 DIST cctools-886.tar.gz 1731850 BLAKE2B c206ad8c94fa3d132726db8cbc60ed09b6f1f7aa8118a99b1e7ed350323c11b729d68c912ba7648cf900cc2a26cbff12a03072afe92efe09c8974be280448731 SHA512 49f14e165da3a9fcf16614a810b8a2a68907348bd27a60b268b330e416a0bc070fb6445e1e6b80d849026bd6ce7de4459623ab86168e2d63bb492d1ba6680c5b
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
+DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-195.6.tar.gz 412518 BLAKE2B f525aac0020baa69c5d7c42a7027b0d2fdef9fa3c2e5d3831101989eab20f2eb7932c99355ca34e6e0b988b9808013739d452592e0b8832e1306cc6027cc5d0f SHA512 58a9ea27efc02e66f9d99bfa250af1d90326385385431e5279386bbd9ab53366bf7e8236543296908b7214c33523c8f60098a6298a7393b3180e2a6bce18e7c5
 DIST dyld-353.2.1.tar.gz 510036 BLAKE2B 6f355bcb87d6136d3c29b2766146303ecf092fb407296a0a93412598276ea88c4f826da75d20cc5d3e2bfac750a62c413b117ee95dd710eac83b647786fb109b SHA512 a9488620499f682e245b55b7e0e4ec02fc0bcf03bd8a70d4a4ee0ba762067ade2f41c188990c101727476d41c19368b4cc89cccf2df40231da1c777742c7391f
 DIST dyld-360.14.tar.gz 518873 BLAKE2B ebf651a8880ef337ed5ee7d5d7b9d2da77fed481f4a01c52dbc81e1192138a423bafc89b49417d1edf36167c59600a6ef63d60c2f3e080d4f77b19405e5b0755 SHA512 cfe536ea1f0ad8fbc2846417289e3e36704bf69388e083e0ece0ffa6eeee501e7e9b2ba47eed7be0e5120b5cc72f33b2fc0d2d39ba7a16beaf98db94dfb4ae40
@@ -35,8 +38,10 @@ DIST ld64-264.3.102.tar.gz 681509 BLAKE2B 4a0699ec761bd145b8034c8577ce9f843c9384
 DIST ld64-274.1.tar.gz 670493 BLAKE2B 00ab46b09f29c6143c5066ffb0a12017fb2268a5f205c41851a95bc38443aa5494ce81b793a6668bcd3a8abb0ba4215f0da372c413ae52e4ca1e437ad370f8e0 SHA512 ef5d6802f759e09aa2dfab7eb84e9cd2a57b28da3f150833cf1a922c395dd696e501b1bcb10385cbe995f4945fc6c99c2d2d8c50c42f369186bdc1ac3e30ad99
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
 DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a328a74ebc988908b1655138873b69bfb0c19b284f0aedb678e99de3866d4f13460cb3427985704093dca37a SHA512 b5ffaffc43e74f22688fecd9fb3023a59160cf051f9412f34e6b0acf1c4f9d43ba641e199d8d6b1c6cf3bbbbf117645988fd879ded1fec8be056b6941fe79999
+DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
 DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
+EBUILD binutils-apple-3.2.6.ebuild 7058 BLAKE2B 59f2bab0976b4fd0965bbc62759fdac8aef15a323b72ccd59cec3d1e8ff6011a1f844e6ad03155a3a2b81f14dc9a8375087818255df4b415e847110a7aab4ec7 SHA512 b15cd358c5af87abcf993c57e3dc7662d519e27da5254abaf9d70d5a4072ef9f636eb390f9ba7213ca6ef8c4c2acd87bc74310a4ec7d8a78d6dfbc245596ba69
 EBUILD binutils-apple-3.2.ebuild 5973 BLAKE2B 15d365c5ca7c8fd214c42ab2439882dce3b6f4a1fb1434a15aaee9f0e063444d0a437ced4a86046971318bfd65aae27157921c2250ea619c324fc56b1df74982 SHA512 34e780324652137a5cb1104fc98b2391d32cbba830481bd8c6e877ed713cc195f01c26482acdc2386c66042292672165621900e9569e30942872f818c145f1d1
 EBUILD binutils-apple-4.3-r2.ebuild 10304 BLAKE2B 851d53617c780d5c472c693fbc8651cf7d976d071a1a47cce0ce867898d9cd38be3e221426717eb12da1f77fa41926c5fab7a09112f3b350c54313255879a510 SHA512 4efbb4a108d1e8bd67360cff47bc0a5aa36af7fb84ff42bafd0ffbb1e97337939454b05e46345ca25ca2d0243fad825e07a0a6d8356bdc7a193f101cc1b52335
 EBUILD binutils-apple-5.1-r1.ebuild 12200 BLAKE2B 18430125ede7c5b78ff0d371f2738159904c60a94ebe2b0ea60cff711af0c256526eb947b950fd8ec63753e8d417d6a8011b23995cd7d277603cdf688dc41786 SHA512 22277d1c8b67ac500cea2afed290cb61f9ce5d42a1b16eeaad33c5bd6014ea75d85870bf179968db619998ccb73b2374f4ce9fb6c721edf3f035c6239ee2667a
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
new file mode 100644
index 000000000000..972e7b728562
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
@@ -0,0 +1,265 @@
+# 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
+
+RESTRICT="test" # the test suite will test what's installed.
+
+LD64=ld64-97.17
+CCTOOLS=cctools-795
+LIBUNWIND=libunwind-30
+DYLD=dyld-132.13
+
+DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.6"
+HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
+SRC_URI="https://opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
+	https://opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
+	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
+	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-3.2.6-r0.tar.bz2"
+
+LICENSE="APSL-2"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="sys-devel/binutils-config"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/perl-5.8.8 )"
+
+SLOT="3"
+
+S=${WORKDIR}
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+prepare_ld64() {
+	cd "${S}"/${LD64}/src
+	cp "${WORKDIR}"/Makefile Makefile || die
+
+	# provide missing headers from libunwind and dyld
+	mkdir -p include/{mach,mach-o/arm} || die
+	# never present because it's private
+	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
+	# missing on <= 10.5
+	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
+	ln -s ../../../${LIBUNWIND}/src include/libunwind || die
+	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
+	# missing on <= 10.4
+	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
+	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
+	# use copies from cctools because they're otherwise hidden in some SDK
+	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
+	# provide all required CPU_TYPEs on all platforms
+	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
+
+	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
+	sed -i \
+		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
+		other/ObjectDump.cpp || die
+	echo '#undef LTO_SUPPORT' > include/configure.h
+	echo '' > linker_opts
+	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
+
+	# clean up test suite
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	local c
+
+	# we don't have llvm
+	((++c)); rm -rf llvm-integration;
+
+	# we don't have dtrace
+	((++c)); rm -rf dtrace-static-probes-coalescing;
+	((++c)); rm -rf dtrace-static-probes;
+
+	# a file is missing
+	((++c)); rm -rf eh-coalescing-r
+
+	# we don't do universal binaries
+	((++c)); rm -rf blank-stubs;
+
+	# looks like a problem with apple's result-filter.pl
+	((++c)); rm -rf implicit-common3;
+	((++c)); rm -rf order_file-ans;
+
+	# TODO no idea what goes wrong here
+	((++c)); rm -rf dwarf-debug-notes;
+
+	elog "Deleted $c tests that were bound to fail"
+}
+
+src_prepare() {
+	prepare_ld64
+
+	cd "${S}"/${CCTOOLS}
+	epatch "${WORKDIR}"/${PN}-3.2.6-as-dir.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-libtool-ranlib.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-nmedit.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-no-headers.patch
+	epatch "${WORKDIR}"/${PN}-3.1.1-no-oss-dir.patch
+
+	# drop as targets which are not suported by anything
+	sed -i \
+		-e '/^all:/,/^$/s/\(a68\|a88\|a860\|ahppa\|asparc\)_build//g' \
+		-e '/^macos_install:/s/common_install//' \
+		-e '/^xcommon_install:/,/^$/{' \
+			-e '/\(m68k\|a68\|sparc\)/d' \
+		-e '}' \
+		as/Makefile || die
+
+	cd "${S}"/${LD64}
+	epatch "${WORKDIR}"/${PN}-3.1.1-testsuite.patch
+	epatch "${WORKDIR}"/${PN}-3.2.6-lto.patch
+
+	cd "${S}"
+	ebegin "cleaning Makefiles from unwanted CFLAGS"
+	find . -name "Makefile" -print0 | xargs -0 sed \
+		-i \
+		-e 's/ -g / /g' \
+		-e 's/^OFLAG =.*$/OFLAG =/' \
+		-e 's/install -c -s/install/g'
+	eend $?
+
+	# -pg is used and the two are incompatible
+	filter-flags -fomit-frame-pointer
+
+	eapply_user
+}
+
+src_configure() {
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
+	if tc-is-gcc && [[ $(gcc-fullversion) != 4.2.1 ]] ; then
+		# force gcc-apple
+		CC=${CTARGET}-gcc-4.2.1
+		CXX=${CTARGET}-g++-4.2.1
+	fi
+}
+
+compile_ld64() {
+	cd "${S}"/${LD64}/src
+	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
+	# but not on tiger.
+	[[ ${CHOST} == *-apple-darwin8 ]] && \
+		append-flags -isystem "${S}"/${CCTOOLS}/include/
+	local myincs="-Iinclude -Iabstraction -Ild"
+	emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" \
+		|| die "emake failed for ld64"
+	use test && emake build_test
+}
+
+compile_cctools() {
+	cd "${S}"/${CCTOOLS}
+	emake \
+		LTO= \
+		TRIE= \
+		EFITOOLS= \
+		COMMON_SUBDIRS='libstuff ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		|| die "emake failed for the cctools"
+	cd "${S}"/${CCTOOLS}/as
+	emake \
+		BUILD_OBSOLETE_ARCH= \
+		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
+		|| die "emake failed for as"
+}
+
+src_compile() {
+	tc-export CC CXX
+	compile_ld64
+	compile_cctools
+}
+
+install_ld64() {
+	exeinto ${BINPATH}
+	doexe "${S}"/${LD64}/src/{ld64,rebase}
+	dosym ld64 ${BINPATH}/ld
+	insinto ${DATAPATH}/man/man1
+	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
+}
+
+install_cctools() {
+	cd "${S}"/${CCTOOLS}
+	emake install_all_but_headers \
+		EFITOOLS= \
+		COMMON_SUBDIRS='ar misc otool' \
+		SUBDIRS_32= \
+		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
+		DSTROOT=\"${D}\" \
+		BINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
+	cd "${S}"/${CCTOOLS}/as
+	emake install \
+		BUILD_OBSOLETE_ARCH= \
+		DSTROOT=\"${D}\" \
+		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
+		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
+		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
+
+	cd "${ED}"${BINPATH}
+	insinto ${DATAPATH}/man/man1
+	local skips manpage
+	# ar brings an up-to-date manpage with it
+	skips=( ar )
+	for bin in *; do
+		for skip in ${skips[@]}; do
+			if [[ ${bin} == ${skip} ]]; then
+				continue 2;
+			fi
+		done
+		manpage=${S}/${CCTOOLS}/man/${bin}.1
+		if [[ -f "${manpage}" ]]; then
+			doins "${manpage}"
+		fi
+	done
+	insinto ${DATAPATH}/man/man5
+	doins "${S}"/${CCTOOLS}/man/*.5
+}
+
+src_test() {
+	einfo "Running unit tests"
+	cd "${S}"/${LD64}/unit-tests/test-cases
+	# need host arch, since GNU arch doesn't do what Apple's does
+	tc-export CC CXX
+	perl ../bin/make-recursive.pl \
+		ARCH="$(/usr/bin/arch)" \
+		RELEASEDIR="${S}"/${LD64}/src \
+		| perl ../bin/result-filter.pl
+}
+
+src_install() {
+	install_ld64
+	install_cctools
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-${PV}
+}
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index f607c82f78ea..afaddf9c7b39 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,9 +1,10 @@
 DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc18a32a6ae6ae4ec58748d5e8fc4877f63258db51cbe3bf84f3345ea0fc7c27d2e1190632c529615d9e6922baef74915 SHA512 5569b7901b40ea01eb7bccdc1b090207bc1ea6c50d144b561b2725ae79f3bcd51e7ea4e8ea37b60ea50ff4882e82110a07986cba1d2397a0333e7e01ae466e79
 DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152
 DIST bison-3.2.3-patches-01.tar.xz 9460 BLAKE2B 3e9f3e636d774d005c861c4f5fe121a862cbfc38f5efd5bb7ac7d2944f71e80eabd6621f3f5507d9f78727f22b574581c9b694457c63b5181a8cc1a0ac69d294 SHA512 6c599583b67f8999c8e2c8492a19ad0b43bbadef1d9c062c752e7c1cc3d178c2106262c70c998a0588bc6255ec27b2623a90267e0858e2d776ac2f4cf6cb688f
-DIST bison-3.2.3.tar.xz 2092048 BLAKE2B b5f98850e1b69fcc0f5e559c12708cde59f00f2e633b7a2a0c9ddc849f548265bb30873e4e64e1b2a72e51cb5f1caef7ec0ab09aa2c8d7dae04ae71854da7096 SHA512 6f86ebc0d66e8dcd3709b25938b2bf43b94e7f4a0a20e586ba42c55c8747543fb48ca47cc2116e4bad8d2152de58c8c75b284a9b254ab8c8ecef292967657494
 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
 EBUILD bison-3.1.ebuild 2515 BLAKE2B 9d5a1ae20ed4c001494d1d8a09a492c6cec0b83931903581967cb9d5a61fb736f5ce388ac9027eeec80c186358345864e7a588e78f64ab1b1170213e5db55e07 SHA512 fc236455ffb85e2755a447d44be3ad17e294c0740616b20872811d9467d4bcd12afdfffb03c573ca325270e764e13fe899be8ff6b95e01d4b29b85393a160201
-EBUILD bison-3.2.3.ebuild 2624 BLAKE2B aa343b50abe31b543af764b6b0fa6421bff407888558a023c4c4d26f82effe7801abef379dc489f006b1d95bb85b4f61084ab7e5f753816c2baafec7aa0eee3e SHA512 285f053d23e8544255f5ec6621e9f7c0a279fe87bd27de3c4bddbdd36a6c329b7a7b43bcafd091802785c4c50c080a54e85ae3690c231fe4ae1470fee2918d5c
 EBUILD bison-3.2.4.ebuild 2638 BLAKE2B 229847038c88e6c58e30a880710c780bb49b8278a5ebe338f3ed90b1a7093bdaf13a06ce098d73ea97306a312de056e5f089d0a3bf3095702dd545c0833667ed SHA512 f6267cab808bb92158666696c5a682afa2520c13ba605871b65b22d9405e9bb68f95074571d7a8cc83d0ce4f2286c76ef13cbf581023d9934f14cf49ef351c11
+EBUILD bison-3.3.1.ebuild 2634 BLAKE2B 1edf717ae2b143016cb0d9ffeaf054fe1c5f38855d20768b48dae8e584cce98ab6986c35b2d4e4f57c1481b6b168c3cf8c6fc7e88ce7b601764c1961f5ec753f SHA512 6b6d67f903b277d46e7b16b83f1fdda050ba4d628c965013261bfa2059841ca66579ba042fc00f5eef6c98624841750d07b4ec2920a8216fe8eccb3617a796ee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.2.3.ebuild b/sys-devel/bison/bison-3.2.3.ebuild
deleted file mode 100644
index e27cb799736e..000000000000
--- a/sys-devel/bison/bison-3.2.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-PATCHES="${P}-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/${P}-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.3.1.ebuild b/sys-devel/bison/bison-3.3.1.ebuild
new file mode 100644
index 000000000000..ca879edb2437
--- /dev/null
+++ b/sys-devel/bison/bison-3.3.1.ebuild
@@ -0,0 +1,92 @@
+# 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/gdb/Manifest b/sys-devel/gdb/Manifest
index 47593bf96a9d..7a7a82e98bce 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,6 +1,7 @@
 AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623dce854c0b10c9d3925db0b09aeea7d3a6c788dbed3f3e4d338535b35c3913ce8ff57edaa3d5cb587612a9de96718ec7 SHA512 0891e407b9a97dc26d99cf91f01f1316076dc5c303ddfd49e535ccf442d70cfb1b3d0b078c28da7208009fc4674606be96467fbd9b3d6773d1fe12305d89bdb0
 AUX gdb-8.2-sparc-fix-syntax.patch 399 BLAKE2B db7c9fad33cb9b43e986c7a5fb0adfb7fea9aac3f59990f9e8b41ca550c7e0da2363a24f06bddd321d1629857c5cc9bafba1c62920527ccfc4f375e8fd6667e2 SHA512 631dc6d92852e7852dfaa1d99fe32b98bf646f886f9906f1e170aac2d17f2809374336b93d1fd56f09419e8317b6f7634d809fe59022b803f32e18ba7d89ab39
 AUX gdb-8.2-tinfow.patch 1629 BLAKE2B eb771e3ce9add5eeb6c9d87cec229fda6557eb907877ecb4461060b8869c8598891368bb83c9ae71f5840edc0d95c9fa6d7c386e78afb724fdeadf5d1619269f SHA512 a406922c3fa9c0264cb4250895783d433f59f88eda8df63e509bc8c43d6b55b540262f34dd6f57894958574d9f3412d9d6f46397c229515204d62b0e642570d2
+AUX gdb-8.2.1-aarch64-musl.patch 1785 BLAKE2B a119c650c709827a35badc36a4ac0b7df30709ecb129cc3f55091c508059eb325691a2ca81d8ca8ed50f8bfbd194af2199bd03ff0c6820fc63ac170499443020 SHA512 93745b0539492a3790baf728b703d8ae09ed7e378a522471cef8db934dbd5fcf474bfdcd9ec83c7ba42bb3610e74a7f5d901fbb4b8ce6c5bbc2ac9a9ad133151
 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414
@@ -16,7 +17,7 @@ EBUILD gdb-8.1-r1.ebuild 7114 BLAKE2B ffb1e998275339b3cdcf5c6babb344171b7d533e15
 EBUILD gdb-8.1-r2.ebuild 7110 BLAKE2B 399cf3ef970f92d911a9a1b5eb2e4c0058e5c1f6c70a9c1e41919b45d046d2f704d865670d4dfd39f13d36dc9f4a19f22ba6082321ffb36b373de709c79e28d6 SHA512 95e0952c373b5f2e8d6013a281f2982c096c035ec01503ac36308f5bac29ec58d7775ad04375cb5702ecaa6d2509e178c1ed1cea8719fe662ce3868ca98500e7
 EBUILD gdb-8.1.1.ebuild 7115 BLAKE2B 07455f6ec0eb8d32bd57f404b2e831accb70995e61bd82232c8150b6f6acec2690d8b9419245e006074d4e89aaf60ffcf6571c3b09099b5d4d0ca2b11ea11318 SHA512 41864e8336b484cd7fbddac2151d567821923545442e8ed4c6717e928c76b72c5a843eab5d35b053eaf9a94ff3435e617ef68a8ff705f99752fb90ea5ef20699
 EBUILD gdb-8.2-r1.ebuild 7322 BLAKE2B dcfda93fad78dbabf0153edbf1d0be0eea4cfdae1e3304bb1a5f2576d5a053d2e259063bb58e1b6cb1bddab7119120bcdcb7bf833c10f0a0596ff59a59d474c3 SHA512 2d07f8cc3e663c72676f726fe60943166bff599372d8f09e4e20c923647f0ad43148efae563f84ae5a783c44c7616560a7419890d6a0a9b84e05158aea604a82
-EBUILD gdb-8.2.1.ebuild 7117 BLAKE2B a244e1a783ae8c1cf695595b0f463dd56f2d667482147eaf521656e9a3663b6653149d88526e3b614f3273d70785112d3ebe272a64a365aaffd7fe034ef0da41 SHA512 c75dd0741fbddd2b6488f2e8f8c07de5cae9cb031fba566d3d5101eaf64242ef1e0e82faac3d6c29f4ebe0ce0fd19cb4411f4cb9fc0d97214e62f3619c6f86bd
+EBUILD gdb-8.2.1.ebuild 7163 BLAKE2B 3b2320ef7d326b832a7541c3b3458475592729cab8053b8af859a7a55c49d702daf29eca478456341ee9a6fd9877bcc7897055c019a3ada4b54f38505bc78b3d SHA512 6fb5f809aeb1035dbedb44a6fa5091cf542fd4d7a78eaca77145060f234f052361ca9057e4e228d696b326284ec7a398fe0563809f986e398802436d2b89eeae
 EBUILD gdb-8.2.ebuild 7232 BLAKE2B 50ae71f70afbbbd0198394b6a638a68b29c3be243add4178b5fb2c4d5d2d6e940875c0e677d24cb1af16ee79d3c15cf99ed1160c36830e9c71fd6f92ea86f71d SHA512 ce0d2accd9d22baf1842737129925554291b1c4c9fa7f45cb853712a9ce5984d3305ab77721095d2483db1eddb025aa36b766195c98d404bcd9aec1bfff52a90
 EBUILD gdb-9999.ebuild 7001 BLAKE2B f80c1da52728749e4913b3a7b29c723fb301ca742a62477765bb23d1187ced22f2e75b1eec7185495a32681971bbb8a1de223b96a099dd5c3222e778598912a4 SHA512 8017998eba988d085b23ba849123a84b223154957c3a684728bce43c469fe40115f6873df5ecdd5b104711705818c0d3cd18c9e2303793c9e9a8f5b7908da87e
 MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
diff --git a/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch
new file mode 100644
index 000000000000..70f42df90a91
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/676620
+
+From 51b4f73a37c2e7eec31e932fc3c8dae879735f63 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <szabolcs.nagy@arm.com>
+Date: Thu, 13 Dec 2018 17:47:17 +0000
+Subject: [PATCH] AArch64: Fix the gdb build with musl libc
+
+Including asm/sigcontext.h together with libc headers is not valid. In
+general linux headers may not work with libc headers, so mixing them
+should be avoided, especially when the linux header defines types that
+are also exposed in libc headers.
+
+In case of asm/sigcontext.h glibc happens to work because glibc signal.h
+directly includes it, but e.g. in musl libc signal.h replicates the
+sigcontext.h definitions in an abi compatible way which are in conflict
+with the linux definitions when both headers are included.
+
+Since old linux headers or old libc headers may not have the necessary
+definitions, gdb has to replicate the definitions it relies on anyway.
+Which is fine since all definitions must be ABI stable. For linux apis
+that are not available via libc headers, replicating the definitions in
+gdb is the most reliable way to use them.
+
+Note: asm/ptrace.h includes asm/sigcontext.h in some versions of linux
+headers, which is just as problematic and should be fixed in linux.
+
+gdb/ChangeLog:
+
+	* nat/aarch64-sve-linux-ptrace.h: Include signal.h instead of
+	asm/sigcontext.h.
+---
+ gdb/ChangeLog                      | 5 +++++
+ gdb/nat/aarch64-sve-linux-ptrace.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/gdb/nat/aarch64-sve-linux-ptrace.h
++++ b/gdb/nat/aarch64-sve-linux-ptrace.h
+@@ -20,7 +20,7 @@
+ #ifndef AARCH64_SVE_LINUX_PTRACE_H
+ #define AARCH64_SVE_LINUX_PTRACE_H
+ 
+-#include <asm/sigcontext.h>
++#include <signal.h>
+ #include <sys/utsname.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+-- 
+2.20.1
+
diff --git a/sys-devel/gdb/gdb-8.2.1.ebuild b/sys-devel/gdb/gdb-8.2.1.ebuild
index c7a030aa640b..57cee06eec95 100644
--- a/sys-devel/gdb/gdb-8.2.1.ebuild
+++ b/sys-devel/gdb/gdb-8.2.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
@@ -93,6 +93,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.2-tinfow.patch
 	"${FILESDIR}"/${PN}-8.2-sparc-fix-syntax.patch
+	"${FILESDIR}"/${PN}-8.2.1-aarch64-musl.patch
 )
 
 pkg_setup() {
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 5c23fecf453f..d7d7bc7d6d33 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -8,6 +8,6 @@ DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee9
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
 EBUILD prelink-20130503-r1.ebuild 2458 BLAKE2B 27df684421d5857a5727916bbcdbadca5d9e8847a1f8c0abafb892fc6af029932687c0819013416d36ad0182bf771ed89e238a8122cc83631b6cc5717ade8563 SHA512 2cc0e66fb48f2137bc9a8118d1ed97e58dd5725bd30b042c4276dad5df2d65ef8298e93cdaeb0b8b292c16ff255fa1ddacdc104150ac478e1bf8677869ce4939
 EBUILD prelink-20130503.ebuild 2617 BLAKE2B 24308a12628eadef19728c07f6a2be21671e2119d6570fd7d2fe8cb7805a041edf4bb54cdc391b808d396e2585e54fbd0c2f46fe755ab35722bfcfd2690fa7c1 SHA512 4ba50aad1ba5e142f8a0c96d2ab73fca49712202c506a57af58e9fee5021446e6587f9715420244c39aef9f006baf8cfef7cd318e8e6e21f36aa590f7840cbc0
-EBUILD prelink-20151030.ebuild 1737 BLAKE2B e8d5ee89e48725c4b054bb83a3f4867cce35cab2ac63a02a28a28044e0b169c1cfe547ea906fb38a91946769afbaa9a4ef2f6d8ec1969aa7dc646ab09fe5d1d7 SHA512 7889421c986260cac8f31d3eafe1e354bb78dec1e00f2fec5798a3347c845c4dd4ba973e5f0c0728d4efe993f393ea50607b5d00591488a0b38574d519d70f36
+EBUILD prelink-20151030.ebuild 1734 BLAKE2B 80e4521d81cbd4de0faec3ebb5eb1f2016268ba3aa7c53ffe7b304b6fd1b6db6171347fb372ecb5d1c857a35afd03c2e02a1a1fdaa9ee950ef841f58848725dd SHA512 96ff48b1c57b53bdd4ad0e5d40affdeb6e80ae6df79d1b2b14dcca436954a2b7610829a2a1e464a50901247cbf2d6586c8d01d442f802a22f7f52d458b319245
 EBUILD prelink-99999999.ebuild 1585 BLAKE2B 37746d0631d4a07c94f9ad71cc00512b4c485ce13b00ca84263be41f0e8a1b00a315764a845740fe3cee30cdd5acb7d87d41fc0be2d764a158fda62bcabc4df5 SHA512 5d844567440de565d363cff958b3027ce5a7e80a68e46dc2c10e2176bf2306788d4c2d86d6a92a83324a6264e6c374d8d48a38665535588c4b71ac07a03d7a5e
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
index 69a205c9d16a..d30ac8946096 100644
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ b/sys-devel/prelink/prelink-20151030.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"
@@ -46,7 +46,7 @@ src_configure() {
 src_install() {
 	default
 
-	use doc && dodoc "${WORKDIR}"/prelink.pdf
+	use doc && dodoc "${DISTDIR}"/prelink.pdf
 
 	insinto /etc
 	doins doc/prelink.conf
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index a8cfcdaa8193..46f34bcc25bc 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,7 +1,9 @@
 AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7
 DIST sparse-0.5.1.tar.xz 215144 BLAKE2B 209aa7cf34a9135dae38466a0ba41ff4fb888c363ed59a68a5820d4b6ef1636d717b8172a6d638d9dbc61197efb7a3e06ef85830b6f1c359737520b4b3aa0fbe SHA512 f7fc516ef8343a4153b9bda1b50b326dcd55a77fce5acccd9aa4c5636d6510573c7e26b0a7ca1df847082faf2be2d292336ad1cec855e395703a6b1e04d3a8a1
 DIST sparse-0.5.2-rc1.tar.gz 282810 BLAKE2B 74d06230ceb06dac427984c365223633ef795b2f6329c69da5183b9f3444457ee05d74b04b18cf400b4d813026a746218edbf9bc0b2aa371c8a3681ac10ce19b SHA512 b58458b97e91b7d02d032a946d9870a3fd227959608fb7847864ad1a92258aeb0461da513f4d6d3b37791ed8d5fc41ac01cfef0fcaf34b229090ff078672ef40
+DIST sparse-0.6.0.tar.xz 284668 BLAKE2B 9bb568fe23ac96d6e179e5c5927ff34e9fc88909d367f6ab49c8862a8e599df83602ba72bc42ba3bf63823b024340f101128c528ebf767f4e29da7f5324a1f40 SHA512 5c6c88f203c941bf0efd28802ef91641c96e7d4b4688a5176d091ff0fd6a650d9147e590b631602a8bd08994a35261977569367861a6d605ccdd25e4a07debf9
 EBUILD sparse-0.5.1.ebuild 1292 BLAKE2B 548dd51d1c572e6a0aa775dbd30dbc70586d7c06d8dceb197f0d466a7c003ba091d0b9a9e6b777059fbcacec9ba40531d8b6e150dafbb434b0e99fef59e11cbd SHA512 fde8ddf89ffcb83d9827d133f9f6efedb4126ef8a8e77227d5e0e94710d238b5b64a078ded0e386219d5a4e2c7b90ba9edab856b3bef762ad35d5a36bb488d99
 EBUILD sparse-0.5.2_rc1.ebuild 1379 BLAKE2B ed99626abd55719915eb0dcc471840e201718b1b93c0f3f814a2d89dfa23a5149e060a14ed3670ab8877c36b368395e88e6ca1f3d648782b722399c77fe38009 SHA512 89ab151c9b25373b9ffda84092365f164467400a69c4defdad7829dfbc57996be67054f719728925fd5fe0f6d31038b38d625f34d937de3df8579d2e676c195f
-EBUILD sparse-9999.ebuild 1231 BLAKE2B 8a50ea0a7b11a2cdd9932098a70ca0c802764e1c1e42218ce1a856d17f7bba377baaf28cd948635bf3d11e573cfbea7443abecc2156144f5f6d98ed5f2b97e78 SHA512 069b2dc6db6225958ed3e7022244e2f242e00359b5538e2cbf02698016ba1f6df105649350462e30681fc0b78432e07a6f2a0d827e3307e69f26069073e489dd
+EBUILD sparse-0.6.0.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
+EBUILD sparse-9999.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
new file mode 100644
index 000000000000..41c95d2e55fe
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="C semantic parser"
+HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/software/devel/${PN}/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm test xml"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( >=sys-devel/llvm-3.0 )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+_emake() {
+	# Makefile does not allow for an easy override of flags.
+	# Collect them here and override default phases.
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		\
+		HAVE_GTK=$(usex gtk) \
+		HAVE_LLVM=$(usex llvm) \
+		HAVE_LIBXML=$(usex xml) \
+		\
+		V=1 \
+		PREFIX="${EPREFIX}/usr" \
+		\
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
+}
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 43d03a624df2..41c95d2e55fe 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.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 eutils multilib toolchain-funcs
 
@@ -28,18 +28,36 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
-	default
+_emake() {
+	# Makefile does not allow for an easy override of flags.
+	# Collect them here and override default phases.
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		\
+		HAVE_GTK=$(usex gtk) \
+		HAVE_LLVM=$(usex llvm) \
+		HAVE_LIBXML=$(usex xml) \
+		\
+		V=1 \
+		PREFIX="${EPREFIX}/usr" \
+		\
+		"$@"
 }
 
 src_compile() {
-	emake $(usex test all all-installable)
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
 }
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 49e49c743371..96c798a3697e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 29b4855af2b4..0fa35f6b4a40 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -13,5 +13,5 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed
 EBUILD e2fsprogs-1.43.6.ebuild 3781 BLAKE2B b68206959b716f2f7018da95f2e7872bdab4dd1ba554d83fc089ad5dead7e2e51b5c7a3d67669083bbe7f8d67c5b45919439a2560d95a4de3dcc217dd4bdbe1a SHA512 71ce74750ec162caac3d07602cc011ac0ed429723f8aca43d4f4918184cb3ea9a4ae770e834ab46ba2dacf351cf5288463b05b36c66f90d127cbe50452c7a727
 EBUILD e2fsprogs-1.43.9.ebuild 3804 BLAKE2B a110adfe131292172510d7133d8c4266742c54cc3a3aad3959375d966672d462d2761561b79a2f952c6f4ed2b3004bc7abbc0ef90a6d44e8b89203a0df96cd09 SHA512 143bdfe5f8dd353782e84e3c0b9955127eab10aa7fa07e6c024656282225ec5ba30880d1fab61e249010d5192b2d546278694f0b951138500fb1a6ac3ee70a6d
 EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1
-EBUILD e2fsprogs-1.44.5.ebuild 3922 BLAKE2B 56d48b6701051f2402969776c05bf175c78071ea7e2af326ea78a46ae95684c4186675faad09bcec0d402b64d5c8d1e937cdac81de75efbafbc99ab92d0cc4e8 SHA512 7b8824f200cf3f53dc5754492e25e3bb2eb9bc16bad95a1794612642c38d5629aa72041d9897b43c50cf840d72811accf71df212cee100bfdff92f95e748bf13
+EBUILD e2fsprogs-1.44.5.ebuild 3918 BLAKE2B d94d9e1f0546b8430b4b45e98db9e4987a9e7ef7776de5595b1e504a6cf4771b558078225e916b1c92abe2cf79aa38b639728d51c2a67cccc5cc457d7649e122 SHA512 6508248dd3f3fe3dd65ce752ce56926a8c659c96184a4fecd05a070d9af875b82ff9f2af1fb24f70293ca414cadd823e9a283fc9333cc2e73793ba13ba2a4738
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
index 37368200c8bf..79632229b52c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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}
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index abc0a8aaee41..c45981f745da 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -3,7 +3,7 @@ AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
 DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
-EBUILD fuse-common-3.2.6.ebuild 1256 BLAKE2B 905d611a8458ae6a5d736ef3cc6c59bb8d9e16ded898312d97d2156a6b76422e34cd14d8be1e92c6f2c762553c04975d7f162f3ec23f643a9eabc911aaf9c971 SHA512 28ecd4e83e34ea724011f558bc29975ff89a54abff811997d24e13f5d80f861f2aff85c534402079deed1569aac39725167e934434ccb04cf626699720bddeac
+EBUILD fuse-common-3.2.6.ebuild 1255 BLAKE2B fc0e83b952ef21e22ae91fdde4e51cb06558b904660af2b6a8ae95904faf7dd46093ce8fd73086c5c9a44ee51ab489519c5a65cea5086909fca5b09d6de07ec2 SHA512 296f5904a0835f6645841809c12d22d7fa8a9921ae6231c211ff5a07e2532c1f87f5728e64721b50452f46d687420a092a5caa08482315a1abe237e8100a17b9
 EBUILD fuse-common-3.3.0-r1.ebuild 882 BLAKE2B 1c160f4ee9fe4855263ec009d1a14fc8a27d47de6951515bcaf71493a51231afd03bcc0afbe9c426fc912d056fc7fac88e6ffe6545d84601b0822a13926e42b0 SHA512 886597787d42d27b204e5786c0aa70c46b70bdbcd1cfaaa75fab9be0ff57179948235976f552ac3b443974e62f4df0922970a078d0ae6a5bdfc4cd655f8031ef
 EBUILD fuse-common-3.4.1.ebuild 882 BLAKE2B c160fa9e872d8a705b52a935324cc80f1147f8b23221fb819ead793a742bd3d01c4b71a57bffd6aa7096714a43e433343efff327a295b264b19e9af8223d8283 SHA512 ceec795c2ac2800132fa875997534e29eece406acb30c50733a5baba33dcc35d31761caf489536c6b19d199b6b3af7760aca0114d2cb7f273ee2619879850180
 MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae
diff --git a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
index 043612ef49a7..bc727b2982ad 100644
--- a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
 
 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"
 
 DEPEND="virtual/pkgconfig"
 RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 02eaa661a9e6..dab86e067cee 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -6,7 +6,7 @@ DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
-EBUILD fuse-2.9.8.ebuild 1943 BLAKE2B 71465d376dd2aa6018e52d0405de9ad206acedd8d170732fbebfe57e640357a328f22a09f7a382697cdf1ea2f6d3d15d0f34a1dcd80456d3d8d9fb03fa955776 SHA512 c1eb8a7b9bdd5a2661e310617e01b7d42db4b9a37d5bdea90e2561c1d8f769c11725319a22431948393141413094d34abf50bd77c2d61c84147c1aca3a8e5533
+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 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.8.ebuild b/sys-fs/fuse/fuse-2.9.8.ebuild
index 0f9c05247d54..a5951498b33e 100644
--- a/sys-fs/fuse/fuse-2.9.8.ebuild
+++ b/sys-fs/fuse/fuse-2.9.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest
index 757ff1482e3a..8ef6d85f82b2 100644
--- a/sys-fs/lessfs/Manifest
+++ b/sys-fs/lessfs/Manifest
@@ -1,6 +1,7 @@
+AUX lessfs-1.7.0-openssl11.patch 2725 BLAKE2B 47c6bc1d6a841f2a2c295e593576d18733befedc7176e7e418f0872d5ffbf4cc36cd64394cf818293f31271e7816cb007ccabfa0f72813cbf84544b5c1512298 SHA512 f296654e621b03495ab9a8a1bcebb169cb03da42763a2803f0adabf2d6951db871c00790464aa527e93373cb876a6d62ecf0595d32a6c9e248865b205c828f1b
 DIST lessfs-1.5.13.tar.gz 506221 BLAKE2B 30d960b97120c7e819af2357358050720d01c226f6855334ec7511d854f82a683112682389353b20d80b5bda82d0ab89464830036da3e1aadc3ea64285ed93b0 SHA512 7143b7e1df8e059184d003be6519cac323fa035a6d9005b4e007504328d58624232ff9a494ecf11d445977f9138e7c41492d7fd30721065e5293927f85585604
 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1
 EBUILD lessfs-1.5.13.ebuild 1218 BLAKE2B 518b144a352a20fb2501f69f21e591514876c37628fc6aac3615e205a190e5bdbaa00c5d2f758bba9c5ded2be75547ff1536d330f455f2a3ae3b0b02347f36f3 SHA512 ef9ff6d16f0397fded5f6eeb21039e760485f73f61579f7a1345228ae6a94ebdad1c4a98a92d008585ceb16cab54999bfd8b40eb06476c9049542dfc4e1e7d52
-EBUILD lessfs-1.7.0-r1.ebuild 1307 BLAKE2B 83e477101187681d4d1c597c663bd0d6dc1f1dceac5391700e34f4ead1806b658c4024e3f41bc6accbe855e6283a4241ed0935a521c66b395f5d9758787d1619 SHA512 2bcb82fbddb2c4585b364bcb61694ac8ad4aee5555d08ce0e7fbdb352d3bf0a9f2bf11c6bc1afcd3c21e3993619b9cb6ed5e524cb6012a282877268f839dba6d
+EBUILD lessfs-1.7.0-r1.ebuild 1387 BLAKE2B 733f97efe58d69c7d50690117b940450b88b5f59622197905af1d09042a8f37b2881f00378397ab94af7111a0cfe206a64a556cf22ad7ac707c7ebc349ff9f92 SHA512 97964094fd16717104791d9c0d79c0792bda71f22e4c412ead74629495cb85fa62172ef4f6faa987dbc8c16fe3f478302f9d853788f2155595142e742fd1f9dc
 EBUILD lessfs-1.7.0.ebuild 1281 BLAKE2B 6080ac5f1c1a57321306a292728bd297b4687754274c7d10adf25298405937d3cf7bcbdf2ccb4d595e4141d0b7483de5b9982e814d716d4cfc0dd417ca5c55b7 SHA512 e930c0ebb872b82702a495dd62fb3782dc64b10afce925f34311d80e00ebecfde203da2f171102ad39035849da1043ac69c0480c2c43461b7803c18e340c1100
 MISC metadata.xml 1422 BLAKE2B faa04d5dc2bb7b18102a3bd2a4386590050599cbfd1124b632d78cae75692f0395f9675b9226c2c7a45de81359737b43f488ddffc67ec04aec829f256cd0fd92 SHA512 d841f92f53749f39637801b2f4f5129083f07df540cc13c5c2e2bdd1c7e16aefa66e120ca9b0b78e38d85a9186a7c208dfb44a3600f1ba7d76e70d6e7bfb95d9
diff --git a/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch b/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch
new file mode 100644
index 000000000000..45f24eba3b15
--- /dev/null
+++ b/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch
@@ -0,0 +1,72 @@
+--- lessfs-1.7.0/lib_crypto.c.org	2011-09-30 20:13:08.000000000 +0200
++++ lessfs-1.7.0/lib_crypto.c	2018-09-26 13:16:08.995599693 +0200
+@@ -78,7 +78,7 @@ unsigned char *safepassword()
+ DAT *lfsencrypt(unsigned char *unenc, unsigned long size)
+ {
+     unsigned char *safepasswd;
+-    EVP_CIPHER_CTX ctx;
++    EVP_CIPHER_CTX *ctx;
+     DAT *encoded;
+     int olen, tlen;
+ 
+@@ -86,19 +86,24 @@ DAT *lfsencrypt(unsigned char *unenc, un
+ 
+     pthread_mutex_lock(&crypto_mutex);
+     safepasswd = safepassword();
+-    EVP_CIPHER_CTX_init(&ctx);
+-    EVP_EncryptInit(&ctx, EVP_bf_cbc(), safepasswd, config->iv);
++    ctx = EVP_CIPHER_CTX_new();
++    if (ctx == NULL) {
++        die_cryptoerr("can't allocate memory for new ctx");
++    }
++    EVP_EncryptInit(ctx, EVP_bf_cbc(), safepasswd, config->iv);
+     encoded = s_malloc(sizeof(DAT));
+     encoded->data = s_malloc(8 + size); //Blowfish can grow 64 bits
+ 
+-    if (EVP_EncryptUpdate(&ctx, encoded->data, &olen, unenc, size) != 1) {
++    if (EVP_EncryptUpdate(ctx, encoded->data, &olen, unenc, size) != 1) {
++        EVP_CIPHER_CTX_free(ctx);
+         die_cryptoerr("error in encrypt update\n");
+     }
+ 
+-    if (EVP_EncryptFinal(&ctx, encoded->data + olen, &tlen) != 1) {
++    if (EVP_EncryptFinal(ctx, encoded->data + olen, &tlen) != 1) {
++        EVP_CIPHER_CTX_free(ctx);
+         die_cryptoerr("error in encrypt final\n");
+     }
+-    EVP_CIPHER_CTX_cleanup(&ctx);
++    EVP_CIPHER_CTX_free(ctx);
+     encoded->size = olen + tlen;
+     if (encoded->size > 8 + size) {
+         die_cryptoerr
+@@ -123,20 +128,24 @@ DAT *lfsdecrypt(DAT * data)
+     decrypted->data = s_malloc(data->size);
+     safepasswd = safepassword();
+ 
+-    EVP_CIPHER_CTX ctx;
+-    EVP_CIPHER_CTX_init(&ctx);
+-    EVP_DecryptInit(&ctx, EVP_bf_cbc(), safepasswd, config->iv);
++    EVP_CIPHER_CTX *ctx;
++    ctx = EVP_CIPHER_CTX_new();
++    if (ctx == NULL)
++        die_cryptoerr("can't allocate memory for new ctx");
++    EVP_DecryptInit(ctx, EVP_bf_cbc(), safepasswd, config->iv);
+ 
+     if (EVP_DecryptUpdate
+-        (&ctx, decrypted->data, &olen, data->data, data->size) != 1) {
++        (ctx, decrypted->data, &olen, data->data, data->size) != 1) {
++        EVP_CIPHER_CTX_free(ctx);
+         die_cryptoerr("Unexpected fatal error while decrypting.\n");
+     }
+ 
+-    if (EVP_DecryptFinal(&ctx, decrypted->data + olen, &tlen) != 1) {
++    if (EVP_DecryptFinal(ctx, decrypted->data + olen, &tlen) != 1) {
++        EVP_CIPHER_CTX_free(ctx);
+         die_cryptoerr("Unexpected fatal error in decrypt final.\n");
+     }
+     olen += tlen;
+-    EVP_CIPHER_CTX_cleanup(&ctx);
++    EVP_CIPHER_CTX_free(ctx);
+     decrypted->size = olen;
+     s_free(safepasswd);
+     pthread_mutex_unlock(&crypto_mutex);
diff --git a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
index f0b3e0a95f0a..aa7091174a65 100644
--- a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
+++ b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
@@ -33,6 +33,11 @@ DOC_CONTENTS="Default configuration file: /etc/${PN}.cfg.
 	If your host is a client consult the following configuration
 	file: /usr/share/doc/${PF}/${PN}.cfg-slave.*"
 
+PATCHES=(
+	# From PLD-Linux, bug #674422
+	"${FILESDIR}/${P}-openssl11.patch"
+)
+
 src_configure() {
 	econf \
 		$(use_enable debug) $(use_enable debug lckdebug) \
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3f897666427f..bcfe5cc6b426 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -9,10 +9,14 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01
 DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313
 DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
-EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
-EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93
-EBUILD udev-239.ebuild 9766 BLAKE2B 6d3dedc0a0a8726c654b4c5aacbdd5970949e322a843bbe7b7394db4494c815b02854962eff06edbf75aa46d8405c26f76947a8c94c28a3f481825b6c306f446 SHA512 496cc3456b0b94b29d81e3f092cf693b6b822c9dd057f5da4403fb1c2b465442724ffc73f477b9b5af8e69e579d7f487278863a6b9ad607aa6b46b81bd62d1a0
-EBUILD udev-240-r2.ebuild 9664 BLAKE2B 2816f914917b91221545e7bb77ba18a5158873d581c973e812e943472884ac4794a71a3a21ab4ce95d7bbd16d525cf3c9472ed41500fc88322f3418685b99be2 SHA512 618b7b0cd646409b9ea73576c60685e94f0769330745dc2db0a1edc9281d45405adaef645c00187570a0c5d8ef283c7585689f782d80817b6296fe84dae7f51c
-EBUILD udev-240-r3.ebuild 9664 BLAKE2B 96799a2cb4f347e45aafbe2a2b0dfbb12b574be9b62fd21f4599dba948ec5ca683b1899a1aaf3edcba37882e9516949f31cb6f2b675bd280a0fc8f3f3214b20b SHA512 847f2cfd167c225819bc2264368407f0d896a9782622f60475b89d9a2f3ec1085d144e4065d8b728e642f57f231b951628bab142d70805a6432a7f414cbc8655
-EBUILD udev-9999.ebuild 9564 BLAKE2B e372c292973ac0b83f1fef60199d7ab31ef80cb0208f3ef34c52b3357fc684d9afd3fdf5e1cc69a3296ef65781a90e55f4e9fbba579d55cef7be2db8058288a0 SHA512 9e02e243bdd6bf01349bc21619cd4033be65c9c2bb22449cee83cfb0966c930df1a6f5dcc74a610e27006f81eb0483a976cd6d1e9cdb21174cc02e3beb3f2436
+DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
+DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41
+EBUILD udev-236-r1.ebuild 10048 BLAKE2B 8813b56cbd71890b974be9597f75d864eeaccfed35e474d3278069e7c1c362100e7790409768e1d5dfe786313cff8cc9f5ba996798c1a1119a11f7de468ea201 SHA512 f740b9d26efe64e42a7e8b64f0d4222aca3606e8f98471d934674213874ceab76afe2a8ed9c0a677aac9a3246fb0eb6cc97f5c662e9d33dc0591e1ad4ba230a2
+EBUILD udev-238.ebuild 9594 BLAKE2B 8f708567f1629fda0e96f72c53ced2618f9201f6ca996f74d972795597adca12f89fff6852b6624fe461aa810d13d821dad15be68c24973d2a8d09f67ae5e0bc SHA512 145d3adb943a29c75e8b97b01a154fc5d0b21973696bc86c034d997bfda060ade5d72e255d3752539cdfa160c4d2cce7b8ab0ab928b34cd7c510d65e53decd0d
+EBUILD udev-239.ebuild 9764 BLAKE2B 00d1cf0c670919c7ae76ef0c522f9dcd972d2c5a9dcb28b27b0740e7b087b77e1080297732101412b146bf31c05887a81ec191649e70b86f8662e23b8fbb054e SHA512 1aa80b0d44d1107f17e8907141b51340ec02366ffd49e4c3c444359484391448c8404b6823fc670c6a7ca8b6b256b928ba8ad7e64c1c4fadee8213a71de3c7ab
+EBUILD udev-240-r2.ebuild 9664 BLAKE2B adf21d3fba8960bb90328ff19db2186c8a89aae584ac9745affe637eda0263c6db0dc2b920a1ccae12661cddc5ff010b10c3e30d6310fd03ef499b9116cf3f53 SHA512 f44c4240c85f9bd0e070ae9bd529fe06c79f5bc229703477107ea9937037b130e48e576a092b217ff73bd25e1b72ab592edc7f09553a69f8488eceeeac368ba1
+EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383c81d4c687ee8cd33bc4fc00f8792a8d862fe1d966880b59d89560748ceba562c8b8bfa04ea02ba4c5c7332a SHA512 07c752f8f4a12777b909748a729d88b521ad4c720703244265af5120cb3846d9289d125f02e9aa6b8bd2275111e8fa329561f20df388d89b0560de4367b00a32
+EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
+EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
+EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild
index fbd64daf5c41..ace4ae355624 100644
--- a/sys-fs/udev/udev-236-r1.ebuild
+++ b/sys-fs/udev/udev-236-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild
index 936975acbedf..0aa97d85fa66 100644
--- a/sys-fs/udev/udev-238.ebuild
+++ b/sys-fs/udev/udev-238.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
index 9c0ba4257fa5..02cfd467af47 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2003-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
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-240-r2.ebuild b/sys-fs/udev/udev-240-r2.ebuild
index 05b9ea36bd9b..9772ccf7dcb3 100644
--- a/sys-fs/udev/udev-240-r2.ebuild
+++ b/sys-fs/udev/udev-240-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/udev/udev-240-r3.ebuild b/sys-fs/udev/udev-240-r3.ebuild
index c4dc4ee986fe..e7251ee0143e 100644
--- a/sys-fs/udev/udev-240-r3.ebuild
+++ b/sys-fs/udev/udev-240-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/udev/udev-241_rc1.ebuild b/sys-fs/udev/udev-241_rc1.ebuild
new file mode 100644
index 000000000000..ba1551d202d3
--- /dev/null
+++ b/sys-fs/udev/udev-241_rc1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=systemd-${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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	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"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.40.0
+	dev-util/ninja
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	local PATCHES=(
+		"${FILESDIR}/236-uucp-group.patch"
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	into /
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-241_rc2.ebuild b/sys-fs/udev/udev-241_rc2.ebuild
new file mode 100644
index 000000000000..ba1551d202d3
--- /dev/null
+++ b/sys-fs/udev/udev-241_rc2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=systemd-${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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	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"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.40.0
+	dev-util/ninja
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	local PATCHES=(
+		"${FILESDIR}/236-uucp-group.patch"
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	into /
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 7934423439b0..ba1551d202d3 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,10 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	MY_PV=${PV/_/-}
+	MY_P=systemd-${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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
@@ -49,9 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-26"
 
-S=${WORKDIR}/systemd-${PV}
-EGIT_CHECKOUT_DIR=${S}
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
@@ -80,6 +80,10 @@ src_prepare() {
 	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
 	EOF
 
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
 	local PATCHES=(
 		"${FILESDIR}/236-uucp-group.patch"
 	)
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a58933a059fd..10fe87175dd1 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index f8925705715b..d41c94d16927 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -23,6 +23,7 @@ EBUILD dracut-046-r1.ebuild 4721 BLAKE2B 88e0b0fad86e6cd97ed38ba86704c483d3685f2
 EBUILD dracut-047-r1.ebuild 4650 BLAKE2B 6847c8bc55aac1ccabaf258577a0cd07d749a54c27db9338d845db1905974b5a419f88b2f76c5769d5765e01a714c4de3bebf953625a4473f0cb0373d2e157af SHA512 c20892b9c02e27c9c3af59abef2adb90d3410fe889f82e1a74855ff3e87d3865483728d53a9898c82fac8824409ac3a1c65f23f53c0e63491a7cbcc5855b64f4
 EBUILD dracut-048-r1.ebuild 4547 BLAKE2B 891990985f6b459377f94811840774b86e01225b6996055ad050e7bc71331f7d10494f7fc514cf13df68dc3441b4726023bc871e8b50558c88db528289158c96 SHA512 3576ec29ad05c2bec9406b21dba1e207491a2cb9e7d054d522affc4501020280e2fe3357f6d283ea4c2cd9770ec4d5e2fa6d73bae86597d736da5db1f3e0c510
 EBUILD dracut-048.ebuild 4467 BLAKE2B f6c816fac85d808363953c15cc73a7d6da99934129de297258114c6117a711b58aea818d568604215b3bfc7bf86934130c358701bb2380fd559d2bcd16fe69dc SHA512 11062f8ae2506bd54f6bb784c6c2be6416748fcd84a33554e4b58d66b87aea2b3324c2216a01a211e9bbd207e7e4065537cbcc5bd612b6aac46e2e0912ecec77
+EBUILD dracut-049-r1.ebuild 4608 BLAKE2B ef723d0d0de4492297fb64e55900052b394185bd5ea13cd0a2f8c76097358d88f4099b36761f6c52e061e7cab450e86f1dd2a6130d2fe30001368863da46a1c0 SHA512 db762da656abcb3be668cf0364fb37bf188084fb6fb43538d1243c29f29abaa37e26d9ff14f1fa817bead8fbfff3543af24b47752afb241b260ad28927139c45
 EBUILD dracut-049.ebuild 4808 BLAKE2B 70418167cc13d508df24865d2c598dd208ce92963acc0c67b3106e24f3d97c8d82766cec91bbb475649b4003a2590f2279c663ff5b4b8785c3618c9bdca21f09 SHA512 cc9568f59f5d5be6605ff679cbaa55521beab37b7c9438fc096e4ceef7f194c6b21f35f1da177de17816eb7a1835bc27040b3ae21b3b31558e2606e7495e817b
-EBUILD dracut-9999.ebuild 4783 BLAKE2B 977f72c78abe1e4e7275ab877b88c62349daecf529f4512b65296321f83a275c87398e2815402e8cee8b817afed2c1e54fe0f548d3c53d665f277ad352f61a6c SHA512 7d5cbd7ca1ee591e9521d0242286e983e40c4579c8aaa1e1a4be0fbb50ea044f90c32a06c8df3a1f131d8ff4c70804475c21ec1d64904587ca2d66f36fc90322
+EBUILD dracut-9999.ebuild 4407 BLAKE2B 351a1c88eb87f917c21528e2b1cef687b56cf5efac983ac6b62ee5cec58d23c512b8476b3b5f50d757941c4cec92b6be824b1591a66b895f0ac7e9fdbc25c89c SHA512 504621dd47df55274f0f725eb1f6af70276404e12fef15d047e4a36ba5cca356859fd2a69dfb0405f2f6ab105b29b76cbfbce9b225e40121e6063fbb614dc92b
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild b/sys-kernel/dracut/dracut-049-r1.ebuild
new file mode 100644
index 000000000000..840818b1317b
--- /dev/null
+++ b/sys-kernel/dracut/dracut-049-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/cpio
+	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
+	>=sys-apps/kmod-23[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+	)
+	>=sys-apps/util-linux-2.21
+	virtual/pkgconfig
+	virtual/udev
+
+	selinux? (
+		sec-policy/selinux-dracut
+		sys-libs/libselinux
+		sys-libs/libsepol
+	)
+	"
+DEPEND=">=sys-apps/kmod-23"
+
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	virtual/pkgconfig
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
+	"${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
+	"${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+
+	if [[ ${PV} != 9999 ]] ; then
+		# Source tarball from github doesn't include this file
+		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	docinto html
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support" net-misc/networkmanager
+	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with rsyslog" app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 7ccd4d0b0e56..67bf16fda20e 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -83,17 +83,6 @@ src_configure() {
 src_install() {
 	default
 
-	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
-	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		libdirs+=( /lib /usr/lib )
-	fi
-
-	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
-	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
-	insinto "/usr/lib/dracut/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
 	insinto /etc/logrotate.d
 	newins dracut.logrotate dracut
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 69bda250ee65..20c3ad77c30d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -4,6 +4,12 @@ DIST genpatches-4.14-100.extras.tar.xz 17488 BLAKE2B ebed8f0992ea03154bfe052cd23
 DIST genpatches-4.14-102.base.tar.xz 2384780 BLAKE2B e4aacdad6e343937602ea8afc7a8f424e9d8d4d95b6d0a292ecefb6637eaf4bcb4a36534028b8a4dc330af99fa9f393def378c52c01a6b9128c8a261acffd413 SHA512 bca0461c7f2b9923c7aea9db4a889b5526b2c73bb3c338f2fe88b8e150c61c945d8ff7209007b3e64515f040e4f0f96026bdb6434fc59927a8d5e6654b87f0fe
 DIST genpatches-4.14-102.experimental.tar.xz 5220 BLAKE2B afd0d957c2181853b11a924db61f007279ff5df5377e2defbee68e4942cded4762c9d05246f181726f79e455c366c0c852ffa1508f2290ae6b16363b2e765347 SHA512 bdd72d25455a4e99654cd241b36e3db993d9b4ad2d4cc9899a2f41da398064b577df6dbbc441251e292be35463fa404658dab267144f4c6f614be471c0973efd
 DIST genpatches-4.14-102.extras.tar.xz 17496 BLAKE2B e20235bb1396981a2074905e613f8448d1a01c97070d6d4285d3fa223f2ccc9094fba8154d629b78ac55c5917d5d0a3ed126afc10dd3c0a2ac6ad8d763661d81 SHA512 6e734cd3a48d9b9a4c3ef8724e11dda156d2aa6ebd4696058da16b11073f2ff9e547117ae6772400e228b867366dd241f847a6580d0a17548842442ed89c7da9
+DIST genpatches-4.14-103.base.tar.xz 2401436 BLAKE2B e67babd06bcdb0768773b58b33c15e4c004a35bb288e0419b010c0951c9424d3a337f56730686a86be0fe8e378dcb12d1608aabc75d9f401f9139db30d88cf6c SHA512 2796b82883b3eb77f49a6b9bf6a82a4db2f89eea7db30fc18c8627bf84ef47891b932cd80cacb9a73db52df88800e20ba76da81ec3d1e3b70c6ff674cfd11830
+DIST genpatches-4.14-103.experimental.tar.xz 5216 BLAKE2B d76bae1d0e142232829440d6b4c770b65f6772988ac45111f10ae3ed04ab940af1045ac6357dd74959424834de143a4acfac25d6410201ae5b9c3099900ddf82 SHA512 c8e96530f5dbdbc3470623c464b8c6a6e5610d496a58f77ca2f8e8a38af58604137d561c07bd5ec49c372cd9aca04d248c7cd57be848d09ffa9c9a461c9d5dd0
+DIST genpatches-4.14-103.extras.tar.xz 17492 BLAKE2B 3bcc010e1328cdf73be13670a8d7f407d291bbc349f5cc2bd7c85ba64e51c4a00eb4036d5dc4387ce5b88e22c5378c3620de53f423b4fce0106e5763f49ca721 SHA512 9cc9bda6e490336b848ec4daccc953d677db3579018fb52c475135e4837e03f1ce8c68c3018b564eb5b7c83bf0a7b7bf7c5ce144c6e0e91441fa80caf6cdffa2
+DIST genpatches-4.14-104.base.tar.xz 2421112 BLAKE2B 099a88ffe5bc7e984bbb671fbb0fb05dacb768e325b51c14d402f4ada02d92b7eb6e6551eaaf8e47421c82bb94a2775d5819679f6f0e0cd059271c8421161843 SHA512 c83a67438e147308d1fdd63c2c753b6d9b4639a116324943c30ce740d7cbd5b51c3dd045521ce32e859fac57b1c506c6df25a59a87601f6589668e5e58e20324
+DIST genpatches-4.14-104.experimental.tar.xz 5216 BLAKE2B a7f742e87b4ed7b05ef22258dc40179cb62106f46d0108f6fbc8e3ec552c37c35ba0d1bd77fac7f0936b5b1910247f1f62cdc393129bac047fa32089fbc1b48d SHA512 bc868b470bc0ab2dd711a126cb1c0854db0cef0b1787ba08d26e4adc4a28820df1d5ab2bf36d5f8f14fa0b40fc1055d0234bf81a0c0ef8557f17a9823509228a
+DIST genpatches-4.14-104.extras.tar.xz 17492 BLAKE2B 1bdf77061ec61cbc10afd498b18dfb21425edb5ad0639e95cd0428992ff7b58d8a724a82ccc9edc7dc5f3cf0075a38a609701cb68ae10a477e472aa6411e28a5 SHA512 fb222cb437978aaa7773984450a3c5342c0720fda746a2b248935c8fa83c70e894b527e47526b77ee1e75a838bca41c0b822c9bb383e1af598585f8974732b31
 DIST genpatches-4.14-90.base.tar.xz 2158040 BLAKE2B 1fe37fa012c110dc48f5291c149d23d544d9cf11d691b026c66bf0b632525d28dab5521fc399de34a83e9017522aa9114f95b7c0c23043ec27204af1e4c77caa SHA512 cf1dfa59b0c83ab4cf4f345087d9d89a03d32265cf9c4f3896474f2bfabe616f8a4d0bf8f7daf584c129023e9d4f47cf151bb7aa83d06d2ee440ecf9f8c6e72a
 DIST genpatches-4.14-90.experimental.tar.xz 5224 BLAKE2B cf3e25ad929a3822aff357164ce27b3dc790dbb2c7e9a75f9267ef0cac49d28bc2538b68b86ff34a81789f9ec7e8ed82d0a3a71151abbd2ac7e3d8475026c14a SHA512 beadc5e4b5161d231637123bbe54e5afbdb47bbf1bc2ef1b44c27560c81827e0f9960a851807b2accc3fc3d325d3634593d122113973786a7bd8f9d5a61884de
 DIST genpatches-4.14-90.extras.tar.xz 17484 BLAKE2B ec51340486f3fd053a228b1302c1a59b3b5100cbf55c96ab07e242479081ea05b2edac3c325df520bdb38daff689a68c63fd9abf0557e5399b681507605c3a01 SHA512 99ec816bd994a1d33d254373878cfa68acd0ddcf7a56237442247d222e41263f8fa1ba9d5494f32748a1990e3e20d0a4768f28e23f8148e83b884b4f637bd2b8
@@ -22,6 +28,12 @@ DIST genpatches-4.19-17.extras.tar.xz 17492 BLAKE2B 110ff2eaf3d85ef4ddde7fb08851
 DIST genpatches-4.19-18.base.tar.xz 552216 BLAKE2B 9b8e7d495216a9030edcd263c567a56c7d6d33ee3d046098245ce0b9bab926cd903f235dbb1800027f8bfa2d60d372420c69e03e729b9d6719a0231cfcdb2568 SHA512 c4869326f40b600739172ac34e4976edef0bbe8089a9cdb5d0dbeefe5bf1cf711a2faaf75a45965b063f5d5d413dc62591983258967df4804a93a54ec9dbe9fd
 DIST genpatches-4.19-18.experimental.tar.xz 5220 BLAKE2B 9c92f61f1c844fe2fb4a612ebc64ea4ba403893fabac4d6234d862a23bcaddb5c99f5f7ba59f0d7c8736a8d5c2299c17b08bcdef1e93ab4b0a8c91911a3a25a3 SHA512 d4c1302d4b6d792a55a30f69eb46bf92117771f51a3015cea276d67cb1b4e90a19112965a60b0001cc882a53a1aa48455191ab743f43f16cefd8a2999c9c0397
 DIST genpatches-4.19-18.extras.tar.xz 17488 BLAKE2B 77d2721df6ac60a06cfdbd4e5c7666bdbfce9be012481c462483e94676ee5248f85f54bcc6318ec58e1cbcbdc0748bd8a4d7cba27c6c80949bb84b2b5d3acae2 SHA512 3249c3e928eea59a03092935477425e3aa98bd8f3b3fcef7e198da7a860ee51303421256dab3b8395fbc76aa17e6b24b8587909271873c146ca0ee72eeedd76e
+DIST genpatches-4.19-19.base.tar.xz 584988 BLAKE2B c29406a5c8167406aa6712f740ad9963fd1089536e2f70e3024d093b0ef9683a1f5068027fa638ddeef862f2e38642cca00a5941fcdbbf9f0b08e138ac993036 SHA512 1e1c31578cdb04c8010b864753fd6615cb7d14769bd1d45ea83f5b56b56b8b1d67c5cc8816423f2c05aebd800d156aabac2d3076ebb312688c61c222e8f488ff
+DIST genpatches-4.19-19.experimental.tar.xz 5216 BLAKE2B dd42778911b90fa279730e86b09aa9fb094a7f7b43570632a80d70c0abccc69f133d6b40b45899afd965c3aad585782dc81edd1bf2b28afc2afdb25bc969620c SHA512 64c1fc147e2cdebb6f21a489ce146dbe730a0fcf63feaf1983ed0de223a4a97d41bc5f3bd585872c5abee79f74120d76cc7fb7f94c3ffb32013c4a36dab63221
+DIST genpatches-4.19-19.extras.tar.xz 17484 BLAKE2B e3b57dc25077418b254fdc6eb747e50de269c4ca7375cd63120d1dcec0e9ad11e98de01838b92fcf5476c9843b2d8b079330abd07919d27a6915b229fb379bb8 SHA512 9d78708a5ebf7f9703192db8d01b99703ce06aabe6de4f92f5fd9afc58b2ebd7f7683005ee49dd1d0bb08e8508030aebfae7bf64bdb7d8bb38866f83760caef4
+DIST genpatches-4.19-20.base.tar.xz 615520 BLAKE2B f4620dfeb70ec0e406652e71ceffdd878b8fa7f3a6235decf8337572dcbaaeb2521b73b351dd59e93c7fe2e1f40d0dd853d30e157a599eb73115b8b339165623 SHA512 4fc47bac4ff23e0bc4550f8e6019e9b10f288251bc19d48bcba1ee0db1ced2f3788798eb1ee3c0d1e2127e8c48f8611b01f88ee59acb2135e9c848572421d945
+DIST genpatches-4.19-20.experimental.tar.xz 5216 BLAKE2B 37f293162cc78f520867a16f0e356a5cb39975d95d5167b06ade5f31a89f3d593c60865abcff54676219fbbf000ca6220b0ea126d758a0a47c9cedd278944742 SHA512 a2a46c9c7a1c88411879705235a1316635642a1ef7d0c15e55e375d8caf0decfac4b57d695d2a1f00ff0693b19c209ea91ae650d8c97c07da1dacf98d7f0c725
+DIST genpatches-4.19-20.extras.tar.xz 17484 BLAKE2B eae292de6e308aa4c45a6282b0333a320042fe75cd325eca0257f6e38c2b71639cca24757b9fb40b284a5dc05b0900b4bf85fa111740f662a2e4309f8f5cba9e SHA512 d8cf1e87b9814e1db1c2745a6a16fab46303042d621ed0de7c303d5a416f60e0ccea71106988fbb85cc65e6b6978c2dc0cb67704ca29b7c6aab631637c8d7913
 DIST genpatches-4.20-1.base.tar.xz 4008 BLAKE2B 3d4e9420d01fce23b89d54487abb0dee4082be5df9ae6b1ebdf9b491bcdc73262c08d26e119527d3da1169c24d52236b47fd7b8089eae9bdc0f888e60225a6f3 SHA512 a8d75d79bfdff5a31478a147117e0e2630b42dd50ea3a07a8c7b52de4a768cc191a38a36c323a7ca2288eb64d48b74d862a7f827346944a252762ee9b3f566a8
 DIST genpatches-4.20-1.experimental.tar.xz 5220 BLAKE2B 20417cb43be021ac767c0df7afa1bb4dd421fc08c49e0a5e53b91c431d3b95f0cd100bff92d0f827becf096431661bea2b1648c2465c9e336fa0519e6f3b8eee SHA512 ef91e66de331c25336cdf2f61fd5c78746264ef1e7af04a92d961237563652e7022376e63b3fed7219210f11ca64429f3893b026947f411a6c2642e630f6fda3
 DIST genpatches-4.20-1.extras.tar.xz 3268 BLAKE2B 48dbd360602ab2c7b8f5ac41fcdcdda93477c82d59ac426945aabf1b52868817e77140c289c3f2920b5b39d2d38ed49fcba5d3474203ae5a8a206114af9a8216 SHA512 158cfb239a003e0c8faf57a3919549629850f14ee9f61cccc4a0268d13b228ce4099cc7ba1fbb057eb05c1a9b3cc6315e95f53e23978a81a63f461713d2a76d2
@@ -37,6 +49,12 @@ DIST genpatches-4.20-4.extras.tar.xz 3276 BLAKE2B 52a38645899b74b35005cfe9ccb297
 DIST genpatches-4.20-5.base.tar.xz 127200 BLAKE2B 9193205f7664329527bce907190a27c57860a5dcf78bad85fe32d6179cc5f6bef10c32b7d590345939cb13e58b706af31a5b92fe71e6ed7ec1380b1684c8e5ec SHA512 6a8f4cf3c8698d47269d5a9dc7bba9698eec09c1cdbd3c04a45f9ffd62413af5ad49ea27f828e8db04761b6cfdb511023e770dbeaf277b8e221944842043f567
 DIST genpatches-4.20-5.experimental.tar.xz 5220 BLAKE2B f3fb705b557e1f5a3df3d7a4d883e217f2992d25fc9c5cd12596bf206d684542d81099b1cf4f4613ae45419921347ed1e0127cc59b9961ee69b3ee31d15065f1 SHA512 6414608e1769566715b4d6aa1e737d7053b3613ccbd3335ccdc0d1dccbfa9b703d8d1477ee3226ed285cdf1cdee123d8d714d744eb32172b58124ef06826c773
 DIST genpatches-4.20-5.extras.tar.xz 3280 BLAKE2B 6f6f5cdfaa9c56a5fc58586a8c27f1bb03fb78688eda91d7416c481750dbcc21589738ce1d41c226afab37afb73e46473f12e2494507f3ff5cda449ac018f42c SHA512 29c6e097b7f988990bc8a54307ee245a0637997191e9e827b6a0aec03cf7c803bfd985729fff6ab15a93f3927825e85286279a7e7da892f5557acb17d5f1736d
+DIST genpatches-4.20-6.base.tar.xz 168964 BLAKE2B ad6f2da4b24288c4552183e082db374c55beee20fe2e6e6fe762472ddeda009ef5c85d0dce8beafac3534218ad817c663226d9e6db038ac38433a0ac6c8cc02e SHA512 1233efd5d1325ee6da4f0c78181f7254377d09953da059f26ffac227240f5dd083cea69695e2eba219cbc17f66649922086794474a30368a6ef9bcb92f53182b
+DIST genpatches-4.20-6.experimental.tar.xz 5216 BLAKE2B dc1153af5e5bad993ad95560dc583146fb9f0fc032f88c3eb82d951baac6d4d6719660844e42bf79474ccbdc1ec6c50bf752932b40e205187c8312626fef9702 SHA512 0579f47e5e632af806a223b559086d0c9c5e7ee582ee3dc171a57b8ae9060121cd426cd44cb40caf8fd171a84f629fe434c41e24f29855cddef672d5aff51f61
+DIST genpatches-4.20-6.extras.tar.xz 3280 BLAKE2B 4da3653298bfe1242aa045669aa387dc40cbe67969eca6005187f89963e674ae942551a7a501e174ab3cafec16890a86dffeb86843a66ffb7060714bd8d7280d SHA512 0da990862dd6b641fe8900110c5d396d94b18491c1f9700bc48611cb5878233221e30aad54a1a0c5b12e05cf0132136be07531ac16c082435cc0f8c997b33471
+DIST genpatches-4.20-7.base.tar.xz 206500 BLAKE2B 6c319de96dcafcebaaa1477f4cb3116749d8443e1b2ee50ad502f7693a7f15f398eedc4beb96e0d33d748d6508d63a17fbb1734accec515fec291ee4bb000f92 SHA512 4776b9a193eea2623be4c131e83126b5763b9a7e578585f6f777eeaaa346199414cdb1b1ee0ed5e3f7898e35a3b4303bdd6584e3454db616d299157a3107e57f
+DIST genpatches-4.20-7.experimental.tar.xz 5216 BLAKE2B 1813ee1abee9f62a1e1b75b8cbc9a69815f77b04929e4273d35594283abb76a5c188a9cad5068b1215cf956a81c3b1f05c44d16f13b2486d2ef44f91c067918b SHA512 32d285ab3bf91dee85658c9013a5c00a6ecbfaf6c281eef515275ac5530bf1e75f36aa4b5af87369a0fa6500e30525561e1b475d9fd80f1a04f5292bac8714a3
+DIST genpatches-4.20-7.extras.tar.xz 3276 BLAKE2B 658d34dfa1ec5e3b0d0013c38636f313a4e653d90be00b42f8224790a7e35787b83925101cd25e8154767adb2d7c4272ddda77ac887631407420cf7fb77f5779 SHA512 6c76ed48816b1c94da76d312820f60a12f0a01dea31e5b1dadea0270f297a81d6cd1740672a354a15b88577c708b4ddb94fe0086015242dbc59631ca3fe627d9
 DIST genpatches-4.4-165.base.tar.xz 2476424 BLAKE2B 930a62c7b5f697e1baf2b999b45123778f2818a33558343592cf7273b2b376c8824700b2c20b71efcaa0991717b8ce654a222d2dcde8ca3bf1b3417e406117c6 SHA512 b29767c1ac47e9b3c7f3eb7cc833939db964901c6dfd36792ec4998dbb97ae6a21a8a7ebbbfd6eff74ba28463eb868385324c1069130ad0cfa55b33323673993
 DIST genpatches-4.4-165.experimental.tar.xz 87776 BLAKE2B 65271ec6c063df652a7ad1317c37c8eaac9a4a93ceabbb56bf8c8de43a49b6ccdf6f22608acc061568cee72208fb62ae98d9b363666c7e664b389c482bc17527 SHA512 af7d9389495ace3aa2fb93d1d77e7f5204df46547f0c84ae820352fd0381acaecd1f4a41ba5a4507c2a30ce5b6928b14eb88ec120a87247b0cc742fecbd40f64
 DIST genpatches-4.4-165.extras.tar.xz 16452 BLAKE2B 59cd1eabbc61cdf547f21894e137033dfb7ad71b1bd2f1f47c04de74602abf548e504de5a95d557c805d72edf70455fe0c3a34d3918a91b177aaa3cea17b9194 SHA512 42464d2bfb847e869a2d6cbcca3c86a52840039ab975dddd9244c60d58fce671703c89e880cb49e1fd19eca9e9ab9367a44fdbd30b78bd68a7ae5cd2b1f23dba
@@ -46,6 +64,9 @@ DIST genpatches-4.4-171.extras.tar.xz 16464 BLAKE2B 8d5b0122b0f05a3ef397d3d043e3
 DIST genpatches-4.4-172.base.tar.xz 2603600 BLAKE2B a75d4a7fdd99fbcaaf3bc15bc428c9b851265fc4eb53db145b9da2b43cd3d012c00c48b18374257e20415461392dab78cbac1bd82df562233828c3546b89754c SHA512 f5499b98b5841ba40804b563fe2d088e5ec1bb9821092151f7db3ff76bafada5fd6920d23af96265c4adfebaff30a6940ce5485118eebe4d8eeec8aaba18d2e3
 DIST genpatches-4.4-172.experimental.tar.xz 86264 BLAKE2B 1b8c3dfc8382fd881e32e3e09d886c738524d08b98251e71ef9ddea5aa4da1a2bf91f7302bac428971c778dab115d0ef3747db307dbf0c59ef527b45e9a35bd2 SHA512 61da818efe559774d92b3e2b639623689da294436125b9aa0631ab54651f59ec622d03668f2b103d0cc4c7dead99545b06586be42fe64b482b218dc0c71e00fa
 DIST genpatches-4.4-172.extras.tar.xz 16456 BLAKE2B 9432af3f45d68ed5c57b3bb4895819d8b8f1a9d15303a55f79774c3e212fdfc9f304f0f3be258e5dbbaa81e5bab3196e92245d53deddc9b051fe2683536672f0 SHA512 d00a801eaa410fd5b36435572efe053c67f5a433542ecea3540edd57242df6fac79e617ef53579dd4aa1a25a557d727ba2b9b71adee832393cf4c3445d9c55c4
+DIST genpatches-4.4-173.base.tar.xz 2630324 BLAKE2B bd231f5e2b94b0206f571b1266044751129989b9eeeef55fa24ff3e4f81ff04976825a2da45c7c2834eab53ea6bb464913972543a0b52ce118de898c43b4ba2f SHA512 3d8da2374df575fca69f98acc326dbeae6cd077e336fba9b7a72dbbfae36b7b3f44d0e3648a9b69a234892434ed8ccc9bc10bc667247b666e0d599a029b7cc68
+DIST genpatches-4.4-173.experimental.tar.xz 86244 BLAKE2B a26ba501777b8eef29b96dadb17e92fe17459d82a73334a37a949cf6154606b555e69bc131e78a0a11b248fb171749fd9b0e3aa747cb12c7b467d9bb538e6852 SHA512 182ea944e802136106f7284f37a1cc7b4e174810073f97ff9a3afb038a252ebcb242898a86eb989f724e880dfd84e46be4345b8bc0c619e02142ab3113dafcdd
+DIST genpatches-4.4-173.extras.tar.xz 16472 BLAKE2B ba667531435c753c8104488b72a170519d91828b2472bfcd356c994f1ce21e85783f871cf655cdcab5e8bec17a6ce8b41efa7cd49dd926188299d7288d4737dd SHA512 afa676666c57983feb8e13c5646e8ee0bce54fd0876e77428c74568aecb3c6f68b42b4f7ede5347f98f663f352b54da24941f76d717d655251720d878de43c6a
 DIST genpatches-4.9-143.base.tar.xz 2635856 BLAKE2B c8e1b4ab6b2671197ba871ac44ca2864353a60dade404a9162fcc7f2ade396750bc09790f181fb481fbb9be6eba659a18ee1da5a7eb3217e3fafd2ac791048c9 SHA512 b9909f80946fbd6ace58ac4d1287052c484067b50c1525214469d94b161a729c55416fdb832aab3d21c3251dc7037af1fd2d3eacc0c287bf2693775cd0580cbf
 DIST genpatches-4.9-143.experimental.tar.xz 106420 BLAKE2B ebf0732574b2d279294631dac3cca23ab17efd97c9887b552cb5dac0e2d5824b2718004b1e8c72f77db85c41e16603661f29b2357a6d9911b03d0c4cddd5af0c SHA512 c01dc29b60cdfe8f1f8bb24d08c403ee2f1733f4d3c19f84c8d92f9edd1ef88d0b7c66bfd7149c5c5f36c5eec2df159e5a4c72c2f93a8c1ce3088967bc3cef61
 DIST genpatches-4.9-143.extras.tar.xz 17348 BLAKE2B cf56d86e29ca96eb16a0c03471e11b2056b17e0a10ad5f235278f845b64a070d2411078683f7d7bbc5b362f5474324fe1edbc8a9b92550aec283f379be52290b SHA512 7fb07663526a924428f1e7c30d229ea926a69dc9f696b92cd1282ca6f168eac6bba011d8eb0fdcd5fa51241a6203c6e8b9def9e0011ccb1b0b657bbecbfbfa72
@@ -58,6 +79,12 @@ DIST genpatches-4.9-154.extras.tar.xz 17364 BLAKE2B 2935c9d08ae7fdc10aa674b074cf
 DIST genpatches-4.9-155.base.tar.xz 2790428 BLAKE2B 8c3faf5c3bea88b3a5050238f843479acd59ce335e1c4b0b50a22a2981d17c6a0b888b83a8f3494ae83d58bb622e07e2fad8d7f012d0a38d3fddec3b0d45b9bc SHA512 5a71e67776ece2502b6fcd9149149945d22c8c69b5b2d6be645c771bb35bb032556c607c32b5461fa600d61527ad508b8a215f1639c82304ba331d8438b62ae2
 DIST genpatches-4.9-155.experimental.tar.xz 106376 BLAKE2B 84163eeb72ca8f5be09c89b196882a514daf8ffe4bdc07d5007c4809af503b45465d7a9726e5d2e3cd78ed81efc6d37ece88f81cc4784993285215db70b4fae7 SHA512 b1d1a3314e49fb5408dc09d6853c39ed3bdf62b02ab19bdc6f48e56e74d6052264bfdf8680386bc118dbd5ff4867dcb7a56a9cf51d14db31ad538a043bbbc2c5
 DIST genpatches-4.9-155.extras.tar.xz 17368 BLAKE2B e3aa0ba6ae63dd42b31ed1e8acaf487f6230d3f5dce59096d630019145f3da1f53e58f7417183d8906e75c0e6131266a9093d4fbaaf44db9d002f93d23fe963c SHA512 66c3bf6ad7d09c7f900abec01e944db24c4c1d7de0d9c998d77d8df6fa3405fe412a9448c3329ae67c8ee4267151c5e38837c6266933e3837401a6bcecb98626
+DIST genpatches-4.9-156.base.tar.xz 2799096 BLAKE2B 47348ca54bfd13525facdabc4447c4bffab458a215973aef6aac3bf853f7c2bcea5aefb7b7ed2865c1694b270b6c17d2a8d8b608d6b728faac441dd9152f768d SHA512 7a1f7b980f14f453b4430b43316a2e043609563940e939a45febda1add3cf0c5ae8673b8961106efdcf3af8254e902ba4f94e78ee2911451ff2a2fd642e92584
+DIST genpatches-4.9-156.experimental.tar.xz 106444 BLAKE2B 327b770be5b0960ea8f8e7349b54015be401dd324996ff6fb64461721ea3e73cb0ecd57d21caf41dfaa0266aeaa1ad81999b0f43f077f9ddcbc5f147a3b7fa1a SHA512 8ca4da3ad779c8c95c1f333e015c9fc7a0d25698a682a8a9260b01b0c0f904015cec6d39a8968fb1cbc0bb1de3101dff97fc675cc59fb86a948659e42e1737d8
+DIST genpatches-4.9-156.extras.tar.xz 17364 BLAKE2B eac9a81bc6685935d1c5af9d088e1a8cc2550b2b5fa399819e6e5b4a7947dd11208570ec2fe3ba538ca21604512dc9f6952deb57feccc1126d706d33c40b3930 SHA512 6470e5838bfe1449a83de292c1cba30ca3cc7bf72006d558b7d1b27b8fc862f3ef041075c2635af99c8d5fec93029e86c5adeb74af125e57ce667fadb4a02aab
+DIST genpatches-4.9-157.base.tar.xz 2810388 BLAKE2B f92ba8e352e12bd2aa89f0d94893a9cc78e4864641fab8233b59189ce39a593acd78312565f697f4a530cc604975a1bccd11f8a7dcff25c9281637ae911fbe79 SHA512 9b05e1e9ef1fce9838a89062bf1a3b7cfe1b60cb3efdedff510a15777a346fe0ab56a758404cf8cdc584c50b77ee4097f789c1191485a4b4c7a7bc4201b0e1ba
+DIST genpatches-4.9-157.experimental.tar.xz 106384 BLAKE2B 3678f0694c3e8b3dac977a511cb9288876654ac437e0dd5cec720dad0ac73d68099510b9b9f709c9f9d4936262e6f4ca19d0938fba551e90f3b9e0c45063bafd SHA512 5b67da3cdf115f5f9bebe884912bb4550372a0c75b26dedef0960226524966a4294b58828489d9aa05adafc25981a84e49b02309cb5ef6788cf8b22670847f9e
+DIST genpatches-4.9-157.extras.tar.xz 17348 BLAKE2B e197c1c9b2bf055ec3b2279eea0771ed8d334c3b867bfd6314e5918bda67662a59570978946dc359c81e51255dcf29db5bb997ba42c40a82b6031ff5d030b57e SHA512 338599bae831c37f83192717910d5d93ebfc42daba29d0a7c5410ffe90dcae2bea1abde2a1ce971026b53de130c92bea940932dd0fbf2547d89ffc81b0a67cc7
 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.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
@@ -67,20 +94,29 @@ EBUILD gentoo-sources-4.14.83.ebuild 730 BLAKE2B efda171dd192bc4d50f1a9728606d32
 EBUILD gentoo-sources-4.14.92.ebuild 739 BLAKE2B c0c9187459cca04fb816730930a65ee7f542117796d1755b2fd3ec8af301d08b7150dba4fb77704e40609c34642139cdaa556a8c2d78e16ecdd98e744f690b03 SHA512 72548065ec281e504f12dbd80155695d25007d7fa5741092c868062c9f6272fab040fbcc803729d3bd00d09d5b4d59edf3ae113dc3207b68b7c2f3f29f7f5bc9
 EBUILD gentoo-sources-4.14.93.ebuild 740 BLAKE2B 56000c07ca423309e195fec814dc094adcc9c2aed923eac439183b4733dd1e21d8bb78c04efe4e488cfc00609abda1de13aa5bd5228b1a317f0bbf6c531abed0 SHA512 f55dd7ed9a7df8f097e266c2abde54a2d039f3abef40276a47e01ff1fb8d0abe838c7015a8a08a3ae9f44975ca13ddec621b56d9ef9e62ff7af40edb3f7dd64a
 EBUILD gentoo-sources-4.14.95.ebuild 740 BLAKE2B 820a934475da5091274af96201656730f36bd65c297249d46e9fc1f8527300f7f6afb5e89f3d7d3e4e38aea3257aa34fa652ecdcccb5a0591ca2677d9404079f SHA512 3368ae3e576f1e92b2e32c61ec0d926a57010f98a77e2fd69177a27f0db05dd0d8188b0703c7e265eb6ded0a744f62c21b9655f9ceb50affd623267be9aac518
+EBUILD gentoo-sources-4.14.96.ebuild 740 BLAKE2B 6d9d1694d3b79aafb14731145c0b874dfa8e5616f5fadc689defcdac99e4709cbe87bcff21a143580eca08d741409e0489bee8db89a8f392c79a494558ac82f3 SHA512 55e19226a3a352cf38e2c429c71d32ed2a6c0a87d9b69d89e4630dc71c844e731cbd8cdbba1dcbe045cbc415ba3198012ced268036a524c2cb625c6c1ec8a01e
+EBUILD gentoo-sources-4.14.97.ebuild 740 BLAKE2B eaf0b7606fa25ca9849c4bd0ef0db88e5d5beaafa97d0257491c32f0366d6021c24e41c9872f2702e36864b8532644f10510d2cd81429671936bcd50820daac2 SHA512 ca65a8df8ec4dedddcf896acec507b4021984b20c2511eabb28b7f78c9f4495a481c287de39287dcbbfb91e2dac1dfa561bb17d974bc0542f0bb4ef7f609993d
 EBUILD gentoo-sources-4.19.14.ebuild 739 BLAKE2B 0229faa8188b77f0acb9de2fc6b06b3c0d60d2c217288c58138a9d2cbdf893af78b707895d59e46d9c4fc77d50528f474b86b78599e42533b7ecf36fc60fd1ef SHA512 23e0e050e3f27250a84e3458a91cec9161c24ef2359de837ab779ae5627d0faa69d873ddad2b0284fb21c0210268a0751494179d0a243b19da099e687dea6930
 EBUILD gentoo-sources-4.19.15.ebuild 739 BLAKE2B 135ad4cbb17243b8905684c03efa23f6e69ecfc2e9f169f5eed28941ce151cd3f048cbe2fc724cc55241c36148a52d07d99b81fd127a38e72fec202eb2c21f01 SHA512 51763ef7ded325cfce2cd95ae4cb08eb1d5458bcf813c3b0491af5abcdbecce28614471b80ba4e2cdd3006acca5f2fb31abc0006f0eec0d02182b61e0e7b4301
 EBUILD gentoo-sources-4.19.16.ebuild 739 BLAKE2B 47cbabbdffca7840fd6a57c3ad0491430239a91516e8ae0d7910731099a13fdfd1388a3226cca41e01dbbb299feaca006a6396b9556e0618446b285334480a8a SHA512 3bdaaf5470f86255b0fcf1c49d35a78ac9f45bc9f96c6aa64490a87ae5cdb2658fb0b5f42f045959cf0e5ef194633eac6dc5616883502b5654cd32569f3f643b
 EBUILD gentoo-sources-4.19.17.ebuild 739 BLAKE2B c6f981d1b04b394b580427368128d6691c0e3b106f63266ad5971233cf91f792b3f0cb11fe49a6e90567a174952a8a7f45b7a9d0c8c1982e1addaa6d5954867f SHA512 06f8a799e843065682307624633474353a22853abb5c11d164ab91329f82ce86e11cb9cdc4353f2617769147ed0d1fdf1b3fecbe7967c975c295d02c2bcc1ec1
+EBUILD gentoo-sources-4.19.18.ebuild 739 BLAKE2B 504d831ec58922c1fee355282ce2aae175400d956a827749477138477b616678264f5c6fc3500b3a652b79d43d623251e920345df1f495b4459a2db11c56e215 SHA512 0af77b61f2b71ca97f900890da95004f11978da92165441e5ee64fcd7d454554447703dd015eb9fadd4d1cbd94e5d13a08375b324557c792837436ea0d0f6ec8
+EBUILD gentoo-sources-4.19.19.ebuild 739 BLAKE2B d15409a11b89a2a313ce7627691292d7985b558a284f63a780c6aa728f98ad6e9c40c4a89911867a565c24523759d50d63f14913e13370d6711271e1aa1337e7 SHA512 fe7d699f6e2d46696366db24214f9927c14f5b2c4f11b143af7bd8a67fdaf3f58bdd3a6efa723854064877bbd10db25024e4895cd785f7632199764e2b4fabb3
 EBUILD gentoo-sources-4.20.0.ebuild 738 BLAKE2B 4eb7f24fa38a5a40ba6feedc606d79bdd76721692a0a100c01b9416852c2f804978a09ef89139d1da726cae2f7784a469450c837a3dca6fab980a2585951068a SHA512 acb0bd6f84d2f9b386a74b82dd74bcef4a00b9aa1fdc429314d4de64b33c461219a800d32907f3749e862d49e36e7debc199b08fa0e6ac1ae6edb60ff2efaad4
 EBUILD gentoo-sources-4.20.1.ebuild 738 BLAKE2B 0f95fd69cb7c4768a07dda88c01e188b9cc64a6407221f28b03beb65157f4417882f1b8cb3761cbfbf41a91e8075960d22af6d4da0c0e1ce5dbcdbdc65135ea9 SHA512 3aa0e05ed8f4d0f28e9cc40d00c52785b5f086a88edc78348a387f7cb4b499b414b332192137819c7e903d1e9dc8ef9326ed067cd9d68e3d050824ac6a0ddbc7
 EBUILD gentoo-sources-4.20.2.ebuild 738 BLAKE2B 29ee49eb052a6cb44412f4e14ae65098247596a1e4d47b3e80d828729d086a3aa51a0fe9c41e9d60f1d86147330c2cb15e686d6664263374816f52252bc8c95a SHA512 ca2600abf2d2c5eb373de27c61bf572f577849ac95e981a156122aadc53482481542124c90ad5cb98aab74fe850128b84fda082598b5832e73572f74811317a5
 EBUILD gentoo-sources-4.20.3.ebuild 738 BLAKE2B f2ec5e913ded9d968b4feefc081b3d68b8d14e38f074f29c18d04ff7c9b78ae1c54de7398c55d21eec949165e12b9cfb4cec553734743836bed523682702b563 SHA512 a0561014f7305dddf1a7468a8a0795f606a9f26603ac0754b824f9f0dae81ed07c20f315093b2f4d2756d3969aae71603cb81ec9104acbe83d3d107db59d64c8
 EBUILD gentoo-sources-4.20.4.ebuild 738 BLAKE2B 0b9e2196bc47ed75bbf0bf7676eb1be8d812fb804c662673b0fbcb55633690e34a35301e46b0e9f6eb0c4a107f1fd0e0698199cb9eec03331bbccbb0d4630f8e SHA512 9ee42290476d1d2c8fc2ac29f09cb2e9681f9b72a37d9be5e723d5d8736ab4699b80357aa3967fcd1b1ab58e20784a27b1cc0dc6490c45d61bd9206936b264b9
+EBUILD gentoo-sources-4.20.5.ebuild 738 BLAKE2B 3a563b3d46eabac3a4b6fa8cc0cc2e94afef9fa9193a2cf3bc14ae03f12e3ccd36562c73b75248851bdccad2b64ea0e023217b75facb721b0e2b546a1d4f8cc2 SHA512 c6c70da5283e6513f294c99cfa97ae6d69d93596564b82b81ea2bc188030e5c26e729de3b25b7a0cc7e76c7eac69d65a2d6e09f91cf236b1b7e636dd00681655
+EBUILD gentoo-sources-4.20.6.ebuild 738 BLAKE2B c61efe89320428b1f993491fc821976b28930fb076dd20e2959cb26960b43025d5862762c3c9eabbecee8766eeb479a701d962086f5d51c30b03dc40b83a75ea SHA512 de0986e0b957f6ef2f8fe88e784bd05025424b29f696f1916559214599b4d206ded1450278edc97d78bfde09fc500ed599a325f02e20f63d494e3ceb22787d1d
 EBUILD gentoo-sources-4.4.164.ebuild 732 BLAKE2B 4032ff0065a2c8abf66ce4cd3f1f6b42e74aaed934cd29636fd155500ca41b15edbbb44c8a08dd01c25c977f086be0c5d3fcc466282c29a90d135c7e6a7f744d SHA512 4870bbeec69b92b7071e4ab0a84ec90bbfb7c8ea9e67e0f677244ddcb3c709ff5d7bf032d687b4408fe1a48bddd333316beafb54693f670ee9e3108d4bb2e5c5
 EBUILD gentoo-sources-4.4.170.ebuild 740 BLAKE2B e189b71ce09c31f59d1f1677fcf5abd29b3d78ae0b6cc9a005d1032df430b4c80054ef542649730cb798645d792149bf2f150261385a68d1c850903d06767e94 SHA512 37942cec9eb169648c4f082c0342f8f86d7267bfd150b4e73c9eb9a74b6adf32edc4d09eece28d918619838a87a3f777c641651241f779cdab4ebc9ec7ef726f
 EBUILD gentoo-sources-4.4.171.ebuild 740 BLAKE2B 5d5121408823a00c3011cfd1872fe733b96a59150a593d1f486c7e090b2099671cf9fe22128b9c69212a7d269cee06a75a2cfaa4051cc0416dc0ec0b5195c7af SHA512 083356a49686fa49e0f1ecd0bdc127b45f62e865d8d7b7292b48fa116b7478a3b1117698f577206e18d3a8ad8638ca4b24a0ce8900f24e22474cdcec50904856
+EBUILD gentoo-sources-4.4.172.ebuild 740 BLAKE2B bab224be74e6ee63f5f10625bc7f953a8ddbe603b3fca8990a355eca5eca4dc1c424a63fd5c5a96bb7a545258a29715d29b06eaeb630078d6137c77fe5afd17a SHA512 121d25114ca46e702433f315c4b3916c6b3a95d28034e34a31f8ee75245a4c72a7607fdd0f4b1f96e185f7985819317127910b2589f089e4b1cf04749ee55d0a
 EBUILD gentoo-sources-4.9.140.ebuild 731 BLAKE2B ff5efac7a37b07ba168cad16a8b6d0519fee245efb3dbef17bce7db3ecc7ef9309c1fab5d204f4956e94b13c2e2bef0b06e54ba01dd39aee840928bc062b5331 SHA512 ab23260199bac5cabd0080c1d0e0de64aa3f85087e4a5c7069249d5b4ac502179e9d153a4975967e561baf89f12f53accbddaf508a139c07cbe59eedc1b52405
 EBUILD gentoo-sources-4.9.150.ebuild 740 BLAKE2B 0bc169032a5d5282ba88be76e8c2d4d8e2e9a6ec011ea53f291a489d059d9d125805cd85000b3ab28b6194d7212d48d22da94f8acf2e83cfa70b6abfe1b0d20b SHA512 5064e176a5ac9097de8a43fd8de5d3987f5c9ef21d0ad76e25cacc6034046483faf4ec607b6734661cc7b9254d96d23ff72f719cd2a8054cec7172dc382f250c
 EBUILD gentoo-sources-4.9.151.ebuild 740 BLAKE2B 5938f3ad1b492af795371fc5c135f04e2a5bc2bdc56a65659196dea9864386edf7f6e8d6088fd4aa0272327dd0562dd2750395080da30776bfed5e78a4d71422 SHA512 838fe71f684cbfa6a9592df03158a2ca2017c07176d6e26420dbd7e66e690def4e133c3c6dd647f9c29280ad6ce34832201c37abd0ad894ef7d01b2226930c63
 EBUILD gentoo-sources-4.9.152.ebuild 740 BLAKE2B 93fa7bcf1894725c90a66dab396a4c125b47839a86c2fcba5cfa6bd35602af67bd07a5c0767b3541fdca2b48a3ef7b70cb71d65630f5527b0b3026debb054218 SHA512 2375f889f315cf05e28e6e21e34f7abeccc6eacfde144d91f55a7efa4c1ba0522b130da7d0b0e053d71a916901c648c03e9dfd6d8e8ae4346757bc3684adf21b
+EBUILD gentoo-sources-4.9.153.ebuild 740 BLAKE2B 052279111fa88e4487cff83014e70ea84bac4333b7b2b3bec009f61690ca1ee5efc1a2dea66d7d78e176494dfd1f3584e761bd17049219cee939d37a97784053 SHA512 f7fd1909a97d09551ce7d45fb893e5dfc5aecadd3caafbefed3e3eeb7391de561352c364041761e8d9f9bc7060794e00e7eb6390de1335f95396c22e9ff52191
+EBUILD gentoo-sources-4.9.154.ebuild 740 BLAKE2B bc5857685aabe408c2e6a5b921d8139a3774421aa3941c8786975c0ee671d29b3d952557147e1e18830c9f6ca5e584541282e9e1fce6b6fa8f6c44214f1879f2 SHA512 5a140786953a6e62f75c7996b3a17323b0ecb5aa8fa78aeee0f5e1700c0867faea003056487716702e182de230fc254da05dc4e0ae42784498ac77081b4c2c99
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.96.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.96.ebuild
new file mode 100644
index 000000000000..4475e2dbf187
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.96.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="103"
+
+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.97.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.97.ebuild
new file mode 100644
index 000000000000..e98a2692f05e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.97.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="104"
+
+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.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.18.ebuild
new file mode 100644
index 000000000000..cc4746854d59
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.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-4.19.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.19.ebuild
new file mode 100644
index 000000000000..5dfa7af54f83
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.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-4.20.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.20.5.ebuild
new file mode 100644
index 000000000000..0bc85176fa71
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.20.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-4.20.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.20.6.ebuild
new file mode 100644
index 000000000000..654410d84a7c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.20.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/gentoo-sources/gentoo-sources-4.4.172.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.172.ebuild
new file mode 100644
index 000000000000..7b78d5786729
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.172.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="173"
+
+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.153.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.153.ebuild
new file mode 100644
index 000000000000..ed1969987273
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.153.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="156"
+
+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.154.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.154.ebuild
new file mode 100644
index 000000000000..91da7f05d8a0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.154.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="157"
+
+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 9ee1884f2fa6..8d01b5e2bc6c 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0
 DIST patch-5.0-rc1.patch 41507244 BLAKE2B 4d66bc2d6be0f84b02a3baaaba02276d3258d713f882ce48973fd93d1ffb3a99505692af61f7e80f18436ee847d542bb0e3fa9f2df727995bf310f08342676da SHA512 811bf8534c4054fad7faa19e0b8513ce3d7f9d515f3e09c4f7767af0d66fba1995261df08ff0c16518e1ed1c966539d9d1e55501e7a89b46773e859241b8ad29
 DIST patch-5.0-rc2.patch 41975987 BLAKE2B ddeb47fa996f2f84a9c9f1c81177d09035aceef0447cbe426d494c6a48d6fe9d650cec6776fb3e767d5f1bc0a8bd8a6eb193f598b7b547ee038dfcfe063bc9f3 SHA512 7e615b21a7f1ed3df5a13b84a4e07f5b7c73910f146b86185fd50bb6adb9a87021c7dabefddbe8c1e00e9a8d89dcfa94bf50b8c012bba4c80da05343de8fa77e
 DIST patch-5.0-rc3.patch 42400427 BLAKE2B 53a5f97b618168122ac77a16323e45ac501acb2f4a8f4b8d015f4fa31d25874ec98b32b751b3b6ca5857c05cbd876fcabfd57f2616fe55a12b86565288453ca3 SHA512 e5d461982879935633bd0b35e94001a45d2bf71181f86f0871de2697a0aed5c1d19290089feb7eaf919f58c13b61878abcf0403239c66d96d0e7c05a658a99ca
+DIST patch-5.0-rc4.patch 42678556 BLAKE2B 0b1610bb3bd444d70927ed64806ab3dd9e994de0f87c4d00a2b00c24158594b9595901a6943db4e31ebf5058d9587e2133e0a4cb9bde96580dbf0720199353ca SHA512 4a531f46ebdc2ec0f39eaddc3b3362c792e235d591ca58571a9804ac180c546a34cada2c05bcc46828490d0563a0fdebe2b0932bf978f8762340019c61b1afc2
 EBUILD git-sources-5.0_rc1.ebuild 1176 BLAKE2B 1f4fc5442a91260179750a85a8616d7422ace9c2e41a571c094819906ce2a8270d9e87f8a1abee8303d82d43008d9107f7616753e7c3a847f20b322c459045c3 SHA512 fde9361935139a4e06c2d23af05516522c6d7f92cf927ddd78462a86890deb81b61bb98091648e6da9239523841a17e5203e81d021122e0b47a20799cc7d08f9
 EBUILD git-sources-5.0_rc2.ebuild 1176 BLAKE2B 1f4fc5442a91260179750a85a8616d7422ace9c2e41a571c094819906ce2a8270d9e87f8a1abee8303d82d43008d9107f7616753e7c3a847f20b322c459045c3 SHA512 fde9361935139a4e06c2d23af05516522c6d7f92cf927ddd78462a86890deb81b61bb98091648e6da9239523841a17e5203e81d021122e0b47a20799cc7d08f9
 EBUILD git-sources-5.0_rc3.ebuild 1176 BLAKE2B 1f4fc5442a91260179750a85a8616d7422ace9c2e41a571c094819906ce2a8270d9e87f8a1abee8303d82d43008d9107f7616753e7c3a847f20b322c459045c3 SHA512 fde9361935139a4e06c2d23af05516522c6d7f92cf927ddd78462a86890deb81b61bb98091648e6da9239523841a17e5203e81d021122e0b47a20799cc7d08f9
+EBUILD git-sources-5.0_rc4.ebuild 1176 BLAKE2B 1f4fc5442a91260179750a85a8616d7422ace9c2e41a571c094819906ce2a8270d9e87f8a1abee8303d82d43008d9107f7616753e7c3a847f20b322c459045c3 SHA512 fde9361935139a4e06c2d23af05516522c6d7f92cf927ddd78462a86890deb81b61bb98091648e6da9239523841a17e5203e81d021122e0b47a20799cc7d08f9
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.0_rc4.ebuild b/sys-kernel/git-sources/git-sources-5.0_rc4.ebuild
new file mode 100644
index 000000000000..10cee793e44d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.0_rc4.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="4.20"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index e6fe8de009f3..9b295fa2d701 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -23,7 +23,7 @@ DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 EBUILD linux-headers-3.18.ebuild 1433 BLAKE2B e9f705fade3656a6e3662737a30e44dc2c2354184304222fe466471440116762ad1976f6ca56d223bcd51afa82bde434c9d26c43450b274d0842f0ee87afef6d SHA512 8bba162f7ec52127681302a552fdb090a6fbe000e741307663d98003476a056ebc25e2cbd1b98f0e1bff0b8ef274627ff920901d3c79cf6196e16a5da04b8a98
 EBUILD linux-headers-4.13.ebuild 1507 BLAKE2B c52f49cf153cb2cb59bf9202c9eac06197da88e85353984048423300bdc0383ad70ce08b24f06839cd43cabebbee311c17b3482e42552d343c48ce2dbeb8c7df SHA512 f2635872e189cc11fea828b5d0e392218eef81b7a98807c12cfdccf8901fdefe96614d27174ebceaa35e492b358729b904669f285c852cd7535e4f595e7e98fb
-EBUILD linux-headers-4.14-r1.ebuild 1499 BLAKE2B 003938510aad193b1d6a111c2843b79d2072882808e940ce5c80bb271f0e21f38469f6499802ddb3cb425e2c292c706acccf4c7aa5a33d471e478417bc5a50a3 SHA512 5b70a45661ab87a6dde8cb53cfaa78a4f30825cfe8967d075348fb2cf96cc251b766e0c36a4b2f24c508aaab5ffbd2b07edc08cdec29792cf086408eaf1a80e7
+EBUILD linux-headers-4.14-r1.ebuild 1498 BLAKE2B eb5d0f326735eab3f62079e55a2f199c79568b2c65992973f86fa9fd87a811bb4df7473702757a255b9f4927e5ae9cc56681201a2e2f74273a7a407768e00db4 SHA512 a9efe2abac7d4b1f40ed97c31053d29c9e8a0c1dde7007c07393bf7daeb31f7a9119b49092c581fd0b300a898b84d9affe75d412745eb223f3c58ef99cc37ecf
 EBUILD linux-headers-4.15-r1.ebuild 1519 BLAKE2B 6d1b24772c1aea77fc91386872801ebe3fe06c2bbed531eb82c028f09fbce4b25fbb2883b487aff0e0fa491f5aa804ca18b43096c9fd2fa36df0cf4a6f1c79bc SHA512 43997a52bcdee13acb3e8fd8d6068fdd00deb8cbe18fe5874b2a0b53576a52293f0ce58973b018572947cd8e1f1c6f0a99bc8636ef2ad144a49bb35d11b53157
 EBUILD linux-headers-4.16-r2.ebuild 1698 BLAKE2B 83414bf8ba9db9e6ecb9a42c34db25a6ed9b43111ef86158a3c13b431609bfce5b8a282ef2253bdc3ec65563ff29c01067473a17fa837e705fd5ce1888746a57 SHA512 bb0f928e073ae3f793098c7ce59ea85462405cd52a47cb627d2fb576b060c5eb60464757aa392d2748be6333508b56b6f59a04606bda6f2c6b7641acba263f37
 EBUILD linux-headers-4.16.ebuild 1709 BLAKE2B feb0f31d53c3c095d9db9e09ba24bfbacada0b82f0959ea2a97c26ce7806a3cffbbed01b8d6cb0ac88c8bb8c7361327c3ae37189b82cf29ae03fc4409e63c1cf SHA512 b0e68a128feb68bf21e717ec0224d0a6033249f553cbc161b3d5da5cc8ac94220ec3870c2f5933d1c8bd49b38f5c21886227638cb3fac1f7e49f4950fcb2ddd8
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index 4f9c1188e661..2759ce936ec1 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 634540b65725..b12bb73c264f 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,15 +5,15 @@ DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.16.62.xz 2280016 BLAKE2B 5ec85d7e7e345cb21ed48c860dd263067f58ee29fb2ea11980b37c1973dc944b4ffda7bf7098b8c12573915f564a76db94b35a337d172525979cf87aa8cb2ae8 SHA512 c438d9b8df33484ede82634352dfce366b6b21dd589c21556582337ba16e73788e6219ba64b57160264cbde4da2508f54a716287c5520b89ba9be21c0de63bc3
-DIST patch-4.14.94.xz 2161284 BLAKE2B ccf2d8fb66a4c7c80d701b89a275f08d8d9af7ef6215d49409ca086427b3a1a560933e56d8b22c1f88f256327a45d1ef2f2ec676cedbea13a133c753d3740e75 SHA512 12ea4d6b0e6c11b4b5d779c55a8fc7471f606aff6050b418947f460b7cf1746bbe83dbe2a756d4c93887c9dc69dc48e271fbfa9a67d497e54464c49fa641678a
-DIST patch-4.19.17.xz 532228 BLAKE2B dc272ee230293eb59663717cc058b4bb85149dafa44ec671c8cae827f69490c15fd910a377502a0cb15c5128e8af038b6ecee4394c8b04e7be6a4695722910d3 SHA512 defab91e5c81cbee8e3cda6986d4677b1100e28daa7684cf8f2205032881d4b199a93a8995da8054c9ce1b3a2ee36f5afbc0a807f1ea0a1dd83817fa017e20d6
-DIST patch-4.20.4.xz 122576 BLAKE2B b1d39801418472f72680c8b44f923168e553aac2e48463bcd8849d372eb612fea863b8e65b8c022de42bd3f37f7e7fc06cd684ba1b7a79a849fe2f10510dc2cc SHA512 56d18c5946c73d062665e92cfe28cc8d1a18a00804d1ddf1e0a8e8d5be1b84342b09ead1ed968aca4898fe689dcbdb8dfd4862a5f179c69bda79f8c1a0fc645f
-DIST patch-4.4.171.xz 2341372 BLAKE2B c7ff64686b34699c0e6777d75b805a4925cd3f6d5be00932f21f39e5e81d3514f04f1a2b951184f09a72493099bc2c7b9bc109594bc4f4948e7a6ab360612b2b SHA512 eac8b50a66afadc2705e86632dfcd3bce5137f39d12f2906271e888c88041d280b3b78fe1800545cf0564dfeb34157cc76d8df2ad2bc1a72fcc5c5464a32c49a
-DIST patch-4.9.151.xz 2509708 BLAKE2B d5c636d98ef6de8c0226617bf8c6e1cce4cac2607509e3a4eee7003468e09554224dd93ab87a28398f1fc724ac8855727fa45d7949cafb55883abda377ec1ff4 SHA512 062222410298fe8bf6737f05d0ada585130abbce4fb91daa0ea390cbe065d0c4c4ebc7ffdabbd21e0b5e3faf42dd23bebbf8eca71434e214bba8687f89321bbe
+DIST patch-4.14.96.xz 2186196 BLAKE2B 3c68803c699775aa14a048782660a4f908aabbd1328cf66d064808970d2e774bd44f6a1bb7e838da4cdfa6396a08185326714071cc3ef7a65c3cbabf7e63294d SHA512 c9f36d87becc7c44d6cef13a8c30c0047b2ec5451acbd67faf6854f1f186befb4dc5f825d448fef58d7515f034c60f4a9250610fd099db109bd61654232f44e5
+DIST patch-4.19.18.xz 563792 BLAKE2B a816fc5b4561278b702765d2d5dd8bd5d5b9094a6f56d35511f1cbd1250de6ce23db0b691f6935aaabfd82d61de2e8343969fecf5af2ebf06d05e3bc69d21a8f SHA512 f7a6539d0cc957ba5293e27ed2c0e3847be3704bd1cab1a1f271f3924c73abcf8220aa813d9f034b60701291a700e5d5ac779043f7e32562ce037e5db6832008
+DIST patch-4.20.5.xz 163936 BLAKE2B 4a984ea7499a804f5c644d1443bfd3773c7db6223073623bea709a40601773b6df1f2d31cc3f7475ce0dc810eda3f7bd285adbd16934f9314f19226ce7e56649 SHA512 d9fc07e7540556e8d4ab72b4081e4aaed08e8699df40d8a3bb93f649238f0f1e452f32de872e228c544e9141f7cfa7ea94e1d2fb4b4465fe78b1b632deb69967
+DIST patch-4.4.172.xz 2365068 BLAKE2B 6f3f20242db32189eaf5c7f95d484a066ee171305a932c345f223eaf30fd913438ca8a7cc7d332e911a561418e8fd3eac922659c4012c3b4be8dbc5ea6fb358c SHA512 ed9b2de71c958c5214c0011def654b00cfec85df0527f98c6dcbc5a61e9cbb3b470cf031d98eb4d858313c778b35066377024ecf6faeb939cd888b05f37e5c22
+DIST patch-4.9.153.xz 2524464 BLAKE2B fe9b7cfd14a8cb78cf99b4f4c1ae0d6535c6b821ea1f0992c86d431ae7ab6e078fb564b41de8215b5e190df81afb998fb0359c251abfcacd0a3578ac060787c1 SHA512 fe1257bf377abe7bbd4a1b8df3050dfd12f33e0dbc693c40c8a182b11fb46beb90381e2832de4f538c8d290e04935af9363a34c11ddc64abf9cc62e6998ff044
 EBUILD vanilla-sources-3.16.62.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.14.94.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.19.17.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.20.4.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.4.171.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.9.151.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.14.96.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.19.18.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.20.5.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.4.172.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.9.153.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.94.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.96.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.94.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.96.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.18.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.18.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.20.4.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.20.5.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.20.4.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.20.5.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.171.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.172.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.171.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.172.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.151.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.153.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.151.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.153.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ca53620f98f8..0190e23ecafe 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 450723d1a7db..23af45bdfcfa 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,4 +1,6 @@
 AUX db-1.85-gentoo-paths.patch 684 BLAKE2B c58f76c97b1fa189cff849175ec240520a729e436543936164fabf69736fafb253243a32796e080dba4678e48ae67d0b19da0f057eee0791ff93596ff2f98c17 SHA512 d7e2075a1683c7a04337830730e429c4bf2b5f0bdb49cdc3b625bda83be7cf579f4039204a355f5854c2981b6bd3234767e02bc6a7914e2bcde2a73d698fb914
+AUX db-18.1.25-sqlite-configure-path.patch 800 BLAKE2B d7fc137c1abe918ea94081a88c974d4001752a682752a7907f50a8efac000b57ed50362c8001423667c3c2e535ac19c82ccef33996111900c489d639ad2d870d SHA512 704e07b65df058a8d09fa7f8789b1ba81ffeac90767b8084ad828158aff7e59a54f21f8834f912c5af26de58e6cecc3eb95da1c9ca051dbaaa0e1d65419df594
+AUX db-18.1.25-test-link.patch 1443 BLAKE2B 819038f07f0329575eecdb5891b16114507d9a530b434eabf748367baf86be979198dd7aeb904af14d9b3643e013e2ec34257bc254724351dc62dab30029b5b8 SHA512 e3cba1c842dffbbf1bbf353111ce41cf46078d03d9b42052ad72081e9b9434eeb3eedad42d532dba9f2c90b36a620f2a2f9a65fb98477e5b1fa6dfc04ba1ec0e
 AUX db-3.2.9-fix-dep-link.patch 1005 BLAKE2B c04ae14ca17e77807d44949176e47aa4e5d98f1407e74c9272ad2b9dc0eaf062a2eeba8d9a9130285cdcbb6418f4dd4d8dd22c89c914578ef9fbef8caa414940 SHA512 42f8a6e495266209d7c9bf35bfba801abddffb10488b7b156a790bacdf8fe2d3d3113d8d0a1afddeca238736f64cf8a881141d181fd4a211e4b04da9ed010587
 AUX db-3.2.9-gcc43.patch 441 BLAKE2B 7ad11125c676d6e731f2274f4f1c6aad500e83ef6394c9989df4fa12edbd1cba50388e8d321ebd1976279b36effed37cd2cae15a6d50fa9b2e6836cd24fae797 SHA512 17d44ae357337d938bbe296b519efc03b914792ce4440936c1178b09dbb21783034e16f4fb2ff03443b00e8af530afc0fce778a937b06f0ba8c598b02cbc989c
 AUX db-4.0.14-fix-dep-link.patch 1119 BLAKE2B 1532fa79d47c6b406f88302abcf007713cf4301a098eb17d159975cd6a0d2c80fe24c83611433b029560980c96b6cc5f66b662445114811cde27399f0e934b25 SHA512 5c7895d8c284c5b9c2305319e20afb8b98a43974bb2ff16012ab322abf131e0d050632fd7c67a0dad47df719da2c53316c6a36f5b6686196cd1b27ced3dae7c4
@@ -8,7 +10,7 @@ AUX db-4.2-listen-to-java-options.patch 312 BLAKE2B a010fee7e07b1a11e2e5400b5e8d
 AUX db-4.2.52_p2-TXN.patch 2328 BLAKE2B e671d82566f51c6048c05b3ab9cff46cdd40ff793a8d6400a1b4aa904a175a36dea1b7c5cac0e64fcc751052dc8c9b84f265339610c4d59a012d84279f0c5203 SHA512 528d85cfa1ec2d803c87f8cc50c00606b4b69eda1460056a548f4f18f3a1667c06eeaaa8672a3192747ca68a6fdde451cd9c45fce625e71161f9855ed92d286d
 AUX db-4.3-jni-check-prefix-first.patch 1172 BLAKE2B 39d850fa1ee8ddc222ca3ad217d90b0029ba6901dbcde239fe4f35a076df355a848481058f1704cca1a2c8105a34df582115033c1637c93e97a36a616e51f17d SHA512 ab81f0a924f3a763f76ef39dff12035570462e0bbed41d1c58ca41a37a0f647e4348238ea5cebda7e639645f0e160292348e16469ac0be88edfb453158ff3e9c
 AUX db-4.3-libtool.patch 2161 BLAKE2B 5332ad9ee83c9c04f046f7ac909fd2057c455335bacf5ebfb40ead8eeb810a97d91567cf2ff3cb396c9fcb1cf37133e74bea3f4fbbbfb4e77cd9ce14845af8f3 SHA512 52beef4ea2c3e6742efc0331649b53686f052cddf0b8b809a34c9ffc5cd977dd71bfd3bf035708b5174f677d8390065e62807a20b3a3b7c918dd6d336a0541ab
-AUX db-4.3-listen-to-java-options.patch 312 BLAKE2B a010fee7e07b1a11e2e5400b5e8d9be1938d3f20d1a647dcd0530830a065bbd6b847db94a7dc08e075c8e5003503068ca7d6b94c7d251ed693b1467533dcc830 SHA512 04a962a9999f331a97928a580494351b15e4ab2b545aefb0c5351dd4f476a522fd84f108b5161e92ed47ac121e10b1184b4b8d7b682d7b4597d7c425a475ee03
+AUX db-4.3-listen-to-java-options.patch 244 BLAKE2B 221f39b4cc6e4d4ce91efb90a5b207e634f8d362fbb34d1fe9c57960323cce71507e49a4aca0a6187374a37fa77208547e56edea2695d7b1111d96345469cd1d SHA512 20103923b1da278ca5a682ba0a74183d9c8f68a4774af51d12884d7d405fe7ec27f82b0b49a01a6453b96798db995b1f0fef34f2aa40a3b66db48efddb94af49
 AUX db-4.3.27-fix-dep-link.patch 1179 BLAKE2B 60a9ac78e125e0c33b6c95b6c76b477c9ef248246ac7acf4df6080cb0e38c2d0ff7109e72508c2ed877c8b7bfe849a60c631bf6ebf9f537edc45b8ab7cd1fb53 SHA512 05f9eb53f01db8e4d36ff3527a5757611def974d2c2a4cc97cdd48ce7bd5e8bd22030cd8d4493374a5ee226a98f4873bf8f75e196897f6c0c9c4e9bdc368d05f
 AUX db-4.4-libtool.patch 1817 BLAKE2B 2ad5569c3a29ff82bab0904040c8f05b24a0185c1c89006e13f58dcd621b54583065c41356617846b213c5475609e29d2c38d8da7bcaf9f49c453900d73554d8 SHA512 e22cc040c20f0f52b3a57d0795604b6d469a45a124d3892963c817e533e2d85810630ab286f839bd77c9dc66cc13633fdc57979dd005ec74cc8c6d17ea3d5d3d
 AUX db-4.5-libtool.patch 1817 BLAKE2B 2ad5569c3a29ff82bab0904040c8f05b24a0185c1c89006e13f58dcd621b54583065c41356617846b213c5475609e29d2c38d8da7bcaf9f49c453900d73554d8 SHA512 e22cc040c20f0f52b3a57d0795604b6d469a45a124d3892963c817e533e2d85810630ab286f839bd77c9dc66cc13633fdc57979dd005ec74cc8c6d17ea3d5d3d
@@ -25,6 +27,7 @@ AUX db-6.1.19-sqlite-configure-path.patch 727 BLAKE2B 46b5f562042be34e134dbc8bf6
 AUX db-6.2-jni-check-prefix-first.patch 1302 BLAKE2B 4703beff3c14e0218d4b8b3b911ee912cc80c2ed42730e7b11eb728c9ae16ee535baf628dff6c62bb3cf25d262b87896ab3ed5df5b2bd88968f1fce62b0b7095 SHA512 662fb5e1b292dd87b11db7cd071b280863d2cb7c5e1e8ec7149e6ecc5d0db0c40a0b3995503c27ff0dd0d3d5fb274a7f72736058edd2e5b52521048e11253a30
 AUX db-6.2.32-jni-check-prefix-first.patch 1575 BLAKE2B 5230393b8f40e6ef329590b0037a975dbc60f23f3ce8a603e3c21cec5b0bb311a225c1d8558cc3c6bfdb658e88c83f441c45aaf556051aee8ba83f9262616ba0 SHA512 eb0739c46f88ad9538e4a467e8547f97404747633942ec6b05eabcfb7ba427ff66c00aa5dc95cb9518056b861c240898db4745dd3626ed95e7cb01c54b47dccd
 DIST db-1.85-r3.1.patch.bz2 14641 BLAKE2B 5ca59487a433a5e5b5fed7a8737c20df041be56733fe9209047f9e53845fa034576c29ad74407509ab96473e4eef0138a3a47de6c348d27209f0e39df85b9f5f SHA512 32b1810515476758ece7415f241378460a4051bf5ee23fb464748f84a90a56ff2c5119ed93028114d64f1b1691b1c694c2301ff825edd89cdee90a870a68b6f4
+DIST db-18.1.25.tar.gz 43980391 BLAKE2B 364f023809d9d68d58879dda80e5a6a1826db261ac371d63151278731a777c6ca629b051df3c1430f1c049fcc7e4ddfe041522e891290a43aba051b519b28523 SHA512 30a0508dc7eb92adb56bdc881cedf179e901f888c776bc515b342ae585168521fa9f3c763f438d0e8a008e7cc779b3f40a7385285d724f8494d25d3652e6f1c9
 DIST db-3.2.9.tar.gz 2085238 BLAKE2B 10cb1c102bf5db52ec16181ccbb02a8c4560f42afd2382689ee4903fcd63bf3ab4802482a065a85b1d34c8fb9f620fceb985155b1390de7ca404c121b6b4b6bc SHA512 5f07b27ae0cbd2832e5db9473cd4f2d4aebeee25ed8245ebd2c297a576571635ca5cf75e63e0967b1e90978128a5b6f5d8112559c56927d5bc5eb0d9fd3a2e95
 DIST db-4.2.52.tar.gz 4073147 BLAKE2B 0bb9649a08df9b425f28471eb65c0efac0b7833b4c5c841b9ef53a142669b549e1f1b78cf42eeceea05ebb271aacd513d115070ea028f77fb1830bb9fcc7c8a9 SHA512 47a4e1353fe4f5c2160952a8f7a09b73fdf2dfcd222a8214e12630cec3139a624907bba83a06f10f8492b4dce328a979e9155ee049b9a88798edaca62cfe60d1
 DIST db-4.3.29.tar.gz 6103264 BLAKE2B eda13cd5c8b9421044f6c8b6b41ec318ff33e19da15f8d5e3075612186e60cfce30069078f712841058224ed58caf69d43960156ac645651670665390eae28e1 SHA512 93d36c040b25739b92c52504e117a9c7f4b671463d61d00029e70d0bc8171311f5d04211f7d966b8a9ef8c2a85a5ebe8cc55e4469c3c7c0e468caa4221f691fc
@@ -38,7 +41,7 @@ DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
 DIST db-6.1.29.tar.gz 37521943 BLAKE2B 3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
-DIST db-6.2.23.tar.gz 44305964 BLAKE2B 8d5705e8e4c66f93e52d1bee86a322ef6d2077d1e5c005208bedcb25f6cfd10e0a6d9c9a72a1d2e3568d6fec14ee82e2446a0fa0a0d505cc17f0ef245de826a1 SHA512 0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5
+DIST db-6.1.36.tar.gz 37526795 BLAKE2B 9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6 SHA512 5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811
 DIST db-6.2.32.tar.gz 45342417 BLAKE2B d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46 SHA512 83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
 DIST db.1.85.tar.gz 270953 BLAKE2B 7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
 DIST patch.3.2.9.1 2139 BLAKE2B 7c442311499244d3432a1648294f3b610da827f7d940777de01f98816d6dc8bc50b68cb45900bcc1acf1672207a86009dbc33b6226f8a4fcbefc1bee51961138 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9
@@ -64,6 +67,7 @@ DIST patch.4.7.25.2 2210 BLAKE2B 3e9727a4e006fa8e4502f1481a44144458401d0df0eeea2
 DIST patch.4.7.25.3 8442 BLAKE2B 666b643b3bf0d1e5ef5e445ae03228f436a5528bc197338c3c9bd468d7002bc81a16e295cf34fe6b38903e7f65c2c5c3cd9be0a3227f1122aeda22afc165e2a9 SHA512 815560c45c9c8491fd58d881a0bc1d23a82a13298d4757ed7d2ae4df4b88b278b8e4d6063eb46349a8f6f11ca9aa5b8555f3ce01df025715c2579dfa36241238
 DIST patch.4.7.25.4 5647 BLAKE2B 60ecb24fb137f7aeacb9689d8edc41791f78f96d1aa15c7fa47032371533d668c5dc12a5e1641945402f0e21f4e596cebb5010ac170ef462279b2efb887be020 SHA512 df9810034773a9d0556cbd174e4f131f0461402bf3f476ae5da1deb92f3e2e9ef789687c5cc5c2df6385f6b14251e893be225ffacd895d71dfb305b9de32567e
 EBUILD db-1.85-r3.ebuild 1325 BLAKE2B 7dfb82cdc266defa521ad8c65d504372bcfa4857eb6c4053e725c0171627057249c964afbacfd5f1afe0865daf8a5c3b3704c3832070c1579ff69fa3099bb9b1 SHA512 1c418f0f608de7a74dac4b8d3d9e7951b64cbd6b1318ee2cf0bf3d45f19e81ce9d1c33b0be6f992fdeb09762f39d87d809640f8992841250755cd85dbc740ce6
+EBUILD db-18.1.25.ebuild 6926 BLAKE2B 1d903749c308e1dc6af0395d2f1e75342514d9a09d169994822404579e8483664624f70d8d85902d8afb1d6f2570b7a6e38ad62c45d3935393dcb35f5c5b8143 SHA512 bf76a2c4419eb3abfc754d5980503b73367970c3e4c8ca3d16150cce38af619aee59a797df403d36c5691f08310fe4b849c11318e6b9168d91cb4147adc3b0d1
 EBUILD db-3.2.9_p2.ebuild 4955 BLAKE2B 6410a4491d2a774b48a4f188b4e550119ac2197a9c598d91b49f999e745de027697a4356e2f8a36d33742d42906f05208c8f349afcb71a65654bffc6da8df6d0 SHA512 a87c906e804a84de5bdbcbdf60f7c7aef03b6faf27a1137c91724d9649e9a00b5315751aca771453879fa9d36772e01ac92688e79a04585c4744b63ccb9bcdea
 EBUILD db-4.2.52_p5-r1.ebuild 5002 BLAKE2B b5fc961846e6367194c185069d1d1f0e0fa78f21efa78e833c32f91db1750918e8b281e1db537ebe053fd72ce58d943018e37da21d32c5c1a5eef6779098e486 SHA512 aaa8d1e5c44623894bfef42b701512c79f61ba87990fa30c43195fdb1b17455206baab416a5ffa798d14f8c73fdcf10b68a8fef03cd5cf70aec355374c4f583b
 EBUILD db-4.3.29_p1-r1.ebuild 4949 BLAKE2B fa025504269ff2139d313172edc04f97ce09a1fcf8505ea2de9db3301a123a824d27c52fe1b64be87062f0827be5e686b71e8002979d1ea4704ba8f0193fa25d SHA512 33a4360593e8148d1f559d10d2e0b5edd1a42d838129c5c069092d7a7af9946104b0844428f42a4ef287ff9e5ddae2343bdda93e37e70ff7e7b5ae3540a7da66
@@ -78,9 +82,6 @@ EBUILD db-5.3.28-r3.ebuild 6914 BLAKE2B e7ef8755621376253f4009eb38fc7b8021702f0d
 EBUILD db-6.0.35-r1.ebuild 6919 BLAKE2B aee72ced7f38b0f2da59ab92a506ac99505b2ee2f88e9fda5f07392d3c7b87b0623c016e26e4d299a70c286890464edad1b7a9db6669df3e5b4d083727eff0f4 SHA512 259bdcab39f5bfaf74f8b9fba6edfe20433003398b2ba2b347dd4d1bd20fbbb242413b15236f5a0f75c7bc00a8875974d49a08ddec15811b19f89ea81dab381d
 EBUILD db-6.0.35.ebuild 6823 BLAKE2B 73dbef05a3b91c77cecf49de9221c60270b1bfb21c0088130b60c639acaaece2b8610a1da27a1f2ea529ecf61889573cb41ca8f7dffa14571627011e660ebd13 SHA512 2ade05fa85cd41c48d885a817e17b3c7adcc2b586c0dd92c10a340eb5304f59762562009613fce72ccdbfed9813206216cc08319362c01d4aa4dcb5a92eb7220
 EBUILD db-6.1.29-r1.ebuild 6919 BLAKE2B bb82b012927ab0e9503ef52deedf980044be143086296f54d5cadd43ec294f3e15dd42d731c5c3e9f112a4d2a022803bd264b379c28bb7ed832aaa80cf25cf45 SHA512 5613105b8e6a0e89a6bc26e249d4f6e31b0a281b1f8296c4e75f9131cc50e2130f6b6267c9747d89e3be94a490d498807c6674350f81cc813bfc204984e32032
-EBUILD db-6.1.29.ebuild 6823 BLAKE2B 0ab1607502d4cf614ad2a8726d5c9f7376915a46a86dade83ee8db4bb1291a32e7dbc7b24eb4610ee99515b615c08a0b89d6b0636bc4b6582429aa6794b95988 SHA512 5ba0a00a132365eb37493b868e095c75a20bdf116f9c624158b5229a9bbadfcbe8be9222b1a2dcb632927e89a2974c1d52b2bf3927511d108761b8da6d8b7c46
-EBUILD db-6.2.23-r1.ebuild 6934 BLAKE2B 378826f3740601b8b928d7777c7a17ed8f0db353e49b565f0310f7fa5545c93b9e4f9d57567bd44c72ea4bfd0d8143d83c9305a4c22a13c344ecc2020ded8087 SHA512 ea61d76938196841eb13a2a4cef4932937d38fecdcb3f7006063b38f17e9a134e2f1382cd1bd1303d669cf45918577787cae4cb316657efc632896f361e4e854
-EBUILD db-6.2.23.ebuild 6838 BLAKE2B ef5fc8f68050b2101380a9c9cf9f37e240bb8abbce41a078a4bce4de99c1801510b0ada26f440d56b5d60af0fdbd533c4d7e3609766da16f28bd72b447f2a46a SHA512 a8aed19eb3ce017c90adf4eed3e1622519d3ce52457a1272f8d53888214e12af274ad1c938a16750f919fac19eb2b941f2aa596fcee8a313ad69c15a144e255d
+EBUILD db-6.1.36.ebuild 6883 BLAKE2B 2648468a68e6078e68aeb401ae5a8d25e5cbdc8c591ffa5533bff87c85deb5f5061e4c0611e3b27f79c804a37e4586597c2320cc869f123ebca44223d710a568 SHA512 b09f06b0d12a6a6b41a78eef88927c07b314c677f49538180f30b2758973425f2f95050d2e37cb6c9c6ce6c940d007e619c7f0d3f7b69e27dba290da52f0df5d
 EBUILD db-6.2.32-r1.ebuild 6937 BLAKE2B d5df63055e7d8ee528bf8c7425b08cf2dd8f2044ac2a9c5dc7e600dcea47fd44791c687adee9504f4084ceacfe558c9364319c3c33e9582bdebabdd414d66f80 SHA512 cd49a5a95b7b686d0a96d0cd416c9676b0158e9511b1ab7c8d56f1b88d78d2de288beabc04396ac4de9f8a544d831e3f98a5e9b6ef14bfd22f56f57bec02fb8c
-EBUILD db-6.2.32.ebuild 6841 BLAKE2B 620590f12ad2a8c93431a7c1a8b9fca6987ef44c03f78903e52200d3256197b2908558ddfc59d630f285ccf8a3c87036cc9516bc1f5c5b4ab43b47654b035d0a SHA512 48987bb9ecf7df0ffd43f29e699c2078545cff08aa277d98a6dd6b59127060b949d3a67412845257b78ceaae1e9b388ba7b1f5869fcbe2ee5aa7d63186252806
 MISC metadata.xml 1323 BLAKE2B f954567067cc1490d6804dd9d7b612dd90733c7ab84546cbedc0075f8f3ef1faf6f1bb70bae31e83b0aa17666bd6711999b67ce4fe6c15bcffc3ba5bd8d004b7 SHA512 36f8b6db241ef960b2ac0f7bd19738066e3daadd90efbf7edc54a4774e491506d69a2207738f53643a3e52f1f35a900e4717747744bd30ca682265f50cb8884c
diff --git a/sys-libs/db/db-18.1.25.ebuild b/sys-libs/db/db-18.1.25.ebuild
new file mode 100644
index 000000000000..be515fd043e5
--- /dev/null
+++ b/sys-libs/db/db-18.1.25.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+	MY_PV=${PV}
+	MY_P=${P}
+	PATCHNO=0
+else
+	MY_PV=${PV/_p${PATCHNO}}
+	MY_P=${PN}-${MY_PV}
+fi
+
+S_BASE="${WORKDIR}/${MY_P}"
+S="${S_BASE}/dist"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
+SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="AGPL-3"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/db$(ver_cut 1-2)/db.h
+)
+
+PATCHES=(
+	# bug #510506
+	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+	# use the includes from the prefix
+	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
+	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+
+	# sqlite configure call has an extra leading ..
+	# upstreamed:5.2.36, missing in 5.3.x/6.x
+	# still needs to be patched in 6.0.20
+	"${FILESDIR}"/${PN}-18.1.25-sqlite-configure-path.patch
+
+	# The upstream testsuite copies .lib and the binaries for each parallel test
+	# core, ~300MB each. This patch uses links instead, saves a lot of space.
+	"${FILESDIR}"/${PN}-18.1.25-test-link.patch
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+
+	default
+
+	# Upstream release script grabs the dates when the script was run, so lets
+	# end-run them to keep the date the same.
+	export REAL_DB_RELEASE_DATE="$(awk \
+		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
+		"${S_BASE}"/dist/configure)"
+	sed -r -i \
+		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+		"${S_BASE}"/dist/RELEASE || die
+
+	# Include the SLOT for Java JAR files
+	# This supersedes the unused jarlocation patches.
+	sed -r -i \
+		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+		"${S_BASE}"/dist/Makefile.in || die
+
+	cd "${S_BASE}"/dist || die
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac || die
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.m4 || die
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	for v in \
+		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+		DB_VERSION \
+		DB_RELEASE_DATE ; do
+		local ev="__EDIT_${v}__"
+		sed -i -e "s/${ev}/${!v}/g" configure || die
+	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
+}
+
+multilib_src_configure() {
+	# sql_compat will cause a collision with sqlite3
+	# --enable-sql_compat
+	# Don't --enable-sql* because we don't want to use bundled sqlite.
+	# See Gentoo bug #605688
+	local myeconfargs=(
+		--enable-compat185
+		--enable-dbm
+		--enable-o_direct
+		# Requires openssl-1.0
+		--with-repmgr-ssl=no
+		--without-uniquename
+		--disable-sql
+		--disable-sql_codegen
+		--disable-sql_compat
+		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
+		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
+		$(use_enable cxx)
+		$(use_enable cxx stl)
+		$(multilib_native_use_enable java)
+		$(use_enable test)
+	)
+
+	tc-ld-disable-gold #470634
+
+	# compilation with -O0 fails on amd64, see bug #171231
+	if [[ ${ABI} == amd64 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
+	# use `set` here since the java opts will contain whitespace
+	if multilib_is_native_abi && use java ; then
+		myconf+=(
+			--with-java-prefix="${JAVA_HOME}"
+			--with-javac-flags="$(java-pkg_javac-args)"
+		)
+	fi
+
+	# Bug #270851: test needs TCL support
+	if use tcl || use test ; then
+		myeconfargs+=(
+			--enable-tcl
+			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myeconfargs+=(--disable-tcl )
+	fi
+
+	ECONF_SOURCE="${S_BASE}"/dist \
+	STRIP="true" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	db_src_install_headerslot
+
+	db_src_install_usrlibcleanup
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+multilib_src_install_all() {
+	db_src_install_usrbinslot
+
+	db_src_install_doc
+
+	dodir /usr/sbin
+	# This file is not always built, and no longer exists as of db-4.8
+	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
+		mv "${ED%/}"/usr/bin/berkeley_db_svc \
+			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi db_fix_so
+}
+
+pkg_postrm() {
+	multilib_foreach_abi db_fix_so
+}
+
+src_test() {
+	# db_repsite is impossible to build, as upstream strips those sources.
+	# db_repsite is used directly in the setup_site_prog,
+	# setup_site_prog is called from open_site_prog
+	# which is called only from tests in the multi_repmgr group.
+	#sed -ri \
+	#	-e '/set subs/s,multi_repmgr,,g' \
+	#	"${S_BASE}/test/testparams.tcl"
+	sed -ri \
+		-e '/multi_repmgr/d' \
+		"${S_BASE}/test/tcl/test.tcl" || die
+
+	# This is the only failure in 5.2.28 so far, and looks like a false positive.
+	# Repmgr018 (btree): Test of repmgr stats.
+	#     Repmgr018.a: Start a master.
+	#     Repmgr018.b: Start a client.
+	#     Repmgr018.c: Run some transactions at master.
+	#         Rep_test: btree 20 key/data pairs starting at 0
+	#         Rep_test.a: put/get loop
+	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
+	sed -ri \
+		-e '/set parms.*repmgr018/d' \
+		-e 's/repmgr018//g' \
+		"${S_BASE}/test/tcl/test.tcl" || die
+
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return
+
+	S=${BUILD_DIR} db_src_test
+}
diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
deleted file mode 100644
index 5a93fb270c1c..000000000000
--- a/sys-libs/db/db-6.1.29.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	# bug #510506
-	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	epatch "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild
new file mode 100644
index 000000000000..4f1b84ebf020
--- /dev/null
+++ b/sys-libs/db/db-6.1.36.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+	MY_PV=${PV}
+	MY_P=${P}
+	PATCHNO=0
+else
+	MY_PV=${PV/_p${PATCHNO}}
+	MY_P=${PN}-${MY_PV}
+fi
+
+S_BASE="${WORKDIR}/${MY_P}"
+S="${S_BASE}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="AGPL-3"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jdk-1.5 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/db$(ver_cut 1-2)/db.h
+)
+
+PATCHES=(
+	# bug #510506
+	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+	# use the includes from the prefix
+	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
+	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+
+	# sqlite configure call has an extra leading ..
+	# upstreamed:5.2.36, missing in 5.3.x/6.x
+	# still needs to be patched in 6.0.20
+	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
+
+	# The upstream testsuite copies .lib and the binaries for each parallel test
+	# core, ~300MB each. This patch uses links instead, saves a lot of space.
+	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/"${MY_P}"
+	for (( i=1 ; i<=${PATCHNO} ; i++ ))
+	do
+		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
+	done
+
+	default
+
+	# Upstream release script grabs the dates when the script was run, so lets
+	# end-run them to keep the date the same.
+	export REAL_DB_RELEASE_DATE="$(awk \
+		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
+		"${S_BASE}"/dist/configure)"
+	sed -r -i \
+		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+		"${S_BASE}"/dist/RELEASE || die
+
+	# Include the SLOT for Java JAR files
+	# This supersedes the unused jarlocation patches.
+	sed -r -i \
+		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+		"${S_BASE}"/dist/Makefile.in || die
+
+	cd "${S_BASE}"/dist || die
+	rm -f aclocal/libtool.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac || die
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.m4 || die
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	for v in \
+		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+		DB_VERSION \
+		DB_RELEASE_DATE ; do
+		local ev="__EDIT_${v}__"
+		sed -i -e "s/${ev}/${!v}/g" configure || die
+	done
+
+	# This is a false positive skip in the tests as the test-reviewer code
+	# looks for 'Skipping\s'
+	sed -i \
+		-e '/db_repsite/s,Skipping:,Skipping,g' \
+		"${S_BASE}"/test/tcl/reputils.tcl || die
+}
+
+multilib_src_configure() {
+	# sql_compat will cause a collision with sqlite3
+	# --enable-sql_compat
+	# Don't --enable-sql* because we don't want to use bundled sqlite.
+	# See Gentoo bug #605688
+	local myeconfargs=(
+		--enable-compat185
+		--enable-dbm
+		--enable-o_direct
+		--without-uniquename
+		--disable-sql
+		--disable-sql_codegen
+		--disable-sql_compat
+		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
+		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
+		$(use_enable cxx)
+		$(use_enable cxx stl)
+		$(multilib_native_use_enable java)
+		$(use_enable test)
+	)
+
+	tc-ld-disable-gold #470634
+
+	# compilation with -O0 fails on amd64, see bug #171231
+	if [[ ${ABI} == amd64 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		replace-flags -O0 -O2
+		is-flagq -O[s123] || append-flags -O2
+	fi
+
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
+	# use `set` here since the java opts will contain whitespace
+	if multilib_is_native_abi && use java ; then
+		myeconfargs+=(
+			--with-java-prefix="${JAVA_HOME}"
+			--with-javac-flags="$(java-pkg_javac-args)"
+		)
+	fi
+
+	# Bug #270851: test needs TCL support
+	if use tcl || use test ; then
+		myeconfargs+=(
+			--enable-tcl
+			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		myeconfargs+=(--disable-tcl )
+	fi
+
+	ECONF_SOURCE="${S_BASE}"/dist \
+	STRIP="true" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	db_src_install_headerslot
+
+	db_src_install_usrlibcleanup
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+multilib_src_install_all() {
+	db_src_install_usrbinslot
+
+	db_src_install_doc
+
+	dodir /usr/sbin
+	# This file is not always built, and no longer exists as of db-4.8
+	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
+		mv "${ED%/}"/usr/bin/berkeley_db_svc \
+			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi db_fix_so
+}
+
+pkg_postrm() {
+	multilib_foreach_abi db_fix_so
+}
+
+src_test() {
+	# db_repsite is impossible to build, as upstream strips those sources.
+	# db_repsite is used directly in the setup_site_prog,
+	# setup_site_prog is called from open_site_prog
+	# which is called only from tests in the multi_repmgr group.
+	#sed -ri \
+	#	-e '/set subs/s,multi_repmgr,,g' \
+	#	"${S_BASE}/test/testparams.tcl"
+	sed -ri \
+		-e '/multi_repmgr/d' \
+		"${S_BASE}/test/tcl/test.tcl" || die
+
+	# This is the only failure in 5.2.28 so far, and looks like a false positive.
+	# Repmgr018 (btree): Test of repmgr stats.
+	#     Repmgr018.a: Start a master.
+	#     Repmgr018.b: Start a client.
+	#     Repmgr018.c: Run some transactions at master.
+	#         Rep_test: btree 20 key/data pairs starting at 0
+	#         Rep_test.a: put/get loop
+	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
+	sed -ri \
+		-e '/set parms.*repmgr018/d' \
+		-e 's/repmgr018//g' \
+		"${S_BASE}/test/tcl/test.tcl" || die
+
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return
+
+	S=${BUILD_DIR} db_src_test
+}
diff --git a/sys-libs/db/db-6.2.23-r1.ebuild b/sys-libs/db/db-6.2.23-r1.ebuild
deleted file mode 100644
index eb10afdca6a0..000000000000
--- a/sys-libs/db/db-6.2.23-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--disable-sql \
-		--disable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
deleted file mode 100644
index 8189e375cba1..000000000000
--- a/sys-libs/db/db-6.2.23.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.2.32.ebuild b/sys-libs/db/db-6.2.32.ebuild
deleted file mode 100644
index 4c2b280e1fc6..000000000000
--- a/sys-libs/db/db-6.2.32.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc java cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(get_version_component_range 1-2)/db.h
-)
-
-PATCHES=(
-	# bug #510506
-	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
-
-	# use the includes from the prefix
-	"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
-	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
-
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	# Include the SLOT for Java JAR files
-	# This supersedes the unused jarlocation patches.
-	sed -r -i \
-		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
-		"${S_BASE}"/dist/Makefile.in || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal aclocal_java" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	tc-ld-disable-gold #470634
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# use `set` here since the java opts will contain whitespace
-	if multilib_is_native_abi && use java ; then
-		myconf+=(
-			--with-java-prefix="${JAVA_HOME}"
-			--with-javac-flags="$(java-pkg_javac-args)"
-		)
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myconf+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myconf+=(--disable-tcl )
-	fi
-
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf \
-		--enable-compat185 \
-		--enable-dbm \
-		--enable-o_direct \
-		--without-uniquename \
-		--enable-sql \
-		--enable-sql_codegen \
-		--disable-sql_compat \
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
-		$(use_enable cxx) \
-		$(use_enable cxx stl) \
-		$(multilib_native_use_enable java) \
-		"${myconf[@]}" \
-		$(use_enable test)
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
-		java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
-		rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
-	fi
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED}"/usr/bin/berkeley_db_svc \
-			"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
new file mode 100644
index 000000000000..40570cafe210
--- /dev/null
+++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
@@ -0,0 +1,11 @@
+--- db-18.1.25/dist/aclocal/sql.m4
++++ db-18.1.25/dist/aclocal/sql.m4
+@@ -99,7 +99,7 @@
+ if test "$db_cv_debug" = "yes"; then
+   CPPFLAGS="$CPPFLAGS -g"
+ fi
+-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
+ 
+ # Configure JDBC if --enable-jdbc
+ if test "$db_cv_jdbc" != "no"; then
diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch
new file mode 100644
index 000000000000..dc3d8ae93c5a
--- /dev/null
+++ b/sys-libs/db/files/db-18.1.25-test-link.patch
@@ -0,0 +1,38 @@
+--- db-18.1.25/test/tcl/parallel.tcl
++++ db-18.1.25/test/tcl/parallel.tcl
+@@ -296,17 +296,26 @@
+ 			    [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
+ 			    $destdir/$buildpath}
+ 		}
++		catch {
++			set l [eval glob {$dir/.libs} {$dir/db_{checkpoint,deadlock}$EXE} \
++					{$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \
++					{$dir/db_{archive,verify,hotbackup,log_verify}$EXE}]
++			foreach fn $l {
++				set fbasename [file tail $fn]
++				eval file link {$destdir/$fbasename} $fn
++			}
++		}
++		# we will be modifying this file, so we must copy, not link
+ 		catch {eval file copy \
+-		    [eval glob {$dir/{.libs,include.tcl}}] $destdir}
++		    [eval glob {$dir/include.tcl}] $destdir}
+ 		# catch {eval file copy $dir/$queuedir $destdir}
+-		catch {eval file copy \
+-		    [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \
+-		    {$dir/db_{dump,load,printlog,recover}$EXE} \
+-		    {$dir/db_{stat,upgrade,archive,verify}$EXE} \
+-		    {$dir/db_{hotbackup,log_verify,tuner}$EXE}] \
+-		    $destdir}
+-		catch {eval file copy \
+-		    [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] $destdir}
++		catch {
++			set l [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}]
++			foreach fn $l {
++				set fbasename [file tail $fn]
++				eval file link {$destdir/$fbasename} $fn
++			}
++		}
+ 
+ 		# Create modified copies of include.tcl in parallel
+ 		# directories so paths still work.
diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
index 8ddb46b70261..f1f701de1261 100644
--- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch
+++ b/sys-libs/db/files/db-4.3-listen-to-java-options.patch
@@ -1,5 +1,5 @@
---- dist/configure.ac	2005-09-23 21:01:26.000000000 +0200
-+++ dist/configure.ac	2005-09-23 20:59:20.000000000 +0200
+--- a/dist/configure.ac
++++ b/dist/configure.ac
 @@ -385,6 +385,7 @@
          # A classpath that includes . is needed to check for Java
  	CLASSPATH=".:$CLASSPATH"
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 663d6090c86e..4e39c6a9c56a 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -6,5 +6,5 @@ DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a
 EBUILD e2fsprogs-libs-1.43.6.ebuild 1840 BLAKE2B a19251886cdef945b7ea5cfb7dfc48084bb716a4caa640a14f9bfde6b0477695cb441a580be4296a3aa8063940763d0f0a050904dc67e501990bdd12db754035 SHA512 5cf26cc9ccf3c3416f8723040aad5b487145d9bdabad8dd3518c287a92ddafdfb4deabfaa92424a709de9e7f794bc1c52d69839fd63e6c9ea687af9ba77e91e5
 EBUILD e2fsprogs-libs-1.43.9.ebuild 1855 BLAKE2B c76037365439d40f9bb1f00c25149d124804897e46c90484d9661a71592559c727b7e2e1af526d7b5cce68ecb70bcf6fd99037548728598629dd9ab323d6649b SHA512 2f007b3f188fcafee57bb2631649991546fa247046341c4f3d50d9605180efbea87e1c03a7d7b3b39491d02e7fb59dc71034fe60f0697cda8ebfb13fa478db3d
 EBUILD e2fsprogs-libs-1.44.4.ebuild 2423 BLAKE2B 2905555ceb779cd996118eac6282b97cb248d830b696d1197e355afe10bbdef34be3e03c3b35bc9efdf7c063cc3096cc6c4ea3d1e8a95c35d15865e597660a73 SHA512 eff53431600c9fdfdb918a28da5bb7c1c3abfbfab0abeadfb830ce8cc52e0aefde5efab1c28b51652562917ec89b558b2986d6b16e58f0f523e5de8ac44c29a2
-EBUILD e2fsprogs-libs-1.44.5.ebuild 2414 BLAKE2B bec6349514192532fbc455d2061092256f59d4b33e14e39136aee00ce0503214ce2a27cc596dad3bd2eb26886bda6d6fdd0232ccbb57dd906302b71bc324c87a SHA512 8fee54e609d4e5d989bfbb7b981022e9a5d4175813f523cf0a6c6ec590c88022c3e809ba6d68146ec88d919c714dbc56a8ae65e3233afba5b7e168534c4e25e4
+EBUILD e2fsprogs-libs-1.44.5.ebuild 2410 BLAKE2B 9cd75fa47bfd6f1583d48c192faf1333581796b279bca45847d5a493128724e71e47f572b6f35dd29a793d460fc867b3dfd123a05771602f4cbed02324c24731 SHA512 d4dc72c11d209b67176df62444014f2c9f1b081c4256914a6eaebe2b7d00244ef7b2320b7cf9980d3c92e93bb4f52f2bf2d6c03d2c862d94e439bd7cd84d0690
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
index 35711623a3af..f04a68358821 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${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 ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 656771a3b574..ff72847cbcd9 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -5,10 +5,10 @@ AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e9
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
 DIST freeipmi-1.4.8.tar.gz 3185068 BLAKE2B 4133a7cdb5f66a28c07e965e6842c9d5931edaab7c19a4d4e89f5907ffa5c3f9e753b7738141206835346d06ecb7045780fe2913682ce70153822895c4da4425 SHA512 3cd4acde402bbc945b007e31e7f8dad3ad4539d2cf00310e9168d7cec8024203a280c8ad91e3f08b86dfa9be536779969c5393c4523df2fe8eb904f765fcfc56
 DIST freeipmi-1.5.7.tar.gz 3321187 BLAKE2B c6f7e9c4e0a03ce1d50972fee99741ec00a8f5beb0323d61d9217b3773eed33cb04e7bb92e1f293cb39c8012872babdc4774e6d81cf808615b8b283510e1e67c SHA512 a4d39d11d4e4b9635c272ee3a197729ac61c3e1c909c202498fb480c41289116eb933cd716fe2e0b5aa6dc258751ee204892bfb009398b6d5c2c65ee1cc58544
-DIST freeipmi-1.6.1.tar.gz 3398508 BLAKE2B 48c7cd791a635a1d82cc6304c8080aa2f88415c33a8dabf80a844305de5d21ef3bf20fd236c5a56d3a761fdadc1449b8750728465263828b157f93ba6080ad87 SHA512 f8ee5b3b59c0ccffeb52717a134cb8c149e42f3f66ea20420e4efbdbdc79d527e52e6d20b2a75a4406bc8c2190f368f83d8d36cef611eeeabd58ff7bf95380e5
 DIST freeipmi-1.6.2.tar.gz 3399236 BLAKE2B aedbfc785c1ec68418b9cfa79873d1b39a9591bfc5536a52c699c68558626c60aa11d29297252aa5fd2911fd47b88ab7010b8e72054431005f38a70268966bed SHA512 5c3f0b3f0632ad89a49a69aae28420c6ec342c9924aff5a8b6c0ccc1dc2f26f8c68906fbd1bc00f0f102dc50690596bb9e8c3443cdcbf93dabb91a7529d87ee8
+DIST freeipmi-1.6.3.tar.gz 3414736 BLAKE2B 8ae8d3744c98c5264c449da4cdd3335e36372dbef45d53e8329203bbb3bf39433f67393c2f0009a98e7c5e6afa52f461c8873c3e33334fe9189f5750a539b8c9 SHA512 473dc26fe22e5d801cb640d5e99ded715e22e8c65d21632145e6711a24ffd60e09a842194d4cc87ad3f506f4b5456be393d87baf726d2479a34f6fc8644eedd7
 EBUILD freeipmi-1.4.8.ebuild 2437 BLAKE2B 94a08cc0def79256536a9b912610611b324804aa56b07e74db6dc69c9b96ec4013ed592d5a345b0f1f9016434b54aba80135d3656fa51a582ab1bdde60917ca4 SHA512 f1587c29e63fa8d11e98857a816c22f2e7bed14d6e5fbf65fff3e0fd9f7ae8a391993dfd28883808365f2be9a51994a2903e7905f13f1ec0fa9a309eddf39ad9
 EBUILD freeipmi-1.5.7.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
-EBUILD freeipmi-1.6.1.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
 EBUILD freeipmi-1.6.2.ebuild 2375 BLAKE2B 6cf2866bcf7e355bfe9c5e803d7423eb9adce18274b27b4d25be91a3e309d71934e187f0f53418c18eacb329879aeaaa518534620ca1f6d129ae0ffc657bfb19 SHA512 b6e1f15b39894f475a56981a3721e1a2fef14205bf0aa51cd43f837aeeb96cb14c70bcb1f7d3580a5f6d474d1300bab4b7f654511560090c3d70fefbfee3faaf
+EBUILD freeipmi-1.6.3.ebuild 2407 BLAKE2B d37b0656b06e4f635b662a402dc32ce5fdbce6d66b9e9e2812a5d13b21fb75c878917cd910182c7c958561d429ccc183e79831f168c80e105211237f501673df SHA512 9faa6a1b420faf4936f5172be2fbfd9e0bce48d99c993d6893c3a0790369cc6d112453ebd19960bcddee92e6048bc9ff65a60eb7d382d12c0c45d0cc12af7a6e
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.6.1.ebuild b/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
deleted file mode 100644
index 44c0af38ab67..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.6.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AT_M4DIR="config"
-
-inherit eutils multilib
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="https://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}"/${MY_P}
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug nagios"
-
-RDEPEND="dev-libs/libgcrypt:0"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-RDEPEND="${RDEPEND}
-	nagios? (
-		|| ( net-analyzer/icinga net-analyzer/nagios )
-		dev-lang/perl
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		--disable-static
-		--disable-init-scripts
-		--localstatedir=/var
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	default
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	# Install the nagios plugin in its proper place, if desired
-	if use nagios; then
-		dodir /usr/$(get_libdir)/nagios/plugins
-		mv "${D}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
-			"${D}"/usr/$(get_libdir)/nagios/plugins/ || die
-		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
-
-		insinto /etc/icinga/conf.d
-		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
-	fi
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.6.3.ebuild b/sys-libs/freeipmi/freeipmi-1.6.3.ebuild
new file mode 100644
index 000000000000..d15762658c96
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.6.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+AT_M4DIR="config"
+
+DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
+HOMEPAGE="https://www.gnu.org/software/freeipmi/"
+
+MY_P="${P/_/.}"
+S="${WORKDIR}"/${MY_P}
+[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
+SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug nagios"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+RDEPEND="${RDEPEND}
+	nagios? (
+		|| ( net-analyzer/icinga net-analyzer/nagios )
+		dev-lang/perl
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		--disable-static
+		--disable-init-scripts
+		--localstatedir="${EPREFIX}"/var
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+# There are no tests
+src_test() { :; }
+
+src_install() {
+	default
+
+	# freeipmi by defaults install _all_ commands to /usr/sbin, but
+	# quite a few can be run remotely as standard user, so move them
+	# in /usr/bin afterwards.
+	dodir /usr/bin
+	for file in ipmi{detect,ping,power,console}; do
+		mv "${ED}"/usr/{s,}bin/${file} || die
+
+		# The default install symlinks these commands to add a dash
+		# after the ipmi prefix; we repeat those after move for
+		# consistency.
+		rm "${ED}"/usr/sbin/${file/ipmi/ipmi-}
+		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
+	done
+
+	# Install the nagios plugin in its proper place, if desired
+	if use nagios; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		mv "${ED}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
+			"${ED}"/usr/$(get_libdir)/nagios/plugins/ || die
+		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
+
+		insinto /etc/icinga/conf.d
+		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
+	fi
+
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
+
+	keepdir \
+		/var/cache/ipmimonitoringsdrcache \
+		/var/lib/freeipmi \
+		/var/log/ipmiconsole
+
+	# starting from version 1.2.0 the two daemons are similar enough
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
+	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
+	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 61541b09cbf0..c903f1b2ae1f 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -12,17 +12,15 @@ DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b820194
 DIST ldb-1.1.31.tar.gz 1337586 BLAKE2B 9454f91a621368cfc7cfdb709781653e947d63b275bb3b288049acb43ee3c02ae4f0be820ccf9e3bb32938d12598a91b7a6292b08c638ccfd59bd1be182f09c0 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824
 DIST ldb-1.2.3.tar.gz 1344513 BLAKE2B 941174d6e2c51319c8690a8d8a87bea443d4fa4d738bd13243b502fdc9d590ba075fcf4a9920c38bb6fc15564f0b116089cd62d99e7cfe33649dc751910265ad SHA512 500ab069cf6cec39907300e3905d334163b5094087831708acc22c4199b006ef52af3b66aade7558a48fab7cd69be3af7883bda3816a83c576d01b36ab270247
 DIST ldb-1.3.6.tar.gz 1374574 BLAKE2B 654f35eb25aeb373540ead7cb10da66c92970ea6b100631cb14bacf937fec64e09b19ed3e09a976406e3f8d6347c4e17144c0a0bff8795316559be45353edbf7 SHA512 8fcd72598e948c55adaa832d6ebcbc03b979281032cb900af4304c1c68ce9cc94a1e1d4729d0c2a0b83a618cab716749d851160005a0093cf8a178e6dbea298d
-DIST ldb-1.4.2.tar.gz 1427857 BLAKE2B 5a90b31b4760f0504197d3cefdb16f7d4099df660fe75c5d80907e39abde8abc6b87cdb117ee9213abf8287932c18782ab153d87bb609cb1f346231e6e00997c SHA512 f2b44cebd0f8c77926aa364d9ac4ea37da4a780b94e7f9fba7a55fef825e90e469a3230e56cd2b23ce4f6b528dda9041863e4af77bb0826a117e8317a0b79070
 DIST ldb-1.4.3.tar.gz 1428730 BLAKE2B 1e0fec1aeb05ecd34b7dc88d85425b646ab28804245543256c575a44c1a321e873d74f623b1a003aec878a808d6bc967ff57e8115650f6089278d55d586c7e6a SHA512 081dbc23e810213fb60fdb07c7f3bf1ec8849d10483c5cdabb8add2568d4f80d03bd74d7be3fcf9bb853eaf25aa6bbb2d69cda3f55dda0270978b051da315cb2
-DIST ldb-1.5.1.tar.gz 1432221 BLAKE2B 1837a74b33b5f527bdea0925de2908fc58bb6ca713bea89cefec9dc9809bf40d107352926ed34dabb333f37533e599b142a36989ffad862b0a89e786ab54c434 SHA512 b7815da51944d4e61617fafac0417e57baa59c9dd3dfa926d5ef9072a95351562930150c691a23b81526697bfba3ffe10a75ead406bf5ffdbfc511d1861f984b
+DIST ldb-1.4.4.tar.gz 1428851 BLAKE2B 8b2dc6dc95f5c8d1a04aab58efb622b4550e6d8fc6f12aafe36b7080a5d59ab2d7fc6429ac59de43a23cef690fa9f026ccf536f70bfd25a126a1a649f3c68d02 SHA512 eb5c364771732916f89c9ee8cf20909954a7215cd71333b79c17718dd1e25081cce6597e882b6f0d6158c207fb58d97311f0417bf3baffe72084977a4bd05896
 DIST ldb-1.5.2.tar.gz 1625665 BLAKE2B 612abb1e31f9fa5321824e40f627d8a498f871386cf51d83c03cae429c2895fc1747d551166ec64ae07751a3b9ddd1826b5cfe1ef7ee4b5460682e8ebb466a34 SHA512 5dda5935437a82356cb84593f5be0d22289a87da7460b24dbc0673e01614f0cc40859328c3a5da858f3f2dd173f2b214743ec709555bbfef09342045b37f3a6c
 EBUILD ldb-1.1.26.ebuild 2354 BLAKE2B d2842c0d9fab64092bdba589836f0e488ba3544bb4b74946c6aa881036dbcfba82ac94184ec04f3a12e752d065da61f3c1b2898b053dd260afec6cde14d2112d SHA512 195f61f5c6e120d159ec222105d2652b160a7a6c0aae1c6c97967a65cfca59acff8e895d121f375d3eefa7604e5b26fe84abc6136bf882ab6b100a838b44ee67
 EBUILD ldb-1.1.29-r1.ebuild 2557 BLAKE2B 6f23b14f5c826708addf796e96a6513cfac6c8b06609e3335cc3ac0fc551dd68ebef6f3f08b6bfc272af68c32ffc98af392292e891ece3ec16dd11dc87e1cd38 SHA512 165ab8aa5d0fb02620de597488e48048de2250a264c72adb31f044543b301a2584b5eddb1b75e7788d2501af67d74b7eda2e223f2732207ff0d381a185c26edb
 EBUILD ldb-1.1.31.ebuild 2691 BLAKE2B 240d2ccb3f152cbd134b3611d6db02185d6bddf7980b2a816d822fbb924817b798860edd08373d7eb452e451454591a7ce9db24a4475daa210b9e1ce014c14ae SHA512 368998dad5aa47bb8b971936aa5104d1ea5e7a594cd80af79f55e56cb49c2b28aa0322c15781f121bc4aef15d43e56690df324bb0900a7a15eac522b821d5872
 EBUILD ldb-1.2.3.ebuild 2619 BLAKE2B 447fe4e7cfb1e1e9350f215f93a818d0251861e3dfbd00a2f866dadfe260a76beb14e489b91eac279c52e800e93ac680131d27fde26d4ea22ce18ec15bf270d4 SHA512 b937f76a1b04d68a2117a8097890a7bfcfb4ef1fdef03c3a4e47908ded9cd0404cc7b26b26e6989fff9076d3e482f6d797ff9249c93ab616acce710d2b22b0d7
 EBUILD ldb-1.3.6.ebuild 2565 BLAKE2B 34dd25b463c9a196814a80b85f456679c84b09d1cd3c85439c145ce94f593501e5d317c990a559febbb1d462f321aced9d5e92993a6c2bfa95aeb969c1c2a58f SHA512 a41e46ff7f02766bbc997953cc1a94aeed3b99a9a676bcd39a9e1d9a34ffd705269110d9ba25ba21a4baeb068edd4e5a82c38ad211d68fc500c67bdaa91704de
-EBUILD ldb-1.4.2.ebuild 2666 BLAKE2B 2a516abf165389e8816f96078ea5f2d0588b36560e79398abf466373ff8f8885a415708642246e8849bc4e11d054213dae2763eee37b5b331c53d099f8cdf614 SHA512 0ac6f804a59452e1fd9a7300ef661ebf181366c356bd8e1c60e2fa646df1878cbb0bbcd9a71b695170a3c62130712ecca86bebe7a994b211bd6877f46b392a16
 EBUILD ldb-1.4.3.ebuild 2663 BLAKE2B 4bf1c9db5af109b5e46f34341579954f75563049e268c22e56f8e604693d7ca450b7680bd00d4037753aca9b4e2dfd591794432268b3298c63af9fbe17590a8a SHA512 526a4c7bd31b2d64576e7e81ba3fab6b750131ea9d359c95f85f123cf631b623284c35814fe5eea12839ec959c2fdc14c95ecd79c13e39690a6b30f5de250837
-EBUILD ldb-1.5.1.ebuild 2663 BLAKE2B 4bf1c9db5af109b5e46f34341579954f75563049e268c22e56f8e604693d7ca450b7680bd00d4037753aca9b4e2dfd591794432268b3298c63af9fbe17590a8a SHA512 526a4c7bd31b2d64576e7e81ba3fab6b750131ea9d359c95f85f123cf631b623284c35814fe5eea12839ec959c2fdc14c95ecd79c13e39690a6b30f5de250837
-EBUILD ldb-1.5.2.ebuild 2674 BLAKE2B f101c9b25c1886830fff9dc9ac6668c1a9515f103ef62d53441621ab9efc5cdd08274f61d52185c35cb25f4f707d367bda8a65724fb0449790b564f3087b3018 SHA512 f3c5fcd58067c58d0395f8ac07d1a0ab20adcc33af5b0368847500eb12ca75495f1e3d92e1f4a2361cc7dd3dba0d3cb41959012cfe37364e3b2f77ca2d454953
+EBUILD ldb-1.4.4.ebuild 2663 BLAKE2B 186de262be939174cc4cde757caf3a026e3305d98620b525c792cd80c8b1275c5ca598f97a777fa8dadc7e26a5ec3fe3b7620525875a05f1dbae02b63019b1bd SHA512 9fc09bf4bab8270b9a5d66d2e62e1846763d6675c820a42ee74f063e4aa1eb87690d527f5a01d559b773479659fc0b45c366b2d50145890b076fc51ecef91312
+EBUILD ldb-1.5.2.ebuild 2674 BLAKE2B 210f10b50ab74c85a59167dd46bd5b2bc2bbcc6df4b49aa6607350a51d89f768d1e3b886896c3252d7a5a288d93b607e096f6d14d4bcbb6013cd871d965a5690 SHA512 2f988d1ae36adf29f415b56ad8cedf0838f43dccd9bd4695292598f535e9797c84ac464d9d5468fda2ae40315d9434f7ad9a2b8f9aaaba09ec4785a8c5f89718
 MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
diff --git a/sys-libs/ldb/ldb-1.4.2.ebuild b/sys-libs/ldb/ldb-1.4.2.ebuild
deleted file mode 100644
index 0928dd65642a..000000000000
--- a/sys-libs/ldb/ldb-1.4.2.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
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ldap +lmdb +python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile(){
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/*
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.4.4.ebuild b/sys-libs/ldb/ldb-1.4.4.ebuild
new file mode 100644
index 000000000000..eb8e4d2e6efc
--- /dev/null
+++ b/sys-libs/ldb/ldb-1.4.4.ebuild
@@ -0,0 +1,105 @@
+# 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 python-single-r1 waf-utils multilib-minimal eutils
+
+DESCRIPTION="An LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ldap +lmdb +python"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile(){
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/*
+	fi
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/ldb/ldb-1.5.1.ebuild b/sys-libs/ldb/ldb-1.5.1.ebuild
deleted file mode 100644
index 0d4d99894e47..000000000000
--- a/sys-libs/ldb/ldb-1.5.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 waf-utils multilib-minimal eutils
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="https://ldb.samba.org"
-SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +ldap +lmdb +python"
-
-RDEPEND="
-	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.14[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python(+)?,${MULTILIB_USEDEP}]
-	ldap? ( net-nds/openldap )
-	lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
-	fi
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile(){
-	waf-utils_src_compile
-	multilib_is_native_abi && use doc && doxygen Doxyfile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		WAF_MAKE=1 \
-		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
-		waf test || die
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	if multilib_is_native_abi && use doc; then
-		doman  apidocs/man/man3/*.3
-		docinto html
-		dodoc -r apidocs/html/*
-	fi
-}
-
-pkg_postinst() {
-	if has_version sys-auth/sssd; then
-		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
-		ewarn "so please try to rebuild it before reporting bugs."
-		ewarn "See https://bugs.gentoo.org/404281"
-	fi
-}
diff --git a/sys-libs/ldb/ldb-1.5.2.ebuild b/sys-libs/ldb/ldb-1.5.2.ebuild
index b830ddd3c71e..d4a2629a9413 100644
--- a/sys-libs/ldb/ldb-1.5.2.ebuild
+++ b/sys-libs/ldb/ldb-1.5.2.ebuild
@@ -19,7 +19,7 @@ IUSE="doc +ldap +lmdb +python"
 RDEPEND="
 	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
 	>=sys-libs/talloc-2.1.15[python?,${MULTILIB_USEDEP}]
 	>=sys-libs/tdb-1.3.17[python?,${MULTILIB_USEDEP}]
 	>=sys-libs/tevent-0.9.38[python(+)?,${MULTILIB_USEDEP}]
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 6eacaf3d2c86..a52955cfbc90 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -3,5 +3,5 @@ DIST libblockdev-2.19-1.tar.gz 334391 BLAKE2B 1db31a5051822d4e6f4cc024f6eeee0c93
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
 EBUILD libblockdev-2.14-r1.ebuild 1514 BLAKE2B 1d27d975055e90cd84a20d070bac7ea1ae91235c3512aae87e6341f2d286db97570b8790e587321f3608f33e3fd1f8e1c67c50588edc56dca879f79d527060a0 SHA512 f054ded1e078677718e35797d6cbd5cf920d79696cc60203cccd5181c675824a65fb8769ac2ed92d7da26a7e11d68a5ada315a68eaddd17db15b9baf5c6ee799
 EBUILD libblockdev-2.19.ebuild 1779 BLAKE2B 51df1c82895a3072df8bd11070d3c36dc696c8067dca880584ceb12b4ded13cf456d7b68c68c4f13bb20eb94c705b9565e2a4590b9da52b8e5e9e6ab0f10e38e SHA512 ceb321334280b88d0b9bad1a11b34897d07cca7248af18e3b5ce9a5bdf61406e90682f7da1bb1650c0a38478cc914b480af1445d9fe8f88da0941261d143ee4a
-EBUILD libblockdev-2.20.ebuild 1776 BLAKE2B f387ae674650970f29268a191d4193695612e82cd47ced5d077d5aebd79a704a147f8015fa6c65a5a2980bddb691e405a31e167498bfa49dd9c6adabb868aacc SHA512 7f48ad8d93b14874db5150a422cb36e567c14ab8ad6730d5052aeaa3a5faaf64f4f1ca54525e73c3e2feb5ee8aed719ce5ff8acd21d376aeaf74ae13a4d307cf
+EBUILD libblockdev-2.20.ebuild 1774 BLAKE2B 42b04f928561132525813134ea498c35938555bd4d186d2809bc36fca44e35aeeb778290a3461ee3a47795300956eab436aef8f80205c581595fa1c5057de387 SHA512 34a4f0d8c11707325f5d305b4c7d184d49759cc1bd369097a13c4ba3585a4c1e413d1590d7aabf1333ee7ef34fbb7667ad62549a4a6d834b7cf05b305f291519
 MISC metadata.xml 938 BLAKE2B 3527b371818b7b6ab3362ab4335098447dbc3541ebc95d1c8dc5487ae4a323e9d0bd5462201ce3432df95399b8acdb1f5735260000c967b4b786f2483507b110 SHA512 ccd9292fc8eabb982a3f016c15cf53b4d8d307109dbd5896d1190019a2f35032cc393454568c0a48223c0e9a2a8e42e8e015f16b9a52c758d55c904a308f6e66
diff --git a/sys-libs/libblockdev/libblockdev-2.20.ebuild b/sys-libs/libblockdev/libblockdev-2.20.ebuild
index d1eb0822af1c..1df01f3cb707 100644
--- a/sys-libs/libblockdev/libblockdev-2.20.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/storaged-project/libblockdev"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 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="bcache +cryptsetup dmraid doc escrow lvm kbd test vdo"
 
 RDEPEND="
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 66ee75c9d119..97a4c129fab9 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -13,4 +13,5 @@ DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707
 EBUILD libunwind-1.1-r1.ebuild 2451 BLAKE2B 65ee170114b63d5405fb81ff6287cd9486d519c56bc5a5e05bdaea40036168f85093f057d2c22de54813c6d08a7b4269331be313df2a88b5d071ccdf1e35be72 SHA512 692315630f4bf8c422cd0ebc46b91a6dbaae1cee4e464c4d2c7d24842c906b426fe0511bb7220b65f2f248921a91aaa8a1eca00de77c625d16cc2443246528ac
 EBUILD libunwind-1.2.1-r1.ebuild 3185 BLAKE2B 0ab1544607e8d04dea1e24ec4396599bf81209891e100e8776fe0c5bdc816802ccf1df90cb535db42bdab46b5939ab1274d7888c6e844cfdbde02a548523251d SHA512 b590b26028a727e329e1558430d2b978e5a6db811cb1ddb1b7e6fe1110b108b36e39f651ced071d641bba45158610fd45e36c78f6084344aef47ce837b065292
 EBUILD libunwind-1.2.1-r2.ebuild 3246 BLAKE2B 5017270dade9c6c7a4ad6649253eecccef430979eb90b761a78ff8b476d03ed5e3e2415be7693072f0dc0631971e439a1017c01ac48a16bd6a26beee97b98601 SHA512 3e16f8ee57a886d02f4eac63247191f232ed3cdac9d2f40e6824db806dbed4127386c79c0b9642f63435b5cd6c3f4bef5599df24b92b45c86c8fe5575bc7678a
+EBUILD libunwind-1.2.1-r3.ebuild 3283 BLAKE2B 695098794bedf6b577c9f97c0395f460323b0ed4a14d5f3388773b84517a8c80a024013bd24bda07e2b70254db32ccf77429e91ba6c0baa20beb7fba507b476c SHA512 a5976f45f296a171772da9fbd2295f695e5d06ce9c361d0dc25d5db3b22007aef66ad56acc653f6055928099b1b512716ac9f660d4b7f95dcb8e67d2e4820056
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..27084d43a5b9
--- /dev/null
+++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+inherit autotools eutils libtool multilib-minimal
+
+DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
+HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
+SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug debug-frame doc libatomic lzma +static-libs"
+
+RESTRICT="test" # half of tests are broken (toolchain version dependent)
+
+# We just use the header from libatomic.
+RDEPEND="lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libunwind.h
+
+	# see libunwind.h for the full list of arch-specific headers
+	/usr/include/libunwind-aarch64.h
+	/usr/include/libunwind-arm.h
+	/usr/include/libunwind-hppa.h
+	/usr/include/libunwind-ia64.h
+	/usr/include/libunwind-mips.h
+	/usr/include/libunwind-ppc32.h
+	/usr/include/libunwind-ppc64.h
+	/usr/include/libunwind-sh.h
+	/usr/include/libunwind-tilegx.h
+	/usr/include/libunwind-x86.h
+	/usr/include/libunwind-x86_64.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
+	"${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
+	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
+	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
+	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
+	"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
+	"${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732
+	"${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674
+)
+
+src_prepare() {
+	default
+	chmod +x src/ia64/mk_cursor_i || die
+	# Since we have tests disabled via RESTRICT, disable building in the subdir
+	# entirely.  This worksaround some build errors too. #484846
+	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
+
+	elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --enable-cxx-exceptions: always enable it, headers provide the interface
+	# and on some archs it is disabled by default causing a mismatch between the
+	# API and the ABI, bug #418253
+	# conservative-checks: validate memory addresses before use; as of 1.0.1,
+	# only x86_64 supports this, yet may be useful for debugging, couple it with
+	# debug useflag.
+	ECONF_SOURCE="${S}" \
+	ac_cv_header_atomic_ops_h=$(usex libatomic) \
+	econf \
+		--enable-cxx-exceptions \
+		--enable-coredump \
+		--enable-ptrace \
+		--enable-setjmp \
+		$(use_enable debug-frame) \
+		$(use_enable doc documentation) \
+		$(use_enable lzma minidebuginfo) \
+		$(use_enable static-libs static) \
+		$(use_enable debug conservative_checks) \
+		$(use_enable debug)
+}
+
+multilib_src_compile() {
+	# Bug 586208
+	CCACHE_NODIRECT=1 default
+}
+
+multilib_src_test() {
+	# Explicitly allow parallel build of tests.
+	# Sandbox causes some tests to freak out.
+	SANDBOX_ON=0 emake check
+}
+
+multilib_src_install() {
+	default
+	# libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
+	# shared library, so we keep it in any case
+	use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete
+}
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 01522ce934e4..24f3dc20b435 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -5,5 +5,5 @@ DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
 EBUILD lwp-2.2.ebuild 743 BLAKE2B 9769b2d8bef4dbac08721740c7a06c0546f2db5d54e6c8277bfa4505b331910cf04a72af56b01af88fd5ce21268865ab4cdb048e95e2e1502efef3add1199e93 SHA512 a0f6b1911cf58893fcf81753e43f41c25d8e9151ad15189cb3e99fd432fbd2d6761002887a2df52e3479a70e1f292486ee61835d9802bdb686ece8228a052c16
 EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
-EBUILD lwp-2.8.ebuild 526 BLAKE2B 10b2ef3b03cad52345d2bf7d130a84a0d69bb8a7a5ea841b0cb816719779579e54a19c62a3d879acc640fba6cf4db8a567e57030e12779288eb23c44d5dccd7a SHA512 c94e02dc076fd11d4b1469bed295f759784beddd60169f3080cf4093daf60de49558908e1d9852858896d58d44856ab6b60f30c7ea3dd0ed154b6f08bcb56362
+EBUILD lwp-2.8.ebuild 522 BLAKE2B fb5f3ed46c3f5b025604f6e64d43fbad5d173c9319cfbe2792bdbf452a2525f71a4501ccccf3d89edd84ba7fb6f148faecfa00f6f3a2c95c48f69c17801ea38e SHA512 7f57ee9faeef1bfc493c1c6c7ab6b7aa5a6131d7861b0fa5aae82231103bc727a6d60e43206eacd22b029750460a4b8b71526ab32a567807ff1b24b85979ee58
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/lwp-2.8.ebuild b/sys-libs/lwp/lwp-2.8.ebuild
index 8c6c03ac8111..b84f7a29d53e 100644
--- a/sys-libs/lwp/lwp-2.8.ebuild
+++ b/sys-libs/lwp/lwp-2.8.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="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 75a349583ada..f6212dcf1561 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,10 +3,9 @@ AUX musl-1.1.20-fix-getaddrinfo.patch 1877 BLAKE2B 2b213efe9da356f0b07a448c311cf
 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
-DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
 DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
-EBUILD musl-1.1.19.ebuild 3052 BLAKE2B 5ef489e0ed841a692375c06e85b304eefc046dfe91cd15b9255208ebc34ef571bd8d32074fa0e7babae1d93497e3b5d46295e74e3fd33eab6210d2f08b04c848 SHA512 1eb90564e0f0939fff635a48799c992e8301911a5c1382e0a20975a149eec6bcc5a3f79e3ac51f5e8bcd5ee7bd22bc01aa28ee378be7b684a1c0235af2d6ef0d
+DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
 EBUILD musl-1.1.20-r1.ebuild 3131 BLAKE2B aa772ac4c028022eb5bebffeb746b8f9393376966f1b1feaa2d6c10d58d0cabf91bbafd9d70aa37fdf00e458141da01498d9e4c90d28c92538ea5f12ca0fe7ea SHA512 7312e4ed0a7d7de47e8ccaba7d5e752f8afac2d4c2e128500f93101e4cd02702ecf96acf0107e0359df8e96228fc276540541146cc4d062f5687ec26b10dc2ad
-EBUILD musl-1.1.20.ebuild 3055 BLAKE2B db7546fa0a34f8d422d9413ae4459516b49223072a804b89a8893d156c8e909aeb8cb6c7b31b136300ac88710fc23193cd23f6472bb6eff0bfe871436d1fad82 SHA512 6c9d750ac2db36f9875d738f4e20e3885eae7e870d5ff07d7e87f6445e4e4c6740ab4ae67281ae1c00d93c77540949da8691d65da9760cf769c919da6dcf003f
-EBUILD musl-9999.ebuild 3057 BLAKE2B 0d689b80a869101edc855978b619d4e668f11886122294f242e27093647c64388c9481fc3d50303ceadeafc6ea37f9e29682e04e2bde0f82da59834bf97ebbcb SHA512 11ee3bc218c99a891c62d7efe4de1fedf650b1614a117c62b9d1469e5c8ffc448385533b5ff9320dc838e7ed8ccd9d5dce24f8fd46787c1f6f027dd54685d348
+EBUILD musl-1.1.21.ebuild 3052 BLAKE2B b4c1eefdbeb949335f599afe5962d77936e8fd1c8e311bfccf10929f1f0c5cd33750821db1be42ac3bed869e1d38c5ca258850fafa4518a700c607074ce348c0 SHA512 1deaed83a3ed4685116550fb7960141e7b3b12be4d8d985bc31ea82cc2dba075aad3267fca3cadfa1f2bf3033551025d7eab96ee8057fe2d4d56c01ad101a514
+EBUILD musl-9999.ebuild 3054 BLAKE2B a7fab7e588b3dc356ebcae705ba9eecd5656fdeb01a0fb76b7d7815642e33b356cb655cfefa98c4a471c0b2c7bc40073b8b36ecde8e331ae6585ba059a9b54eb SHA512 1251eab79c1aeb716912d350cef661fe67bc1c030f57e5922d7b534d03c2d0de3e8b3d2c61bedef6160fcceeefd62524d987d067de443cde048e598a5c8f0346
 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03
diff --git a/sys-libs/musl/musl-1.1.19.ebuild b/sys-libs/musl/musl-1.1.19.ebuild
deleted file mode 100644
index 9c2f1c169cfd..000000000000
--- a/sys-libs/musl/musl-1.1.19.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 arm arm64 ~mips ppc x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
-	fi
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
-		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.20.ebuild b/sys-libs/musl/musl-1.1.20.ebuild
deleted file mode 100644
index 768c9e7412d8..000000000000
--- a/sys-libs/musl/musl-1.1.20.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.musl-libc.org/musl"
-	inherit git-r3
-	SRC_URI="
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
-	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
-	https://dev.gentoo.org/~blueness/musl-misc/getent.c
-	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
-LICENSE="MIT LGPL-2 GPL-2"
-SLOT="0"
-IUSE="headers-only"
-
-QA_SONAME="/usr/lib/libc.so"
-QA_DT_NEEDED="/usr/lib/libc.so"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
-		esac
-	fi
-}
-
-src_configure() {
-	tc-getCC ${CTARGET}
-	just_headers && export CC=true
-
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	./configure \
-		--target=${CTARGET} \
-		--prefix=${sysroot}/usr \
-		--syslibdir=${sysroot}/lib \
-		--disable-gcc-wrapper || die
-}
-
-src_compile() {
-	emake obj/include/bits/alltypes.h
-	just_headers && return 0
-
-	emake
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
-		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
-	fi
-}
-
-src_install() {
-	local target="install"
-	just_headers && target="install-headers"
-	emake DESTDIR="${D}" ${target}
-	just_headers && return 0
-
-	# musl provides ldd via a sym link to its ld.so
-	local sysroot
-	is_crosscompile && sysroot=/usr/${CTARGET}
-	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
-	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
-		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
-		cp "${FILESDIR}"/ldconfig.in "${T}" || die
-		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
-		into /
-		dosbin "${T}"/ldconfig
-		into /usr
-		dobin "${T}"/getconf
-		dobin "${T}"/getent
-		dobin "${T}"/iconv
-		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
-		doenvd "${T}"/00musl || die
-	fi
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	[ "${ROOT}" != "/" ] && return 0
-
-	ldconfig || die
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
new file mode 100644
index 000000000000..455b845402c8
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.21.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index c9d12c961923..22f16fa8bfb0 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-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
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 5bf29cbcc634..e0e09cb79fa6 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -48,6 +48,6 @@ EBUILD readline-5.2_p14.ebuild 1598 BLAKE2B c3ecb5f6130c10718b55db1a3e1d092cfce6
 EBUILD readline-6.3_p8-r3.ebuild 4383 BLAKE2B 51ed7b8cb69f0d776ff9ff55b98eb68f31ba09fa129fc92972eea4fc468d819b6e1cc0394164b2d76c9137f308e89845827dbe9227dbf46fbab1be7c6fc78ded SHA512 6d3fee3e47449221123dacc7b64fd8c05101931b95502b65c05f8cf33f70c7a88788fbd196ea63203a8986a11204abdc57f890f6f11d966cafae7e48b478884b
 EBUILD readline-7.0_p3-r1.ebuild 4842 BLAKE2B 9415a62951536475fbd13f12d424cf6519ec190c22e32fead4665c9596ddec22bac56b2525b3b2702a553fc540c3e8449ebc4565a2815c0e3edc1dd36728b544 SHA512 aa737fe34a90f6ee81f9b36017ace1a89b75e1fd7632d417e129711d5119a9d33331f679dc3b4a0424e67fe9658c18773fc490c8c51ab9114a9c85ee44de615d
 EBUILD readline-7.0_p3.ebuild 4597 BLAKE2B 4e5d1aa3dff883d9ee4b1dffcf7670e30d7224f6c0496fe305eca3ef3611e060762bba5ac1a57ed4a31ecfe02ee1e600015a0cc997d3ba777eb41898e135cec1 SHA512 cde16dedb5a7a0c2b237c5606bc504aa89ec584940ea32386ad775f07efce7e1ee20ff02f3e6ea031a4edfdba72ee96af8a7e95a415ec3ef2953e101dcbd7340
-EBUILD readline-7.0_p5.ebuild 4830 BLAKE2B 594fccd85da05e80a59843c4df01f1e8a4320d8cd3b091d7190e4b35dfcd7455885a0fcf30ce584abea71627979ef6317c9ab1b8dc333242ffe7bc49fe06500d SHA512 01c1c525ca231adcc56b21e9dd4bb75013024aadd0320d062304b03aa9225201e3dd4603dc95184197d6d16f0cc6076d8a7c7d51dfca3dbb04be131b7df88515
+EBUILD readline-7.0_p5.ebuild 4828 BLAKE2B ee2286ad46ca5e2f3b9ff0232fd130d3f2071fc6b1dd1dcb23eefcad568914da276e8a6415e67345e85b51f5da1fa598e290f7af6a77ce79360e6a16218737fe SHA512 901d346d6392ebf23d13a8d639f1fe14af31f0e8703d694364475415be51ef43c4cd32116d7db27b398e75adaf2c906fc9dc8fab6d1f9d6a0b319637ce63172f
 EBUILD readline-8.0.ebuild 4795 BLAKE2B 693bf1a55ea3fcc3f8b18c41c34c5e98ccb848e535e28d3e51b6444dcb8a09d77b2e5f47bde05ee930850a1018d4bef32e5ef74b9ebdfe45163aa05b0a7fa4b9 SHA512 2a1f19f4d8154aeb6428f016265f1bbe8a2ef0cf5de20072ccd9c4f3c7a35fde1fee65c320f9742e0d3fb0962d1b00a1bb659e00769c8baade123dbce6ebb1c6
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/readline-7.0_p5.ebuild b/sys-libs/readline/readline-7.0_p5.ebuild
index 3d47122effb2..d9da52e7a36c 100644
--- a/sys-libs/readline/readline-7.0_p5.ebuild
+++ b/sys-libs/readline/readline-7.0_p5.ebuild
@@ -41,7 +41,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index a98e734aacb9..07ea6559154f 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -5,7 +5,7 @@ DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 EBUILD talloc-2.1.13.ebuild 2380 BLAKE2B 0e64d9fd06c20cd7e95d36b6470a6377f2375d6c84935890e7828832bda612b823a98883b7096c5b7649cd7f1dcf599344e124b01f2f0a398cb6551ebaf575a1 SHA512 5f671693ea5b04931079c5a21ba1cbe5b6c921aa38f3ae1971883664b86b46c88f897bcfe88d261d5f32e9c1406153eb2c241f376a58a4cab09d968c8a7795fa
 EBUILD talloc-2.1.14.ebuild 2373 BLAKE2B 4117cdae041b52420e10856806f28b892c3222e67aff1d5e2d933c8eaff6b5d09b6f34dd1d7601b1562b9d840f1cdb392c2abab13c7a4599552225117adf1ea5 SHA512 fdf4181af42001e92882a8dd683bdf4441ab9121d31bd5a1dfe5816ccbf137f371cdc7bef40ab9e96e415a1d16544829044e97aef2de57aef9549df321446b4c
-EBUILD talloc-2.1.15.ebuild 2388 BLAKE2B 908a0625cf1fcbd435a619cd538f0d3ae6bfded6b26738bcf9444da3f75fb94f200453e38ae5b2e19fdf3cb0c396bbbc27b105e332453b9d58dadea4324d39f3 SHA512 5cc33a600147a6937a86964fff3c07cda0421cf87cd05260a09d1af31bf3d2e341cf2b93fb292a0401bfcba67e032408c0ae12a7800669e15a5a3befa4afd483
+EBUILD talloc-2.1.15.ebuild 2458 BLAKE2B 546381fef8ff96b944761ef0f700c86a6f8ff8d02b122ede3dc408240c42f0ca75a3efaab2b13a687f084051eb02399b825b972b914f441289361b123735ea5e SHA512 b1d4a6da55ab5b5c232e371d03785df20cf72d20153e5e3a88281fcc88541942fc4a8f7565d91ef856a366e59c4c953f969ee495b9e8dff8c2fafe82d4bb643d
 EBUILD talloc-2.1.5.ebuild 2228 BLAKE2B bbc0fa903751d1a339fb245034daa6c4d847964bbac64fded77f4ec55f01008f7f16c605ed33c9c5cd316afdc6c535d1b95e2cf37201bef699a70f4027d63cd9 SHA512 e57715515960a630009d6ea6440f06512a464a0848ef2af1d250495cde356ade621dc14a2c647a570c75554673a63af739fadce0b814e72605cc0b31ba7a9957
 EBUILD talloc-2.1.9.ebuild 2410 BLAKE2B 1ac899c9b202154acf83f44d38cbfc6d932b1bfdb035c2cdf7d5c91a3c8b7ce4ab2991dad11fa02607891cc55c10551646a32d190fdb3a337448555bd6c7ca9a SHA512 b802eed330d3b295aae93b8fe0e3a17595ad26fa4a5002426a24d5a8725209f4a5985a8508ed94abfbabd3f93c189b94315122b29c258972288d801597f1074b
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.15.ebuild b/sys-libs/talloc/talloc-2.1.15.ebuild
index 6936a13a932a..65a8c5b61c9e 100644
--- a/sys-libs/talloc/talloc-2.1.15.ebuild
+++ b/sys-libs/talloc/talloc-2.1.15.ebuild
@@ -54,6 +54,7 @@ multilib_src_configure() {
 	local extra_opts=(
 		$(usex compat --enable-talloc-compat1 '')
 		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
 	)
 	waf-utils_src_configure "${extra_opts[@]}"
 }
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index d0a3bbe5bceb..b5d13fbde242 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 8f621e687b19..a9d5d389ee45 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -16,5 +16,5 @@ EBUILD audit-2.6.4.ebuild 6205 BLAKE2B 486150d4806a8d6839e1a660fccd9556b95db3bcd
 EBUILD audit-2.7.1.ebuild 6202 BLAKE2B bc171497850fa83d1c8e96d3c30913bc4b28078501aa1557577f9c8b3468ffe57d38360611acc0bc6857aa6cab5de07019d58e4edbaac345f75dbab8f39e3d8c SHA512 5058294f8da151fcf2ab11cde998161331b81c117a6ab540168634d6e15ecb88ec8fe639113b183790b430f239034d28f58d542935a5d235e2f7b4097e450d19
 EBUILD audit-2.8.2.ebuild 6216 BLAKE2B ad2391a4eb0802a63b1831646a1da196820605c9a6cf16c595bf1daabcd8b10161c09e23097f48b37378cfd3b18973fa264da92fdfb3df9942e99b736202156a SHA512 17f9261ca660386c6a24cf978dba360b3e911d5515c7ccb6174ad736b67ae33583185f1a758e57c692820d81886b7871a8283b809a959ff231e2700757f0de95
 EBUILD audit-2.8.3.ebuild 6203 BLAKE2B 428c823da15178e0d3569495d392da41dd93dfcf1c9fa65cc8fcc7f1704894d13d6718cdf8548c855444d439a4f7934cf01ffd6deb2d9eab5b23aef11675d74d SHA512 51665b60a864d92bdf0239cc54099db0c5a8248a5ef6c85ff62a97eef738caf9ff85f35e8cdbf07b6a562a3e6ad31b5834994f13c599b04dcfe5619261c07454
-EBUILD audit-2.8.4.ebuild 6203 BLAKE2B b5f1e24e26ba22f00307419bf7a5a02b841b1ebb5798dd47ba692bde374ee10963f9397e21e6cf9aa263e36cf392cf32a7e43ade906e895d25b9c34a23309ab2 SHA512 33658ddc5c867a11fe627a2e79735eb8ff26739838182642c3adf204418fed587b4040ce1591c4d6330a139abd6bfbbcf543382c8cd5a177b042257884c69f98
+EBUILD audit-2.8.4.ebuild 6200 BLAKE2B a3723258da5d087dab1ea46f72f6d8ab32bd1a1e1e3b890f8a780a657251a806c9a8cffd3fc42be8b1b78934dc1478bd80295de83fa70dcd27be8d8f18e0b166 SHA512 6006cf0a47bc639de3fade0ffa18e26649ab672f8a52d892bfe330db611393e70e19c80ef1b2945c8a9ac0ed860967c62b77de17d0d99ffb133d515e853a56a8
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild
index d5b448720349..e2de77176ab7 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${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"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/supervise-scripts/Manifest b/sys-process/supervise-scripts/Manifest
index 6e3b0b649f1e..1db43b397da5 100644
--- a/sys-process/supervise-scripts/Manifest
+++ b/sys-process/supervise-scripts/Manifest
@@ -1,3 +1,4 @@
 DIST supervise-scripts-4.0.tar.gz 23504 BLAKE2B a0167f0e75542e702940cece251bc7291fd4d6146e04e6b048ff1f5aa749a86a689ca98a1b66f1ca4ef4d0e954a0fb4542223a1bb9aa19796473ac6168e85d98 SHA512 7543759b4078dacea7678e55498d470d8ed6edf56394f913f97721ec60330a8a0f538560ca48dc0269c2f98ff2dbaef0cf39d22f3db12eda778126a466e317cc
+EBUILD supervise-scripts-4.0-r1.ebuild 593 BLAKE2B c4b3cdc248530adcb5862876f4a1699584f5cc07062473583f2837b316a497b0441112a435e004c6028a1061e3d3aaa18da17161e76c37472277845297da1b0f SHA512 8a98dc69169c7434849c4ff7bb1d239e6a9dbcc6b2ff7e2db281976f3a7697c91c4951cf068ea2bedc07cb08ae8fd9b1f0d3bd8d61e0c158a4057b8ad5456547
 EBUILD supervise-scripts-4.0.ebuild 609 BLAKE2B 86df7e181494f93fe642f8e1678e8de0bcd39b7ddf0b220f4e0308afe44195cf239a636595dff9916c68f939c00ef811dfe660a30169311c13768cbc9c44e167 SHA512 16cec031b705e2911ad3f1f4bc4112fa1e1919e1ca403bedbb04861694e17d294d954fee2dcc03595800256f3d2bba51e4ca491bc262c35bd5188c3bacc2e59b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild b/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
new file mode 100644
index 000000000000..0d19d3c970c5
--- /dev/null
+++ b/sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Starting and stopping daemontools managed services"
+HOMEPAGE="http://untroubled.org/supervise-scripts/"
+SRC_URI="http://untroubled.org/supervise-scripts/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/daemontools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	echo "/usr/bin" > conf-bin
+	echo "/usr/share/man" > conf-man
+	default
+}
+
+src_install() {
+	emake PREFIX="${D}" install
+	use doc && dodoc *.html
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 02b1ae4e9ec8..df8dc5f9f8ae 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/perl-Text-Balanced/Manifest b/virtual/perl-Text-Balanced/Manifest
index eaefb3e00cdb..45aa1a41e0ab 100644
--- a/virtual/perl-Text-Balanced/Manifest
+++ b/virtual/perl-Text-Balanced/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Text-Balanced-2.30.0-r4.ebuild 611 BLAKE2B 8af489e202e9f9102695be584f71da665711a48df1d78a6079ba6a8cc9f6b8b8714c7beac5f32758c773011828670e76047ae6f8e45e84d6a4ed569d88a13ace SHA512 fd75795cd3fc5b1d665e6d822093128367975f87b009bed32bed002066a8764d16f952f9a0d80ac66ee646b1bdebbce76a06e4d80ac4a31070911bc8edd385b8
+EBUILD perl-Text-Balanced-2.30.0-r4.ebuild 610 BLAKE2B 46ce80fd5c15a795b820faec100eee439783c5761e5745bb4464f2a519ab126fc404555d1e9fe31c083c30ef701e369d85281c356ea10c4a02ed2f1a017b1e00 SHA512 b361a8298d9b51811e54103455c7e15bc63203f94be25586830730b4661d6b3a5ad72c2d3350690c3d1a6c684d9d617497742d9f511ab009c2f6328ab1a70c3c
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r4.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r4.ebuild
index 8ec11ac9d43f..da51c43a7331 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r4.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r4.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 ~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* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/python-futures/Manifest b/virtual/python-futures/Manifest
index efb866de5638..68b3d7da10e3 100644
--- a/virtual/python-futures/Manifest
+++ b/virtual/python-futures/Manifest
@@ -1,2 +1,3 @@
 EBUILD python-futures-0.ebuild 501 BLAKE2B a223467564ad7b91e91f49c42b19b3b8f5dd6c066c096c6694cdbcf095bea048e7d9f1e1a01f6a1836e0dd643ca21e77698f83c9305090f05d26f3db48668049 SHA512 091d9344eb226dad9afd08f51fc9ee5ed93380af33bff9e22769c57075abbb90fff4ed887d7a9f94ab95f41db2bcee9232271af764bb069ce627b74919f3c66a
+EBUILD python-futures-1.ebuild 511 BLAKE2B f70eef636e2f2f7034e9dc273549a4e287511b58e3d1b241e72504ba07db64fa556addec7a5efcd5aa11d996844b4a1d3770ace653e2042f07e7b49d0fd3bfea SHA512 6f3e0eff7c0f30e615e3ebb96944cb21148c2c2cadf49db566425f4608a0a0668a026438dbd68d4d4072b5be424cdbe6ceaef7028b7d39fa78bee889584da51b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-futures/python-futures-1.ebuild b/virtual/python-futures/python-futures-1.ebuild
new file mode 100644
index 000000000000..2806c87b5f3e
--- /dev/null
+++ b/virtual/python-futures/python-futures-1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for the Python concurrent.futures module"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' python2_7 pypy)"
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index 74ab95692d52..1602837f7af6 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0.ebuild 444 BLAKE2B 7017e59b7d13cfab729909125d371b7cf639e33b6f79ece34213ba099292e1f2231d8e775613b09b779c063020954527cefda35f0aab8daca3660f378b2d9260 SHA512 bf8e925a468d9091104d78fdaa450938dcae012d52f8bb2fc3f13ffb0c78175364dabae50879f0b8bac604af87fb0635fc9d60d3bf88aa0424de19d0757ac7fe
+EBUILD python-greenlet-1.0.ebuild 446 BLAKE2B c0d3a3693a97671eb9579895fd182a3f97569b0598e923afaec374b1d6b25b9257b87d9af706b3f34cdd9872d5cb13c8d9c18d07059e83d937b64b661501c06a SHA512 6f468beceeeb797300e2a9b960f4cbd59192b31ae2c3c00ae48f047f89e5cd9a38912704737867985f1e44400291d0fd3114bf3ceae518b18df50a15d15abc57
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-greenlet/python-greenlet-1.0.ebuild b/virtual/python-greenlet/python-greenlet-1.0.ebuild
index 39a08da8d1bb..23624f84ee62 100644
--- a/virtual/python-greenlet/python-greenlet-1.0.ebuild
+++ b/virtual/python-greenlet/python-greenlet-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
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python greenlet module"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 -hppa ~mips ppc ppc64 s390 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 7047dd55c8ed..4e57299b0362 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 496ad42c2fc0..7847e3fb60b4 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,13 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20365020796ce7260c1d63d1468537ecdeab83db12d1b245af1e760236da8e8d0ccf9ffb222d2dec1e55491ac77dc11 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b
-DIST mod_http2-1.11.3.tar.gz 1028467 BLAKE2B 3a5d644f87104e1f7baae05396fefe94975e86e9289bb9c4e6d7ed94e45e1d9b38dfc79d0e0d9ee9270efedcd811db2374c898e419d4c16f73b38f53512e91ed SHA512 b97697f44eab9984b7dcaa7d941f23375cd5c2c81405842e17910a37dc2c952fc36a37e0802755457ccedd196c5fd2fb5b60467cb0ed16ed7aeb88cce4eabd2f
-DIST mod_http2-1.11.4.tar.gz 1028706 BLAKE2B f2c662913a30e96fe28d68690cf0fe33e4de2d7072bb46016f063a9aa979dfdbb9e39f88110c56bc3a319e1220365159fd0c15356bfbf981ae57377e137c1e96 SHA512 1347e8fe4d88d8d87ca547270a27ac63c7b7804b57a06a225ab4199a24a55ad3048cb4c7a50fb7cc2ea2a78b2cf0f1dd8f5bad6191d2854df30042f0d64e6a1c
-DIST mod_http2-1.12.0.tar.gz 1029587 BLAKE2B 10578491ce39b91e1d6363cb98d45c2c3ca74c5126af489b1c4261e80aef907b9b737a9322a54a144af7cd0892b8d0c0a86ba4467aeaf826199b989226593154 SHA512 50d8d8e44ba8d4516fac642aea9c2ce5afe766aaa1bb930ca64fd9fdb4983ee5db9677d4e9d10d88391d39b9a9be127594a90670493c39ef6368e073456034f0
 DIST mod_http2-1.12.1.tar.gz 1030534 BLAKE2B cbe02be6dfd1d1563a86c020f7eb8f5922e5d171b3a5d4714539658d5a3e067774b4bbb803e67943ef9b04caef6f3d69291d9ab0f6d8334839a98f466bd3851b SHA512 72cb915bdd283742a7bc2676adf3440d5e30588df87e4dc5750886747b0026e0cd0a36f08a39c323e647c83ecef6b434b33c23c96bb7c00ad480d430c1f37f44
-EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
-EBUILD mod_h2-1.11.3.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
-EBUILD mod_h2-1.11.4.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
-EBUILD mod_h2-1.12.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+DIST mod_http2-1.12.2.tar.gz 1030072 BLAKE2B efb829eb98bb40489e9a52267125d79093ed2055e50ef6ae6c5fed7616df050e9ec659dd72764534ec778d75e6c462764baff88193970d2bbadf85572d5535f2 SHA512 2fab9625ba7adaa85fa4b1c55e0e1420851d1e44766f81c1e5b60b0b310b071047651c07b44b0dbeaf2d3cb2c722b9de3c52f145eb12e63c08301cf8c1f294cc
 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-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.10.10.ebuild b/www-apache/mod_h2/mod_h2-1.10.10.ebuild
deleted file mode 100644
index eaf87ecaf6b9..000000000000
--- a/www-apache/mod_h2/mod_h2-1.10.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit apache-module
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit autotools 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
-	[[ ${PV} = 9999 ]] && 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.11.3.ebuild b/www-apache/mod_h2/mod_h2-1.11.3.ebuild
deleted file mode 100644
index 7a124f105c05..000000000000
--- a/www-apache/mod_h2/mod_h2-1.11.3.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 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.11.4.ebuild b/www-apache/mod_h2/mod_h2-1.11.4.ebuild
deleted file mode 100644
index 7a124f105c05..000000000000
--- a/www-apache/mod_h2/mod_h2-1.11.4.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 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.12.0.ebuild b/www-apache/mod_h2/mod_h2-1.12.2.ebuild
index 3e6d435d3f82..3e6d435d3f82 100644
--- a/www-apache/mod_h2/mod_h2-1.12.0.ebuild
+++ b/www-apache/mod_h2/mod_h2-1.12.2.ebuild
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 8a3388253bdc..db17c708ef88 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,4 +1,4 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
-DIST mod_qos-11.12.tar.gz 509530 BLAKE2B 84f3ff54ad8203c5507e23d12bb3aed2db7c8b128d4106ea55e4ddc4e17a3bc6910a49e58e8e98624560b0e97131f2fb1ed108d865c3a510b3350070ffc1ae58 SHA512 a9597a1b7ec38ec9ad492c79b797a807e180feb11a42cf7e206ca3cecf9c986eecc9979659a65fcc9ec0454ef8574dbdfc2c5abd862d8b3bc1065a93fbe0ccb7
-EBUILD mod_qos-11.12.ebuild 1015 BLAKE2B b8f4ebff4366fe3807db1802ce92051c96ab35abbe1521b06d8634bc08d1ca110657d198be0a88401a3461dd359bbc200630c3fd15e15ac626e0bf6668eaff5f SHA512 b7b178f6d90ff4b2fa2bf705d2357cdf66985deccfa8da00b33f48c2b0d422483219798169b7b8027d74848ffe986fe1091dd30d8ab468f0eab00e773d723f98
+DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
+EBUILD mod_qos-11.61.ebuild 1016 BLAKE2B 66b80b9c56cf82ec6c01b73ad660ecf95363b2450513868c07c36868cb6327731401e88edeb010bf51516ce78e59eb2919ceaea3957fc9d2bcfaa5612c6ae9bb SHA512 c647eec700392c45827bc859a7c04d15ff7f6af7d93bc9ab77947d0b5e5170aa278d224d150596d864d3bd2cc7ea7120e3752a3be5e2a173775632483dc612e3
 MISC metadata.xml 244 BLAKE2B e543aaf02e6b5efa49dbd6e952f6d824548558cb94f91e489f81b70c2f13cd0f54c3388b3b540b50e54e9e78be5f8084f331ee720b8b49fa8aeeb1179a2384ca SHA512 8757fe5e361f5e4214eaf304d5d9d57bc542f1eba248fe4dfc44310d95af160e8c04ad72723b3bf7afd3075ed2f6d58e4bd28643fff37fcd8d6e0134dc147dc7
diff --git a/www-apache/mod_qos/mod_qos-11.12.ebuild b/www-apache/mod_qos/mod_qos-11.12.ebuild
deleted file mode 100644
index a813fc282317..000000000000
--- a/www-apache/mod_qos/mod_qos-11.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/openssl:0
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${DEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-src_prepare() {
-	cd "${S}/tools" && eautoreconf
-}
-
-src_configure() {
-	cd "${S}/tools" && econf
-}
-
-src_compile() {
-	apache-module_src_compile
-	emake -C "${S}/tools"
-}
-
-src_install() {
-	einfo "Installing Apache module ..."
-	cd "${S}/tools"
-	apache-module_src_install
-
-	einfo "Installing module utilities ..."
-	emake -C "${S}/tools" install DESTDIR="${D}"
-
-	# installing html documentation
-	dohtml -r -x *.txt "${S}/doc/"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.61.ebuild b/www-apache/mod_qos/mod_qos-11.61.ebuild
new file mode 100644
index 000000000000..b7bb23e76819
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.61.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre:3
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+src_prepare() {
+	cd "${S}/tools" && eautoreconf
+}
+
+src_configure() {
+	cd "${S}/tools" && econf
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}/tools"
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	cd "${S}/tools"
+	apache-module_src_install
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}/tools" install DESTDIR="${D}"
+
+	# installing html documentation
+	dohtml -r -x *.txt "${S}/doc/"
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 2663f7d78165..b4d6ef49f198 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,12 +1,8 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
-DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
-DIST passenger-6.0.0.tar.gz 7202705 BLAKE2B 764e3072e1bed8caf87198442a11d660c8bb4d88007bf60fd77c3dc10c110a6e7836c35c1897484190df74281ff1027bdf7f2ed7eb98155ab4419b108aae1136 SHA512 f3fb7e29764397684bff58314db34d25d22a0a4f1420d149f8f43b2a1ff77407a1d67908bf89182f3ed8fbe9476938da91a13dd11c9eeeb6fe4f0af2f9646ec7
 DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
-EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
 EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
-EBUILD passenger-6.0.0.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.3.2.ebuild b/www-apache/passenger/passenger-5.3.2.ebuild
deleted file mode 100644
index 200353b9e913..000000000000
--- a/www-apache/passenger/passenger-5.3.2.ebuild
+++ /dev/null
@@ -1,127 +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 apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-6.0.0.ebuild b/www-apache/passenger/passenger-6.0.0.ebuild
deleted file mode 100644
index 3e6bbbe20254..000000000000
--- a/www-apache/passenger/passenger-6.0.0.ebuild
+++ /dev/null
@@ -1,127 +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"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d9c60a2a6e08..d66fb1376f10 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index c6b545290212..551bb6cef07d 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,3 +1,3 @@
-DIST cgp-1_p20180620.tar.gz 139549 BLAKE2B 2cc1a416ae1158b5788615b05bf43039049af52eb5296e7fd8136c9895e8ee0a9887e84ad37c6598a4c4387982a2860fbdb7cf9cdff39cfe5bbee598b9ace88f SHA512 acd09bb699af678347dacfc08fee60a86843874543851805f245952e538777d7ccd528c156f7a21b803503c7aac134013a4eb8200d5266cf35541b0dce5839e4
-EBUILD cgp-1_p20180620-r1.ebuild 1278 BLAKE2B 7b40e0cc919201e00a42a420db0c531da1db82846a4985e99931bb76e5ef281d078febb48f9338155416bec2a42f8153b24c433ce97ba489e4ac82e52d240b80 SHA512 006443901477d5547435592cd872ad00b35434305563d9a40bca90fcdb166e319b1f60a2b120ffde10d1ff18b536613ceb79bf9e8eab4e92169fb91d0e51ffd3
+DIST cgp-1_p20181209.tar.gz 139556 BLAKE2B 0a79ff1974b0ae50db5582121c4fdcc2db0b89ef11ecb001dfa525dd753481f0a454e424d17f24b142fd116a9ea2eeb4ba1dade6f2ffadd63943e5c065323224 SHA512 fcbf81fca2bb14ed143ea414c2f11fe09f4594891507a1ad08482720b104ec62c9986ce25b127d45a7962a8b3db54293a6775dc2359bde41f19b5419606b51eb
+EBUILD cgp-1_p20181209.ebuild 1276 BLAKE2B eed898ba458d5c97556594a0cf370562206c122a0129d3fb903c907d389a108b30319ed092171bdff5bbb53bb98aec0e1f50cdffd4b004934e5465e3ecb95141 SHA512 33ab16b6889fc22012db798927ed126466a10ef16235430eaa5f45a3d1f174788cc4917a4e354affedbf35a74705451757620ab8c7fc33e337bd18841924a349
 MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1_p20180620-r1.ebuild b/www-apps/cgp/cgp-1_p20180620-r1.ebuild
deleted file mode 100644
index 6fe5fc73bda7..000000000000
--- a/www-apps/cgp/cgp-1_p20180620-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit webapp
-
-MY_PN="${PN^^}"
-MY_PV="1920ca24a067ac157a6bd8f3c017f4c6244ae245"
-
-DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
-HOMEPAGE="https://github.com/pommi/CGP"
-SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/php[json]
-	net-analyzer/rrdtool[graph]
-	virtual/httpd-php
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
-
-src_install() {
-	webapp_src_preinst
-
-	einstalldocs
-
-	# Since the docs are already installed, remove them from htdocs
-	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
-	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "The command shell_exec must not be disabled"
-	einfo "through the disable_functions php.ini directive."
-	einfo "It must allow execution of the rrdtool program."
-	einfo ""
-	einfo "An configuration file for www-servers/nginx"
-	einfo "has been installed as an example."
-}
diff --git a/www-apps/cgp/cgp-1_p20181209.ebuild b/www-apps/cgp/cgp-1_p20181209.ebuild
new file mode 100644
index 000000000000..60438618d2f6
--- /dev/null
+++ b/www-apps/cgp/cgp-1_p20181209.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN="${PN^^}"
+MY_PV="72acfcbffd51da1e77a56517618da68252485ed6"
+
+DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
+HOMEPAGE="https://github.com/pommi/CGP"
+SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php[json]
+	net-analyzer/rrdtool[graph]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
+
+src_install() {
+	webapp_src_preinst
+
+	einstalldocs
+
+	# Since the docs are already installed, remove them from htdocs
+	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
+	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "The command shell_exec must not be disabled"
+	einfo "through the disable_functions php.ini directive."
+	einfo "It must allow execution of the rrdtool program."
+	einfo ""
+	einfo "An configuration file for www-servers/nginx"
+	einfo "has been installed as an example."
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ab683d2881d3..c9f13b90e908 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 179248119f7e..951f26fbeac8 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -173,6 +173,90 @@ DIST firefox-60.4.0esr-vi.xpi 528187 BLAKE2B 5ea0608748cea2d8e98a836b635e91af0a9
 DIST firefox-60.4.0esr-xh.xpi 511859 BLAKE2B 20505fb9ed4b87e358556b1f4063dd1aed5c355b0fa92d2cf39c25acfe528352639ccee40b80919cf0b1ac02f17f4ad2c0e485e42f037c1e845f5c61d7eaf5f4 SHA512 b5b20c79434bf3d9f5915a6800d6b56c240cbf82807a70f75899306f2a75e3bf531bc9be5acbd5bb6ddf90a26160fd72e35af23886bf77dfe397d4f90628bef9
 DIST firefox-60.4.0esr-zh-CN.xpi 543585 BLAKE2B 787679f3a78a9556183d2e57ab1a744150a0d1a02caa629fdab46dfa3838cade0a1105ceebc7965810a1becc88956e9683db99bc25fd1d09fac38cb113b33aab SHA512 e2c9662dfac8e2cff3a719149626be02fdb3cf4a713c3d32cdba7df37df4a98fd90eb88a8d16d3a61ca4870c0f049d5343cb6b41470464e9399c6b1153d059e7
 DIST firefox-60.4.0esr-zh-TW.xpi 541910 BLAKE2B 5ec6659b0bb94fa7d52488a0e043b6bf6372100a3652bd509e46f1972fef3680224017fef32f3faefdab7f2c683576eb3aa4c3e7435fc5ec42ad6ce3cc54e461 SHA512 229f070f9eeba9e88b44f1e27bd47cb79fa39f4b9d6a8d50edc8afe9e4dcb8ebfc03acbcceefa9106d5dd726146b680d83578271bbabf19c19800be2800591c5
+DIST firefox-60.5.0esr-ach.xpi 496841 BLAKE2B 774ba2e7e020f484c44e3bab5d98eba69ca9ddc680e04bceb5fbf2ecee385afaf16d5cbec74da33f3de897d7faa76b155ab640654522b3d22862f69b904c2b09 SHA512 3ba5cf4f35d1d3f80ccfaa45bd9e6ba91459ffcda14df89deb39e648c00ebcf8ec05700c5410f4d50d9b33017304c35d79e2980683a27137c34b39d08e7da488
+DIST firefox-60.5.0esr-af.xpi 487319 BLAKE2B 52c28405aa3430e0fedfb2ffe0b83726af7bfb060de7d04425eb2a83705e6d748e08f6f400397fc5ff843c746b1adf853d6b08d66daf10b0e86251394a063f30 SHA512 e867f1b2d1da76344d984eee6177638e519f1877b15e840abd6fe7f9072e2d2a6e825f9d8292f09b5086dad8a6deca2f5041ba9197cbcb43138587958fdb8346
+DIST firefox-60.5.0esr-an.xpi 520504 BLAKE2B 1a1e0f36537608be2c422b46e6276061bc8d3559808b0b62ddbd14e6dc7942f6e19d819ba0a3f5daa08d1d86d7c666b76e3af7602e23d3cf72d8bb0d95b2cb6a SHA512 9b5ea81ba0999de854c3d58326e1feb41f9f8c4c30c0e1a2287aa95efc88c4c4a3363344b1b4171fe48285d6f6587fe2199e2b74329ecb93baa522501dbac5c0
+DIST firefox-60.5.0esr-ar.xpi 547823 BLAKE2B 148a05b0c22023c355fbe223d2f3a6d43757f4858f05f61822b66f3d9e230a6bb6695d0922104c3b9a4e3e1a07588052c26d78c88e2932abb4fa9749bbe09b48 SHA512 b9c254b57f10a0dcadfb01cca561c908cf20c0f83b0e61be6732d90e7906703a88d46ca410fd1ad39b8f1105339332fb38f7f407b3308d7b809d5cff4eb735e6
+DIST firefox-60.5.0esr-as.xpi 530728 BLAKE2B fe83412a85c7a6859082d1c4f4a329f5e3d54e12a3c7c9e9a9ba8d0432de566d73a7d618342adb5ede1bcf9f5c2d8316f8d46c84d27ad16fb046b84e8f5acbbc SHA512 9fe7d2a314f1e03b97e124aca66d721be6ba7f641aa724424abde7b579d53dc722ed87c54a87dce16d0875bd8f84fb09eab771f4a87d5c812e5fa76dfacf57d8
+DIST firefox-60.5.0esr-ast.xpi 508655 BLAKE2B 04ce0c6a86a412b901802d44a368ca4cd1ed0fd812f49a95100301b198291d00c7dcf3fa345a68c5ef1a419dfc1d33cfcc5d9fdf2188d21ce48f660aedd9fcd9 SHA512 1a84f52a5d61c59cb9b9aaf35603ccf22f04909eb836a9ca87776409bcdce09fbe47cf4dd4109c4c59b468457d4c62603680d1d206b0292e483d9041f94e43a3
+DIST firefox-60.5.0esr-az.xpi 524747 BLAKE2B 9759a2dfb2df84d52a317f8f1205437ff56718ce6ae5742fedf392bb56c532bff87e1b7752a43658406d1c3d1ad93e2144c94df2f4a98bf903f08f47587651bc SHA512 6b2c03f7139d2fa45c2607778b4677706f26448c4d8e972254063f1622b40345ff185a64213d031c4a930d29b8fea1e8a84633236cc4f9c7042d969f54bba8ab
+DIST firefox-60.5.0esr-bg.xpi 573852 BLAKE2B 3a65e1cac8545b3008f415e8fe1897175567b99df1807b486e89ce1ebebd201c9d4980d680388b8193579d8f1eb3ee651b7ab27eefde6dcc17ece10cf18491cc SHA512 5b30d87ebb6fa20ae2b7d7831a14e0240609c44eb355ae9a1cf5184f174fc1f4d9dd22303ea6969917ec5d81fdb66610d4161c93e08c8c6ef124ded2acf969fc
+DIST firefox-60.5.0esr-bn-BD.xpi 590423 BLAKE2B 0923bb2a9abc123494f7195483a8d3ab49fe11209e9111071bd100b925aa2fa7de751e7630cc5f127fecbcc3d1c66f7c07d32d9f752999d34c8b8da80d15596d SHA512 5a502fcd383af87225b647bda7a6bf54b7667d1b029c7592e418484ed6957c682276ad40fcda7ac3a1787e6ec4fe36d01398cb8006de74e552034511e4209c31
+DIST firefox-60.5.0esr-bn-IN.xpi 570870 BLAKE2B 104af3b210d8d5168a00ecff1a4034c2f465c1223557559e5dbfec67767a88b7975ce3f53d8c56a00248fa7d621883292c04f633178054db5ebf79352ee27d68 SHA512 08e56df55943a482fcc7b5ceae26376ce62e86b7986d4131f88f07d894db86dd454b272a54b03ae4dabc8f77e2009f78b86468939d0a98509e83cd9f4d94b89b
+DIST firefox-60.5.0esr-br.xpi 512031 BLAKE2B cd0cf6319f0719e54bedeb138b48def554cd2059972fc89f47c4424627c74268890fd81680014dd7c851439244c94745c58180104b1037dc4b57f57465f04603 SHA512 af07f94b1160000c706c1fa30c228bd4d6f9199e7187f65abeae235f1a83a57771c32f7aee45212dc93c7f13880d519b60f0c1b072a7c9fb3ca8279a633a51a6
+DIST firefox-60.5.0esr-bs.xpi 514714 BLAKE2B 556b5f90a73ffe185f1aa65b77024b913b3936cedbbdb09296d248af79d4533b85cc0a85d17882de8553c9e270350a85be0995ee2845ee0da3b5ca1880ed5c22 SHA512 1f6fdfff56f359e5006b5e7d5a989ff59e1e7961552c1d1c68c17f1bb27de2f47fe144749477e89a1dd9d87ecafaa58427f24333f87541064497d67d07ca92b8
+DIST firefox-60.5.0esr-ca.xpi 525262 BLAKE2B 3ace9d56fc458d8a77de83b43e522b2fce34cc39fc6957f056ff50994d692761197bb122e6b1e886df14bc51e39434a07b34384538547357170736e927f4b796 SHA512 bacd1e1c5e6c258fec86a098d26aa7e2ec9a55844f3aaf1fa13cf6604983df32f09ab9c353a7b15b405347d8994b9ce1280d0fc9321014f52a48f78ff967c738
+DIST firefox-60.5.0esr-cs.xpi 531796 BLAKE2B 0f8e891cd50f0e344ef01bc4c5117db698355fc576f3f6629c2d844e525e0ed6a83d89c7f17c4bb3632d6ea03e18c0d1ae920cc52788f5f36f8423a12e4c8833 SHA512 0d568015ed0e176bcf207f79187ff98f5c84027bf0f8766ac73dfb9a1d4f19e08e94e2a2c6dcff15b0297090d27e9e0be56f83c126e4a3a3ec6a154a74105270
+DIST firefox-60.5.0esr-cy.xpi 516642 BLAKE2B 5eb115740e6bbaadb719bc3f906626d62d802f6f6d68eec0b59e41620ef688972748b86e5e61925269fbe2f9fa9f79870b11021d0fd9483d267b401adfc999b9 SHA512 72d5af5770a88670ff95be3ad24ccbced5217b6ec667362cf7a501cc61430a5a2b626b360c87a88b95ca178421e63ea1a9088e1884078ff123c5dadfc85a7877
+DIST firefox-60.5.0esr-da.xpi 510754 BLAKE2B e7d8481e6fc821b5d6669e79a82bcb752878f741b054372827e2f49a30e9b29ce014807d7383cd2a5d0967bf8780aa1ccb11f405b97c62762107859d9d7f436f SHA512 0dd50f3cf6275e2bcd0f06ca7623e5462c791d0c55208f58ee719a9544e9482e5a417dbdecb69173fee5af9db8445b3b32b2c3aa812bb0af06f757e19ad36b22
+DIST firefox-60.5.0esr-de.xpi 526524 BLAKE2B 0c8285408e3c0ff88ccc4ac228e72d8ccce4fe74e47b58c180ec30f3805909278a637b27d4b8a7c6d3fa116910a9230cd28eb1170117d077494a62f10b73f4a5 SHA512 76568d485db7a47cb70867853957a4f495452cee5f5ef0f0ec4fb4adae894d44af1b28dba8ee20f9eb2c6206ae7bfed8d8fbd4afd478487de296f10af922ae6c
+DIST firefox-60.5.0esr-el.xpi 593699 BLAKE2B ccb653025f97939da5c62700b747e250e3fa71e5bbcbcad039ed17086e7f410bfc92f73a489d9dc5a1fdc64565725a7dd31fbd46f52010dc2de4b6a880876c0c SHA512 228286536367cd085c50cfdbd370402a8b5777bde2b2f6ae1412da199527a1c3fcd18c6b2144f0970befc27326abaaf38a0f83e8f34a354be2844de1106c99c1
+DIST firefox-60.5.0esr-en-GB.xpi 491694 BLAKE2B f50ce7d35872c4beb6075cfde5feb2517e5ac919318c4f71d61859486a5215d2bc10fe5d77dd1f57147b71c686dbcd8a9abfb4657edb78dfc230bb4e5939f01b SHA512 96d273d530673180d20b247455f7c7f0df9320c7b65684c1df15f59d7d45c92ca5e740e2b592fdb3b216a0c59633f9fbb78d6c251c987dbef2f7dca46dbc15c8
+DIST firefox-60.5.0esr-en-ZA.xpi 474686 BLAKE2B 5e138225720db70841ce70d22dd61f2043aff12f276ddd8c8dab1f372755dfb0b83e18a01cb97d925d10467b8a09910b059cae92181b6aaadd91147dd01dd797 SHA512 caa2547abe69f8f6454fe7131101716bab945a0a1b6adddb0dab5f99d499e4978808b9f279f556e3168195f7e85b96ecba674b04900ef05fbe5570fb0483d9ae
+DIST firefox-60.5.0esr-eo.xpi 511271 BLAKE2B 86a080d19d19b82ee1ab7e8b8c7fd583b8d236986713eae394831104e4d9a38f221b72e5775f47604f2c75f8545e9daa28a19949a98b3b0c2adeb1b74ac9a571 SHA512 412a3c9f0bcf94ef145d1ed6157f47cca731afde82a16f9b343e2aa2a81cb3af6547ed48c5b669c693a112b2cef4a54da1ecc6fbb4a902fd2b6d8d4b47342812
+DIST firefox-60.5.0esr-es-AR.xpi 524654 BLAKE2B ecc40e0ad56948c1113668cf312535b1b22416c022d00d2a18e88e0872037aa14209e98fc35d71c9291b07709431d1f5b10d707f5fd59ae677f8f7e1d8012828 SHA512 4fa200b3ef03e42dedb9d91eaf5f30e6f2ede58df198f1c820b886e49a2922dbf2bc6e3e2b9bc46a9ea8de352e5877d241610cc49f6411d396bdadd793aa9792
+DIST firefox-60.5.0esr-es-CL.xpi 527329 BLAKE2B 7747182ca28604ea1547794680157b6573bd7c5cc29833071015889053a240b69269445fe72255b376b2ac90aa001c2b70b6769bffb7b816d5aa1a6d083f4dd1 SHA512 a31ef998de1d4779358674aa5fa9427ffe5a32cedbf09d33e4469ce22246f3335413bd7b6aa372ee9f48758847049f36d73a880a3871d3b596f494a7cee5045f
+DIST firefox-60.5.0esr-es-ES.xpi 459968 BLAKE2B ee24d3e021882c04960bdf1aec199de1397790c2c519d23e1473e1355fcbf5f5efa165c1e2f2c4d863ea92031736084e4150ea60706f140cfa0e9a904c2ce4a2 SHA512 6b2810802c9f5c177f6c17fd53de6b6e9effbcc0f2b8de1fbceeb290cda3a1c435f5fa39b00e958820e1cb0de04d84d8d046fc631afd414a50d980e137c238e0
+DIST firefox-60.5.0esr-es-MX.xpi 528670 BLAKE2B dbaac11c69f2e0a8a156b0951ec1ab5f6f18a0f339fa9687d13f241b717b5e4021133716f7ecfcdd8afb321aa738bfc506323d94e642907ce6e1ce6e2713acdd SHA512 ceb1bdab4b87e7ccd22ed793a537daeb0d5b214d164945d6955cf9d7a60a88c4c6ff31087a159d081db36bf641e16e258ec01e583d5b6ae379a497e1cede45a7
+DIST firefox-60.5.0esr-et.xpi 504972 BLAKE2B c4b1f86f2e72f68bee84ef4a09ec44d3cee5e6da3d17695afee0f2596e8406ebe41bddee60458ecf987c8e042e04323a26ea1b629a93b4bf40ab12799e674dd4 SHA512 f8567b08e1afecbc0cf9fe61ca4a308a6121e77f75bb4678b593a70d088617ae26ba22a731da57fea9b5cfe76edc8f39ad19f87867e1a909728b1159e8afbf4a
+DIST firefox-60.5.0esr-eu.xpi 511713 BLAKE2B 9185742ff1ab86c71a516345ce6746db05f7602e1d7d76dfa30037cff5b75b1056ee17095434e7ad5e781c87df3a98f30e730a836df895ed233a05b6cec143dc SHA512 1085721f8fa5e03efcd3042f0b6dc0fd1b588ba1cdca2e9586114f90aa2337130a6f96d4b9e42993cbfd4f1f6d25c92c5f6e931eddc27b79d4897e543272cf6e
+DIST firefox-60.5.0esr-fa.xpi 566263 BLAKE2B bf0a034fcba2ed61972e7660e93ffbb64fdaa7ee2e832bf8875b4719a1b957581d86fd129fa441e3f8b305085bf25adef215fe277984bd570543aa49e8528785 SHA512 31be8633a948459d979490bf1d6e635da3c1b9fa513d4a69a9f345c72a67ea56ace8d7b487ac257de5ce47b8deda589c90fb80c2fc95a2e0e30e3ca11a697f45
+DIST firefox-60.5.0esr-fi.xpi 506177 BLAKE2B 05d198fb3e559b908321b78cd27779f016f54e0721e46937c7feceffbd9852b3703048a5166d450d559edf94acd167acdbc3a3ac5b21fb8c02cb5da9954c139e SHA512 d994dc5a849965f5c1c635eec5daf8a6e3b15eb8ffcd45e786d7cb292efd2bdcd8de93e8909b5ba1c027b3f763d0419b39f89762842ba3a95c10b26bcede43de
+DIST firefox-60.5.0esr-fr.xpi 536081 BLAKE2B 581dfeb4da50334e369c072a4869b48cdfa1ad1c55e4ec9d7b08d37715912bc42e7e985ba907685b43331fab9b15f50515d2467f790edb2746a77cd155231a48 SHA512 355765d3d1e894d9ff5234aa69502f9944e83f42183546bd46d900535e3170a946063491dc86626dd400d908ee90ad639cf567ce506bc7c6a560c64c3b2784c0
+DIST firefox-60.5.0esr-fy-NL.xpi 524529 BLAKE2B e24cea5384766696a074502c97b33658356f8d9f04764058384fcc471ead8cb32789c4785f8ade5473ede1f0ac37d487a05d654658cac4129a8de1da9b316faa SHA512 6c0414efd961628eef8d1618a5019f363101abc7f63e3e30c1eed04797f0d5a69f4f07a7d536abe70144c20c4d11ba996b880a77bbc7bfd3a5c837e17630dd6f
+DIST firefox-60.5.0esr-ga-IE.xpi 526991 BLAKE2B 05a4732fb01d9ed05b1529afb39e8e38d7b2a11b1dfca235a5cdc14a983e518d0324e934cf4301ecfddac90346e5dfe7fc4c77f87ebef88950e6a337324ecedd SHA512 0bc13fefdfc9954efed99783d59ea6bc1188fa6d0ab306653c27f466d049286084ec2b846355aa324b10be73165cb247e829a0d7523a6049fcd5817bcbddbda1
+DIST firefox-60.5.0esr-gd.xpi 520877 BLAKE2B 40c5024ac43767be5bba83b1f0c50198e15662c0fd942e1b5894d41f09c5655a61ea22244b667f8eeb6a9b6657d7579becb1eefde91be8ed550a853d20a9dc3a SHA512 19463941181ed6b11f72a34d4069592c8d4df338ad31fef06f8e3c1c8efc7aff2d219877fb3f0fbe9259aedf3d805ed16c18929f6f31964966b859cf2d810290
+DIST firefox-60.5.0esr-gl.xpi 497371 BLAKE2B a77cee6dbaef4371ae5addf2b26b01bfd01b7fd533a23baf8a06cf8bc71f5d95999d60d039e49751b98193697a79458361f6d57567f827a10ac4d458a53f1595 SHA512 2918ba2d810b8980f719fd3b607750feaf0832eff53c9a40ef97ec0d4b4e11e467b4890f2283439d4a5aef4c2496b74ee107532042059591705f9dc940a430a7
+DIST firefox-60.5.0esr-gu-IN.xpi 590271 BLAKE2B 9fc174729d31b5835fd2deb81030680f0d73e1fb3725d9ec863031f4d9d517bf340f3bf4bc9bf9893c65a75d2035da533c8b86205d74b524f2d41933daedea00 SHA512 75c488dfe3e2354ebe3b0de2a5581dc3d4066b2edca701a66fdafa65df1cae667605d2c4eb1ca6f0c7fdfc8f1f4f7c2dd49e27f63a636f2f33cf4e8c3fce6269
+DIST firefox-60.5.0esr-he.xpi 535983 BLAKE2B 320fa43a23a006142ed9403444352ecafec3fe7b46edbded92f1293d6c443178da5ef23b560d833f1aa794cd6c52d9f0845656264a5d75baa52175db977fc0b5 SHA512 02de7cacdb5ce1b3da822dbf0cb40a79c730f2c04f88cbd95e680906755dd41d6b00957d292dbe6a833360d5a5931c3fccc9916fb8f4c4afad1b24ebbedccd6f
+DIST firefox-60.5.0esr-hi-IN.xpi 590858 BLAKE2B 3b71cd9975bad76fcb7dc197c301944ed2bbf28a8f6d85a95659a4740589865660ca80c243b1f0b4b990c70718400d6876294b09028a2e16bbf0f4c221a4e1b5 SHA512 6905a7c26ef59a752faf533f265d3ab4f6a3810a76a9cf550f8af58a08fe16208a1de40daa67a1d7fb23c6380550f68d754aff72701d77d5c570a8e5f9f3a1f4
+DIST firefox-60.5.0esr-hr.xpi 515957 BLAKE2B eb4da9ff9b1506435969b479bfceb1c86fb9d70228b234ad5b51af29ff1e2aab8a949b3e69544990e13b67798d6076c45de72a98ea2ace0efe1ea61e38ec1265 SHA512 9995864725c1c5260308e95019be426a68cfcab3d44ee12e31347ed2328be99b440ee74a3bc069a1589cd0b047f2da9e7dd94d22d0def8d4d65246c912d4786d
+DIST firefox-60.5.0esr-hsb.xpi 537071 BLAKE2B 24e59e30017ee4b250bc9151e7a6352f21f290fc99be1df451d440d0c8f797b1fceae10773f653a777ef325f061b8314b40be1f6d8167104e3fd86351c3b5cca SHA512 b3ad40a83160a963a657dad147eda2bec73a6d1aaabdf683dd9bdc0a38c01e0ccadf3dadaebcf71b8c4dde2cdf2515ea8e20ab35582892857150269f09e141ea
+DIST firefox-60.5.0esr-hu.xpi 538420 BLAKE2B 0dd001d6244f2fc393c30c0fe927b9e90049f27d46e02f2c6e0685329b3b08d7803e9f52d73e0c9301d731320e270748cacd99d205f3511a3dbd74e14f20b8dd SHA512 748daeb39376a6179a13f986f90013ab71198a1ef4f3a909b9849c86722aa3a3773aa32ed5961b8026d0572140eab9ca67ee3f5c084a282943d147314c8128b2
+DIST firefox-60.5.0esr-hy-AM.xpi 569422 BLAKE2B 812634001a431ae9c2649962ba88ca5527a20c41d9b5f677d5c31142cc470541dae829f4bd40b11d70b4ced18e322a4388cc7f4057b023bfbc4612333e1bb9fd SHA512 7948232d14dbdf38de3210f2d928a4461d08fefb93e63de8b4017460ec2b85d3d431795c96a80a36504a0806b4f52101091d5c0df857345ba5581ba126a9b507
+DIST firefox-60.5.0esr-id.xpi 502224 BLAKE2B c6344627f4e796fb1c109c79163952eefe407c0d3f1930b1683c3bb13b8d07ae40108380ba136a950c198c5c9ba0e1bd0eaefef5802344e1c3bb479c6e13090e SHA512 a26763f288fe66b67bed6275dc236533700fc4420ccf07d6c1d08dbf82d9f7327db0df8e634d294bef3606a66724a30c7b1388412677dfb524d2b353e4947c4c
+DIST firefox-60.5.0esr-is.xpi 513272 BLAKE2B 8e78c7c70719da1b9f61488979e6233ff1ae13f193fa077e332e7866a83656f2a22403ed77c48f06db7a9f25a592dc91dbadd21ca808925967605c2140121776 SHA512 cce0bdc22d13f929b4aa59c0ebedd2ae499feebd765f877cf06972507fd6373a39e6309172237e96d415d3d5f436b47cb740b9c6412c078f563cabe457484a23
+DIST firefox-60.5.0esr-it.xpi 399110 BLAKE2B 288bcf4e3de5b9100cce0abdc00b0ea4386ca2777126ff70fbcf0e95ddf71e3eb4ef341bde41b8a4bfbfbae922b54d9052c26af2eb6331380436023b63426932 SHA512 fa6a3c4218ca6b7a9feede5ee01f1be5398b20f6a0e7d1b1eb60876d29ced6d0dd2047ffba90d399e92f523d522cc8e8f681e228c176c029b5eedfd14dd9a4c3
+DIST firefox-60.5.0esr-ja.xpi 572017 BLAKE2B 8ab9aa9e5cb128b634ab9b768da8d235d4869834ec83d0c826ec1ca919afd14bac5c686277189adbcccbb085f663d2c02c969c1770d48c42a0f33f9f1ad4c48c SHA512 4b3ce9c846ba3f2d9439a792310bdb77950252723f218c33431963fb3d43588be8a5c45d2508eb1caa3e3994d823fb012fb8b97d55dd0223e1c51c68573bcbc3
+DIST firefox-60.5.0esr-kk.xpi 582984 BLAKE2B b70bec7686582ddc882e0d4eb0e5d7f09eaade456c2e280a1b2ce6464c5ee77513f1f83362c9e41c54df2487718350e884aa880f87b53d93ed69afb9a7dfcd0e SHA512 9b6fc275fd17a729d93285a5b417de39675b4bc25d0e8a250e6102d045fa84bb7fd117647b0d0bc4c0d94112a150c5bd0e6b1f8fc0ffe9a68b878ab88ca1b1d0
+DIST firefox-60.5.0esr-km.xpi 583120 BLAKE2B 7629198d467486f35c00814678a7232ba0b53860063ede4275379c174a4838539245c5252254bae11398e1981669b6a6bc48a562e7599abacfe996fef5fdd4ad SHA512 aefb5b057d48850e9d301f3bee528a7fe7a52778f78135725950b4f1ec7867bf88e462859595770d126383c015089952d09cede95e4b87f8abcd44df9269e0c8
+DIST firefox-60.5.0esr-kn.xpi 585876 BLAKE2B 05af689e47c3eba7e43bb801e30372578f06b06a4a97e3febe6d8e921ace31540145c1f6ad98ff682ecaee76f9ca32114a355d859666c00e8085eb3165a74c60 SHA512 18aede1fbcf4a7ee0d919e02b096561380c019e239b7e2fbc731652bfe2210f0439172b17fae73fa1b4cbfbf02c018bfaae5a1baccb7a4a11b2aa0a20c03dfef
+DIST firefox-60.5.0esr-ko.xpi 547827 BLAKE2B 9a3144452fab14908a8451277aeb8ef18baab8d7de35fc53b33a031a790619fc03051a07f442c1c550d21816dbbd4c0a00f4bd1301529b6f0d04ce24d29b41cf SHA512 0ff78733e07b9969c69252b1526fcfe9184bbffa2b10551badc9306d83e9d7d6911a1cfe3c252d61751a2e84a1a8126cb672fc510930aa795bf171ee115cc825
+DIST firefox-60.5.0esr-lt.xpi 536465 BLAKE2B 544d9a043c1ac30c84032d82a4b8570d7798c9643a8b881c06a6a800e737dabda236d72da3ca2cbe3667692eb25e5cb01503527daab079c7b3b4cc0d5c0e3a90 SHA512 00302167197da51612eaf7cf0f90d188d99878ae0b15cac0fd6a8e643920b6dcdd0a1d473d8a3a892d0ab7d88cd9f60c897451b843624dc86273e1ca798cd5f8
+DIST firefox-60.5.0esr-lv.xpi 526420 BLAKE2B 6e6f95a160412c95d7c6d124e4998b5432f4659e4ff450dd30a46344b7e2a1ff65f3b2547bdc2d6d51497682e069e0d9de5d892c4c84344d96e1e60543a3079b SHA512 1e18b7baa51af95029a8a24e25966012832f56334871920b35de3b331192cc553d627e1d2bb56a4cbadef3153be261a5aa9d3f6fecce64497eb5c4f781a4c942
+DIST firefox-60.5.0esr-mai.xpi 549255 BLAKE2B 8a1853b9711f5ae0f6881e2fc3321dfa0e65ad2db94774e2fcffd3ab505ea12f39ef3dcebf6cd27133dabd3b7477125e691ddf1b1dd27539ab62379d9ee49c82 SHA512 338e51d214b0a9a51a9c77e5c427e18c09483ec13e2888ca87ce02e648dd4b91637355e9df732a60ce728e88eb3459543c58e8798dbd303c33cdba15f753a8f6
+DIST firefox-60.5.0esr-mk.xpi 513806 BLAKE2B c29f6afecbd43f9a984cef2e1ef16e075b3578fff0629325482a2541f55948eeb27dc16e4a694ee7f22dd9f4a5f6a2bb551dcd5e4fccf029366fc7b7ac33fc18 SHA512 cc603f32476aba3acfcccb40310de8e3725a44a2a6b765c6fd5cb0a082d42e3cb68824a95e751e118313f31ff9bc4c75c731e5d863f42a0958cee11524ceaae8
+DIST firefox-60.5.0esr-ml.xpi 598978 BLAKE2B f48fd73ca93ddbec089c0f7d1c09195dd9c700d3e336010dd865799b96a9727442b486e55d350733f25c682026c205d9f608556f311a987616fdefdcfe157cc5 SHA512 fe66e609f857a758286103547d5dfb3335d5308248b176436308058498fd1332fa881832f19d50531fbcf7a0ff18554e616caea0a0146743bd0b77bd05a33545
+DIST firefox-60.5.0esr-mr.xpi 579120 BLAKE2B f91e6d9ccf85fbf9e50d37de16d6547a648c998c370c6b6b79f722251eadc08a24593be9fe49d4869ed02712ffd956c61bc6f9f82e11e16751d857d62deee092 SHA512 1f80defc914d14b83d4563e264035d488db6da891edf9165e0420568153aa1cbe6f5c3776d221e0d8c6472524edb16ccbdde816bb1ebf2718bb95d9cf348f07c
+DIST firefox-60.5.0esr-ms.xpi 509554 BLAKE2B 6338409b0679ffceee839fdaaf9a5f9b72fabd76ecb8a9c77b1283c0165ebae2b664ba2b0d15858add1e44b5bddeb2b9bafb54665f16af6a4cc248e3af1b67ac SHA512 90a17679b0be08ab92753948bbfc1f5473ec4e7886ffedc20df7dbf3464eb95c4c329591b55ca2dd16e677d3bbf1207aeac4c3bedb4426fa0296146bc10adab8
+DIST firefox-60.5.0esr-nb-NO.xpi 509891 BLAKE2B 5a230fe839e714e84bbf44585c4652dbbf3199f279bfaec83996c0f510204f290f7308e14e3619f58d96e10802697c0a453e817549f15fd66d40cd653b69399d SHA512 7ab61067a0818400fea55e67fd1aa2cb4fb55e023222e609ab57366ffe7dfb9473e29562d2368f26d65a5f2d3ce6f23ca8ad2865954199234fc6eed8ef56edaa
+DIST firefox-60.5.0esr-nl.xpi 517455 BLAKE2B 6571534eb7baeb1f757e588af054ce5c129559048c2df9242f918f247d95fa391c706911c77abf670213a8763e95c72dbd1ff44de8ba0b618681ca85f0068e51 SHA512 f34119cbd9becd4a88af8ca3922145de523ec7896181134b779c9f99c1840272cdc1a13ca87c40024f89bbc26d02abd13a413cb93d72a345cd560c1ba1f44ecc
+DIST firefox-60.5.0esr-nn-NO.xpi 511434 BLAKE2B fe86088d98de79a7e945eb12c990d20b7d25ceaa390c5c92e62111181e65bef2cceabefff56aca8fe7a6069c0c580f1f5d5e2461acde388ca010c2875aae0ccc SHA512 de69a12eb70c1a5b9dc705b49ad4792f3a7dadd15bcc3e588c2ec412301e35364557123ab61ca59e274790bad84b01dd398e01f43117526bbf5fd37df34b866c
+DIST firefox-60.5.0esr-or.xpi 540875 BLAKE2B f099744ad7f6fedd17f2bd91e60250d24b8602dc548aaee4792a3c7c426f480e124216097ad3d43f492b88d41a547c03a3f2f9dbbec6a81e2c7484113ae1f35a SHA512 9a6ff9a825cb1959c4b56c38b77359005cb900049de21ff7ee7e0955ad0ca2b578b174f354c2c2f2d34923c774837423fc7b320a984b692272157a2559f8f2e5
+DIST firefox-60.5.0esr-pa-IN.xpi 557878 BLAKE2B 7e0dce62ab2b10a748b25655850c2102d1ee1bde2d8949734378b2707f7ebbe6d846b6770ccefc529fd1624341a6c28cc85bcdbe506d1165d211f6b771375d27 SHA512 b130f289a776e86e8c971f31d0e4644938339574b6003f007041815e939159d0b0c612578ed20110ce67ec7f8b93dbd15574d671b6a799e0a8723f54cde54689
+DIST firefox-60.5.0esr-pl.xpi 419026 BLAKE2B 86df42aa1130be2a04935e6b401c2fb7250c86cbfa2be01ef6fcf24a9ad5a80d6c9cb453986052fc82796ff019fdf8d9f620e62c846978a21ff230c3dbc6ad5c SHA512 f8cdd442a58c3dcadf41fb42c4e8018327782cf245937e1a2d82399e4a6226a029a50c5351ed58b1e2b4d655d3e120c0686f8b17c38f09133cd9af02b0638035
+DIST firefox-60.5.0esr-pt-BR.xpi 514760 BLAKE2B d3509f80acf68431d03ed36a887b84adee9b638d1277015ab7ccf135872cd4dbea9d7613e811da93b232a87f896fd1bc48de20892ae88337468e99bb512aa3d8 SHA512 e1e2e9d7d0891115dc5898cfee690de7857935f874fb2a82040557d3125654ab06b766de6699b4534543e9f263c53e4f2de7be015665da7665047e33b0e5dc41
+DIST firefox-60.5.0esr-pt-PT.xpi 519358 BLAKE2B dd4510794bd3293d16fa7d76f5b9ea5b732435395e232169b48f17343d946f3b79c3e6f735d1ca921077a1f29686cd11368cff319ef9b2fe27b2493f61e35a65 SHA512 afbdead75ddd1338b7bd6c77bae9d87b75dbd5dc0a1c5911eb0144d0c0c114b73669f99df26135d6a955a4bd04d87d7134f8566374c611fc517ce7027f660fc3
+DIST firefox-60.5.0esr-rm.xpi 506037 BLAKE2B 8b327b70448cf462cdf985822c63ffb5c76c90678f03522739fa55f5799f27a3b59ce47a7ed61208cc6357f05771145be7879f80a7b1d04ea5100df5d485c295 SHA512 0951fef3b40ed9d98317df78eef92187ed04e59237076e72c6c188016b919cec303189ee3d5ac3c3ad8741db7cf9b6f226a6c134c9ae7f3724e46fdd03e0b05f
+DIST firefox-60.5.0esr-ro.xpi 514052 BLAKE2B aabd25bc0409f238892fd54ffddaa6588b75e647aa11251e224dd73071fea0a3c67d2ed2c4f81e662abfb6b4d64f344efd5cde0cdbe07665a81304cbb2e31421 SHA512 f903cc07422db68d2990dfa2d26b050de0d4a298722078b5b768abe9b727873001c0f4ba6e9dd1b846af8d4b532009c7602bbe913d584ff2ba45c767fa1430b2
+DIST firefox-60.5.0esr-ru.xpi 591402 BLAKE2B 4e50db8e130a763bef2ac276bd7537acd5db8cba13d51cab5bc70f7c51454247e6a9f381101e50c448246deb8da304e542f6d7a296d23dd865a9c32e10f99984 SHA512 056244c9d8b0685894742e55b52156257feeb4cd575a0d9d79ac0a5ece1e16255bea83f80aa78c51c0e45c0b9909abdfd81f0ab1acd00d4c37f2c8d28a837a57
+DIST firefox-60.5.0esr-si.xpi 545576 BLAKE2B 228a3e3bcc5cbd9a66c9c995e478b5acf73780c6a00311ee81858408f1770177998d913db2ea5071cc384c82de7b296b56d3bca7f367f64c34b2c875c3b3caf4 SHA512 e4b905ec02d851317451159b02b11e465705ac77e129455f738e1c82dc11319bffd4b9a577f21928318072ed8c6f888b7c14dfb2ce4232bc3da3b8aba071e3dc
+DIST firefox-60.5.0esr-sk.xpi 541705 BLAKE2B 49e64f89a3aff024c756d0a7b77882004c38b65eb38ffa6a636c84142fe09811d39a2be8eabaa5006e2707fcf312dddc4dbf3a8b909169b901d921b3ca68d960 SHA512 346223bf3fc8f07762acfe2842a0d596461ef0b3aacd349455a58683fcf6700cdb38b33f72b1be0bed323b01fd5316d0f8491ec03b90b2c2bb7de803f2791c9b
+DIST firefox-60.5.0esr-sl.xpi 519375 BLAKE2B e8a7627c7cffc569f5bcaa05f6419e02ad58b1a99db179534c828332d398083366a62b043c99373fa619e358b5a9806ef67528e988370441bc79dc8a70e48850 SHA512 d89b2a8482cc9fc4895470bcae4dd59c7081701675c5ebe941994dfd40f0fabb50a500be70fa16b32ad448d75501f20cc43b9cba47b85d314db08d8a604682f2
+DIST firefox-60.5.0esr-son.xpi 497693 BLAKE2B dcac349ca37abd2a774f348512e5521de6a4afcc38906f82117092994fff09f30465f73cf57a6451ab9b5bbf4a1811e872b487326288a67b8ec6e64c79540262 SHA512 7b86ea4722b724275dbaeccf0d51d01baa38dcdf3cf96109c1b701d6cfb648dc9d9409512bfddf567eada73abf4c23b9f9fb9aad5a965c38d169f40f26b8ab6f
+DIST firefox-60.5.0esr-sq.xpi 521271 BLAKE2B 248f6ccc6931dcd52210efc5a741fe25269ceed22c64e6d2f802751b8907f609fc29556815cde113f95b0ac233bcd08af2a9a2ef8141a2c6efc4d8e83e146cbb SHA512 33886d155bcfdc531b8c9b42dd17cda515922155469259cc84800d82050161156eaedac2cfc6064545f073bf071010cc7f9bade821031e76fad8357b5ddf0ec0
+DIST firefox-60.5.0esr-sr.xpi 548776 BLAKE2B 4ec53025d4df6828582416ec4f03fd1ccc978e9c4dde3cb6795709dca3e8f3817607d83cbaae01fc0d9f57022fa4bfc958739211cf1b3c75d6a9f96c2f8488bb SHA512 ad5a9581717230240e60a4df3621f6a2ea0652f3c84d2c3d1076cef00e75fb33dd4a91ad2340a6ff597ac5acb2bcce17696070ed4c67582b56f7fb17aeca6f27
+DIST firefox-60.5.0esr-sv-SE.xpi 518664 BLAKE2B 5ed13f5fb83a6e2e4a7f0b406d228c39279ca6e7182bc67fedf3a9cf325b87b091fc5c8a47006f7dc220513ffa9c1e91cfb0e023ebc0dac77d95ea193e81ed1a SHA512 0f7f030732e6a080119e2272ddb84409d32f64f3b219a1bcc9e8c167d5b6089e54d5b0ef6a9168514850c51ab3b631406c29176c20644eac5c81bf49797ab735
+DIST firefox-60.5.0esr-ta.xpi 577921 BLAKE2B 73cfec3d32521567e7f9e6137a1590fcf3fa0685191259d2cbc4c6bec7657ef5bb673fad2fc5ae3e7e1081673e174acd24af8fad4d36106c6cb3b64c4d3eb14d SHA512 d46f8cd8a38f9e5ddae5c1d78fa0f6585bc9c92515883b9cb5a68be8dbeb997f3c9fb1cb3aac4d9ed6d73be99bf411a2995d4fd089ba66f5d5164cdc4a72b050
+DIST firefox-60.5.0esr-te.xpi 590962 BLAKE2B bb628127950f4f2996cfe7dfb528f3b1426cd81e673111ad602cd9f03a71cbde7900f8522aa4da099528c5663a2c3dae3f851d6ee23ed7aedbd55c365699d3dc SHA512 61cf51e28c18eba81c1e1d58b2c703d9589fdc5cf80d6960878d9b38a58b53678f28eae3c6ffff20bfefb08d6c78ea88346f343b5262234e6feceabdd68abee9
+DIST firefox-60.5.0esr-th.xpi 562823 BLAKE2B fd564c4c45794671c8ab7dbeac28f5264cc7ab5f88d585ff7d72cb85b348cb3f47ad1a10a56ea106310b2bee441590823567a4bac38cad36a468f57762c2c09e SHA512 d111e9398508b4419475c82c08d1ae73a5aee18dc130d5746b86b83596214477634dab1785c7656cf4c8446c5b826ef44813fccebee7976bfa64f91afe2a04b9
+DIST firefox-60.5.0esr-tr.xpi 525862 BLAKE2B 778e147a2946f8ba6d9393bada44f28e1373cb57a7d008db7c221e9652b81053448dc7c5984f752d3aa15c6aac36e5d8aa26f8bc39952cdb5cd365e69c2a1462 SHA512 12d0261004b0218a10b583980fcd18c9ed7f2ac1466def6d93df2d812fa3fbda0d3d737e462d9faffc253f2a945d64e677de2234298ba638ca2bac1efc5072d7
+DIST firefox-60.5.0esr-uk.xpi 580926 BLAKE2B a4a76db1525dda8ecc017f8eaa73874057eb56ddced4d960cb7c6d52d96118b265b04b309f16936bdc730bb3e2cfedc381f79ebae574b285a95d008febc6748d SHA512 f7ece316cfd1c586ba79460cd183a993d5721101c45b87d669fb4c23722411d36b382cda8d96373918d81c586950e29142ab9bcf012b0e15a628a5e5a043f9d6
+DIST firefox-60.5.0esr-uz.xpi 513691 BLAKE2B dd20a5b553b7fb0d59aacb3da51d37351c38e981598fb1c639fb994608f093f457a6b31475686cdbd96efa5256964ea56e47fc01a5f71dcbe61368768b141ec0 SHA512 49c3d090f63174fdcf73f0a1bc3780f429d7a9bd9b2fee21e50cee1ced922c23f40aa0ada4b90f24056f9a5221999b67cf5d07c17ddbc53c563f37761cee867a
+DIST firefox-60.5.0esr-vi.xpi 528193 BLAKE2B c218b8efa23d221faf652b87478b91320cd03f260b9ea72f717eb9f3192865b76eb3cbc887e9f17f7f71be36c759f60ec9d6e90bd7be14c9dd88491bddc7bcd7 SHA512 57e15bbb476bb30a3b1acef5b7b8242736b25a6786095567dd9e33d210bbe109e9f725e19e5140a5ab56854e91b520bf1472af76bb170eda9e1dbaa89f142163
+DIST firefox-60.5.0esr-xh.xpi 511860 BLAKE2B 39e34631b4ac241f6d959094497c8d5df5d11d994ad5dbb04f7c463848a1a94dbeeabae20c70c5ce5d4b4928a033950546c99a985a01c61ff10cd9a6a3b756da SHA512 5b90d5e1249dbc4f14890ff18fcedfaa2af8d6a96595acee56df34bb3481ff6f3e6b1d0cb5bf770a296678a059ccceea37e011832046d6dcfb2d8e2b3b78087a
+DIST firefox-60.5.0esr-zh-CN.xpi 543587 BLAKE2B 80aa034f254b8ce580ba320d6fb0bd148ff7abd894df440a357c7273532057f6e5f142ee3ea250f77e94e4edceff2a1292d2a80cdffa8ceccfe6b50056d1e411 SHA512 0beecc494c416e4195812f74e4934509958226ef61605efe0e8315866d76a1a1a5089c24e91f75d9802d48a0c8a2b07d337cb08166481cb3e100cbdaeed49f8d
+DIST firefox-60.5.0esr-zh-TW.xpi 541914 BLAKE2B 767e09bda7aef1cbe5aee711266274069331133f3f45f473f7e4ab3ea7cd5dc2190e01f39e3cc86f50a3b3a0427aba91c7625ebfcd9fdfbd254456eb6810ab0d SHA512 15bbfc4609c6f382b695423776d857b5675bf19f887b9133c1bc8fbac476c967642bfa58bdcff96f538af2728b636c9712798fcf515b7fe8d02a0fdbca881a94
 DIST firefox-64.0.2-ach.xpi 455471 BLAKE2B 9d39f120607a90bb805f101782e0b1dbfe308575522d5b170a239cdcd80d23c64e6118b329d514d157893d3b66256b5694eb5ab9e8fb4791f33ddc04dde9e472 SHA512 c1fa855cbe6e3e4c9d13808ae63d7289c4b8724e9b9457db2187134cd3f723f8954bf51d7a30a90a95b402dd803cd8d3c4288084227ee329cf5a898047a67561
 DIST firefox-64.0.2-af.xpi 431980 BLAKE2B 2f8dd4e228489efb651e567f80167f54e073bcc9aff0c3873126e271b37255cf05aa2bb31c7966d4a1b15ac44ea18062166472e7963a2e809e171fa84f67a339 SHA512 b9f0aeb5c68c11fad8f6e1d5d841c7019f45bffdf04a24eda89563265d21142777ff307c3b4e37ed06bb976d8630d563092322cdb3db991d4ac86dde983cd57b
 DIST firefox-64.0.2-an.xpi 473572 BLAKE2B 08fcc57964845578f994b4a7ff09356fec0803a07900bd6f49d81b498802b571d8297226b85f894b98b036a152512baf20eb5c67862b75ea6de0980c2d412c47 SHA512 bfc4d5b6141c5d113fd870382604e0e898a11b8fd028ad82b01e58981afa09fe17559b9a86e71a090a38f8660897ae940d03ba65254a07ce9e19689350231a45
@@ -257,13 +341,103 @@ DIST firefox-64.0.2-vi.xpi 488337 BLAKE2B a9a37ef562a9c7caf22ffaa66a36370c198b9d
 DIST firefox-64.0.2-xh.xpi 463280 BLAKE2B ca5f0fa160388e50f22b9c4bc243b1a759e654035335f2330c25083feff6cabef36247f7a53289108408ce5b21a282cb4016ea063f8b229fed438c5a0b999ed2 SHA512 15452e7acf864375fa63b40a8882486970c3cbfc908f1558e2656b946fb3cb9ebf93342f92712e8576b49bd591190d15ad618bff963dd4fd70966f314ccac448
 DIST firefox-64.0.2-zh-CN.xpi 507524 BLAKE2B 950b65dd32218b6f4bb3d3a47742e8a2d208e4862db39d3d9a1ef09bf08f3d6eed0c2bd1ebddab0bf1dfeebb41da59aa492e18ea784517eff7fa0f199696eeb1 SHA512 56e758b51713599733d9df287bcccc4bd9bc6a8849b401b39cab9b04a8929f26eb2ab183c76f51f710c3773ce43c9d48585b35e52329d89463d4eacd66c871cc
 DIST firefox-64.0.2-zh-TW.xpi 510624 BLAKE2B c218ece3ecd5f38e73f384c5342b6725668bc7b79412f756ee5a6e97d2524fb879b87485e3771e469aa747d98159d22207c4a0adb018b3c821e12eec6dead03d SHA512 aae4519528e733a8629db0d00988d67d020fc23b55f54cb7ac52f5e4db627e256a9814a15649bb5e7812819589b0cbc9ccb066e857bdbdd889a16de3342b7740
+DIST firefox-65.0-ach.xpi 447455 BLAKE2B 0f53c39867f122b871aa4c75e2a7934caf61b59e508df5d19cf218726b01df0ca65438e3f619d7810e2211b1ea36373fc6630d083444366993a10eb175d098e4 SHA512 1e609b117838310d5b634b005ba8134f1effa6b1d71fd50037038ef99166439609bf37bc87501f8acf59e1dd55349549f2b40b3bb5863d126918fd211f0171d5
+DIST firefox-65.0-af.xpi 437793 BLAKE2B 0a9b7058e5eb2e271b49c677386201b1f91ef829e809634b0a58e2cf33a73780086a5972bd68bc63c0f0ab8d20cb95a0fceaad06d03526c57e6145749d92fdee SHA512 a89bb5f477961328db5eedd94b8ecaef31c399fccb2c7d05978a4227c8dd6fb2760739990cf2df3bb79dc1a25b7f2a49917c5f650f02a03bbd7d7008144f5210
+DIST firefox-65.0-an.xpi 465005 BLAKE2B 4bcaafa6fd8a0c289c475189db56d546edfc411be220b96c4dd375085d2ca28175c176680684dbf341ef39ea7d83d9736eedc48beb2491de517d23c1e755a163 SHA512 7fc5e79f3fe98946ce52ce84b2b34dde64d70599820f1a3f3e83fb517a8c560474a72386a316ad08a238a487e9ca4943e08cb56aa7d9a71ac91411e28281f921
+DIST firefox-65.0-ar.xpi 509019 BLAKE2B c938224f38e2d9d8ed362cd3dd9d9d715f9d5f8da3050bec5e99f41248c1099644fd4a821b382bf0e1d11caab9f5b36e9c306eabaef40480471cd94540238568 SHA512 b7ce9d833d45f2737b540a2ab560ae4652aec68a5e844557d75aa198d356516e96a2ed529da516cdb0e5bbfbe1ef9323cc564cebccb72b7c1d61ee2b70ab23f6
+DIST firefox-65.0-as.xpi 472923 BLAKE2B 6ba56701024544b20dbffc2dcb06d8e3b23a62dab523e0e3f57c0ae81514c3f253edb5d4fd7ad76036a61a23f44570c06802ee61ac76b5c27f9d49084a77c1ed SHA512 0fff1cf461470258843bc6ed6d3de858fda860e6e7196a64206817e9cc0f28477141a2503b5495f55b9430a30526b1da932bb37c568c3b5952fb15d4485e24c8
+DIST firefox-65.0-ast.xpi 462336 BLAKE2B 394e333ce569b31db919111530e21677d6cef86b9a33cd216cf9f1d15f40af4bd221cad5fef5ab670ed4f70130ae38773d7fb0cc30ee283bf559852e6c63b1d5 SHA512 ae6e5907f99c05a1cb779fb9ac1bb72fb54923b4ebe8d8de5d0b34ad996e9daddebbf79e9bfc5c6755ac30f5d66486f0b96316e931ab50bd77da4f41173b063e
+DIST firefox-65.0-az.xpi 488813 BLAKE2B e6096c7e0639e67690605029b7b09d8a80bab1d727740e9d4610b691d912f9d1739fb49ba11283d2652bd8b6c5079dd2f22b94fa7350547f3581a5a4981436d5 SHA512 a212b75fcbcc7bbc19ff4ddfaf89938dadd78d21baad2427b6bc2fb2c6bdb0dc812576269f8ec3d2a23403ba14f97f7422e1376ca0ea4679cc407a5347494ca1
+DIST firefox-65.0-bg.xpi 521952 BLAKE2B 0cd1e568d7794c2eb8d8c2891020b869d4de6498388c14acbf903e69d04e6bfc3d776b368996ccd5688651b6691eb92f8a00425648916438f0a357fb8d017d5c SHA512 bb00bb0b06a676740953f9d82cdd7859ab10aaeb7868e08b4a82ecc26ef2de026301b813aed9361abd7a5e526538f2a655524bb3178d8f68def6148668f144e1
+DIST firefox-65.0-bn-BD.xpi 536531 BLAKE2B 40de401afae824508f5a011266cad03d90d790859da7b542122438fa9ff3194fd1fc26baa662e8eb1448319771e731c070780e04eae28305d3e7d70c0b10d193 SHA512 8391f6f8935f580d33a7b70f8b2581a74c3460a7bdb4fcf5fe462d312cbcec1eb8e2bbcd82535a919d4ebb7d7ef0a104b07b272d4d2529aee5210cb902852334
+DIST firefox-65.0-bn-IN.xpi 528104 BLAKE2B 8e9910cb9673f27f0312f187b49e3e9d3e10286f91f24ca7555718b785091489a03d3509a27f1407afe72047aaf1bfa6cae1eb3ab62cbe218549aad39f2f02b7 SHA512 52a9bcb7b43c9d24df10560d204c9a16566de524b10c04e9ce45c1bef3ba285a94fd8b01ad7c087202fc165a03f4f85ad471dad6946e9b49b35b0a0d70b72f8d
+DIST firefox-65.0-br.xpi 468614 BLAKE2B 11283013c257319a9e49160a223ed2224973ff76bfe3f5df243aa4c5f2b82c533e53c12c84ae92f84b9901cb8edb398f0f188dcf2f54600760763f5a8c221d6f SHA512 fc176e4844e5000e5c9a6f366e822316dd05674e75ed730e802d58ce82638bb3a3b43527c9070cba836a7a81e5ccfe220e6401a6f49d82c5d88a019ce4b99d0a
+DIST firefox-65.0-bs.xpi 463209 BLAKE2B 16c06baa7d74fb4427d5ab51049ab56622a6c809bf117aea70833b54ff80cee37798add1f5a81afc689c2f7ecd21956bb86b4677eb7919e254ec96b5ad5bbe5a SHA512 42e0572b0a4f004bfae3d4b3dbbfba79c0c0b8c72818dc3aa76ca7ab5a23f2dae78c5fbd555bb3b29b5b07e833aa54810f145a33083f948f3179052722819cf4
+DIST firefox-65.0-ca.xpi 469759 BLAKE2B 3b38f6668f8aeb95c8a5a51509780fea46ad73d4b23e2709d3e7c301951da782634f5ce0fe8dbc232f59a6d69ab06d47224ffa12aa57c672003a3f6fb9a78324 SHA512 14e608e455b22c36700a042fe33b093d0433ba203fe0b2b0ad28e78fe27ef2d95e3d5e307b6b49f296a383dfb80308532091c4b08c28c94b3b386addada56e77
+DIST firefox-65.0-cs.xpi 482367 BLAKE2B 1017a0c0e75f110912253ad2fdd308fd70d546cae6e83616dcc73428aeaf4d476b159382bfbf354831edd70a28366dbcf272561ff7ae9e38e1bb50c2e324213e SHA512 916f559213bb9fbc0b4cf2b8d2fab17ad869ffc73f8c10d48c773ed3fcb692ac9943957dbb7aeee16094b44d5161c0319b4d15fdd8fd2dbd968692952d9826c4
+DIST firefox-65.0-cy.xpi 471834 BLAKE2B 19ee66259e3b1a0a1c11b2907759f9df96c2207c51e9a4b75fbf3bd8bc5e2984be263f251effecb95c444915ae34d89376a6bafb3fa56fbd32125e7b7f5977aa SHA512 79fe179064f528951a21204feece2de6a102b519d96d910aa29932df12a28774b37b0cfe5485197f2984a0466fdd91011d9aee0725d1dcb74139f7db0abe54af
+DIST firefox-65.0-da.xpi 474705 BLAKE2B 17089fa296853cc96ec53a76253cf0aac4aa9e3cc72b7bbbf96d4991f2d6f721bc06abc1479084b1ba73a09e9913f68c5c4e71a3540a1e5706d98558acc36e98 SHA512 2b508f6a53290dc259bff17dc4745014aea2a1522b738516fe214a6d403d720e8af8c9e6ef1cb8569af03b0d11eb41a8f1876215c545029f491c13b083aa8937
+DIST firefox-65.0-de.xpi 482311 BLAKE2B ad359047d7dcd5e17c0f3a0c17a87d9f60610f1ced347d9aa73decd410fa97755129d3146fcd8bc98e05b60749d5a79770f6a693edcb6227060ca5c5909929e7 SHA512 c358fc3343dff0e569ab058082197409093231378859eb6e4693ed35df28aae2d93722db713cafa3f5d819c93bef6c650df7ca35840081004a7aca9aa19055b4
+DIST firefox-65.0-el.xpi 549048 BLAKE2B f46b43ec160812670b358aedc6c6457a1783cbeba46c61359122a058fb2569c9351b78a8686778ac2ddb48b9accf8bdc2cf6258693e87d1cea94d93b693a86e5 SHA512 cb90713035c9c36e6b8e4325bd4b80e11075e4fd25c67db49a37588456ea81003607d2c0a26a725b3c2309ec8997e5910011cd6bfaa9fda51ac6f0843b963fad
+DIST firefox-65.0-en-GB.xpi 441644 BLAKE2B 711ffd92c08b8c7cb92ef28f5385ea0c860745601fa33fedee83a714c32dc43924227098eb14ad1e9f7ae6927c87c7430b268b653001c64e0eb8eb4c7f630a07 SHA512 c9db46baf8e65c6dda527f881b7d187c4f418fc2277798f5125f023cb62de8354d1167ed7b9fc98c97b73c196576845f3e6e4bfb17a68bc746cd56fdace3e32a
+DIST firefox-65.0-en-ZA.xpi 421339 BLAKE2B 1b073570a2c0ef868fee062992fea8b4f2de507f81aafd341c3a3cb0450ca449f532c6f430efdd0753ccb554b788fa81089d2fc4b9171be02431afada870aba1 SHA512 675b3850971a80a740eca3543793f3e19dc32f258d9f023cdfd88d9f13afd139c53146c957566aba48e4517df14fcee9dfe4549120984f45f7c7296834a59569
+DIST firefox-65.0-eo.xpi 469163 BLAKE2B 34dd945ab2b94e17d2548eb7b9241e869e0ad04cd38c7272994e1a012bb3f9f962921c0b09b1f4b4fc5d90fda36ebae739d589bd887abe316f6c68bdb1abbb7d SHA512 97cc2f3ded259ab1b0efe3e28b3a304629d66df71300aa6a2fc252509a120017cbe5056a635cc1775b051296511c2f71dc7b9994b86ace8bbd2d6b3b51083ff1
+DIST firefox-65.0-es-AR.xpi 477375 BLAKE2B 6518600b6c9b1c7050a0ebace9fdafba64df235166f9613df86fa0771f9112a2dc6173a3d1260b6bade02cb0cb036c24e4d14ca8ce61be080069b77705a05c89 SHA512 a71e538d8fbf22d525037447a9e07b103eb3aa87de36c4204efec022e7c632e6d3401b7bf7f7c2a792a2aec328da2565829d98e3d884f999931f1ca8231db654
+DIST firefox-65.0-es-CL.xpi 476261 BLAKE2B bd81e90d215302f9c7cbbd3a3dc1eefd66f6b8cbbae06972ecdeac146d410966a558b552b4e587e902580be17d7bf3f12d713ab9498001f3f8fd05ab15f9f0f2 SHA512 0b3e905cb88afe512f3d8202875dbccc22874bb2f25a239ff77dc8ff22bd6c084445fa8cdb4436d37d4ea18a1e6d21832ea31668bb7106d55624878c3acbcd71
+DIST firefox-65.0-es-ES.xpi 437102 BLAKE2B aea00bb3f5302ffd0ee38e67628e994c538b1568be0e2aa1ef4e7ca2b5d98d4c29862e2d8ecebfc3b329d93debdcd328a8f80f0d8392a3518c78a481eec6cc7c SHA512 c18df1c1d8559416fe544df203f9e192580f6123e2d5f258786e7150b55aa6d206ec5dc39a3697f4fd6662681a058b87a89350d18a6ad0c6f1d66792d3042fe0
+DIST firefox-65.0-es-MX.xpi 479493 BLAKE2B 81a90a36a2ea2a11fbb9b9017066a9f992dddb946447bec5bc7efc9bf236d3dc05c96bbfa77129030c2fe812585304c9904c4e4c9ece064010a3a32b98da42ff SHA512 3c24a6858c4d050813aab711242a1d70bacd683ea471076435546a3d04b50073347eb1106a9cacf03c1494cc5f0906e22907050831d994130557dd1508f7adc2
+DIST firefox-65.0-et.xpi 460954 BLAKE2B 08fe504af58ecefe7d23df4babf287af6bcdc3f8d4720267bf8a7e7af7bcec209577243f89a67ea7d0de6f39af7a8900dcccc110d4d881b0f940dd5704d2553f SHA512 6aadb521f204e88be670cb3c8d5936c53752ecc37bc58ee6ff1ec9c5d5c535951c79c4131fea7e326af984256a518fc501ec3bf56071f58f2222b67ffd410db5
+DIST firefox-65.0-eu.xpi 468842 BLAKE2B 343293ee8e81bd85dfe13114fcbef5a3c205a3aa918af9985b78291e817b580e6a52824aac6b266fd360cc1c89076b6581061ffeb62c67eae4aba7d65b8b5c6a SHA512 24bb255a5ae53c3f1d7430a5a186fe752f89a1da6fcf9a80042b3c34f6df6cc5f33547964ebe40573a0f6ee5ce54578baf5b40fa3f42463d9ecc3c637382ba34
+DIST firefox-65.0-fa.xpi 520143 BLAKE2B aa2be76c03d377b6a354496505fb9b3a4e9a33b3f9f3ebeb7c42656095237134677c361160e90c670476c9cfe484ff3afe411c2fb165cac36913dc4b56003356 SHA512 59947bf9f9b67e123fa2457be8afcfc145be5e15c1aff55c5ecb8c4e22c0065b8bf1dad5543e82d60e5003c3caf7d6343a51f50a88f1c300a4c59df7098de9f5
+DIST firefox-65.0-fi.xpi 459819 BLAKE2B 3e993d9f96cd05c3486411a7b7343a4ac5593656ee6ee899406d03f65d1ba1dfc7d525eca717377f074075bacf7f10ead66992369efbcb9f16c8af0a35fc4788 SHA512 88999e95bd1a5d5c9eccd78bb24f08821cc22f6ce2045b7ddc45525f9ad5985d05ecfc4e9ae6742cb26e333e770a622938421203bf7f02b2205b5157f3851135
+DIST firefox-65.0-fr.xpi 486273 BLAKE2B b64ee8e392a1db27b35c48a41405a4a9796f62bdc10377683d292fcfa692f5c9767206cc05dac409916627e05f7c46c6a116b136daa9e4bcfbbef6cf2bc43447 SHA512 962e4eb660ce59a3edd8ca0e18ee2e437733375e7fddad9c1f92a75dfcde145ed0fb0fd5686e7531ea7e248dac3d280451658eed158244972be6274baffaa084
+DIST firefox-65.0-fy-NL.xpi 474527 BLAKE2B bd5f384f88f1021e95c5ce5907d7b67cec29ebbf1d3f7b50e3eb8f172288dc504d1af2140027e555b950e71273ac0813134cf54fc19f5405f73e6a4ec5db5d09 SHA512 80f29dffe1e524451b544f4953cc5fb4b35febdad6979c40ab4f31d0caf38531ce741ce50f60870e4b8cefa68a67edd778e45afa02ab84a9c6e0c69bf0512c2c
+DIST firefox-65.0-ga-IE.xpi 468124 BLAKE2B b2fa49836a5775f00a604f94cf3ad27f3b193963d96ea7f8a7ce74781754fbe9abf9db91296f66ea6f82fc396228bdc763862b5f088f3763e10071f62d29937e SHA512 807100c54012e05fb0e4958f1de76c352057630699d14d644a8bcc1128b951508080d32ea00f01d631f6f636a84c8bd32dda08302a07bae50a3fc81207aaa303
+DIST firefox-65.0-gd.xpi 479073 BLAKE2B b46eb2efd364b35e9d7ee2824f5f8e948dcdf1e731386a42984838bad78cb8d29fe93ff149ffba5b01c8c5b8591d52bab97ec2ad9c3f05aa91862eadd1c4e569 SHA512 01905fb6ba0d30124631c6325a70221464493e0fded59ecbb934a394ffe960fe05238b0c9fc1297259e00d0c8a2194e44d2319b8414dbbd8fcac33fa0c117257
+DIST firefox-65.0-gl.xpi 463707 BLAKE2B fa7f3a7aa78f250c3918f27510276af56aa6f34d923a5c634db59023d4e563087bb745954863eb8fe39c8904eea0dd3a40928fcb638f5a6060fa33432c734e51 SHA512 66b4560613c050e6e1963cc381408f3524e0cffa11126c8cf754f16f8f60fb3a3382876ac89d6337bc21218c092acac4291fcfb9a848948eeb7b5c8c8bf2830c
+DIST firefox-65.0-gu-IN.xpi 544747 BLAKE2B af5e88f11742c61b48c25f2170f2ba007bbb4f0983d1f958c0652109dd1fc68742bc23183a5d8573a80dbcd9722c1763fb7d1d8a2b142cdff1245f3e5f871dc1 SHA512 1233798a2d2985e9ae960704bdfdfac6b10954887e16e1050b22f99b9a43309d1e5200bba3a141110e61b83852a59c069f193cfc46f653481c786fe63706d7f6
+DIST firefox-65.0-he.xpi 485643 BLAKE2B 392527a00c8cd2b4448052bb0f9ea1da3877dcdb4c61f02f3f399697cc7471bc8bd250b4d7ab1a083dd04b0ae0f7f449adcba4f2805a54380f6787fc013e4e82 SHA512 5fcc9b4b5e5499505e7ce41ad2b96b2ba2be7cbe9650bd9865f10b0f737f00754aeb5f2dabb46567514fe5c9666ccddff13e2eb2f9d01c137a7e40cdf0ca8505
+DIST firefox-65.0-hi-IN.xpi 533022 BLAKE2B a0f5e64b6911f2ac805dd98527fc65a4bd53fa8ebaff97a443df1ca122015d7d6a0e4b431fd16c9224efe7313a9587c17e528d191d5cbedbd149ec6da0f41c67 SHA512 bcaea79f929a2bf936b2c3a0c163774ac430677b7097edb558562766e13b7721829399e943704cd18b95455de6824b0a431afa59cc5b41cab6e6e987b770adf0
+DIST firefox-65.0-hr.xpi 465049 BLAKE2B 52eb009af1ff72e5532cbd7134dc4bf9220bc612e3433fd31fb4a1adea2d4fdd8c89cde868400c819b355a45cf3eb15b17fe57343c9985fc03895bc31b79fe19 SHA512 a413cdbf3906deac8479c58c59cf4953ac9ac4af78d0bf53c7da4b19404afccef1c0c3bf7f91495fbc7dd17e39f97cc093ba351afbb6832452a111a35f04c169
+DIST firefox-65.0-hsb.xpi 490634 BLAKE2B ae028d1a65d2183684a16b4a5890241210347d149797df5e5cc0b0f577fa7d6760f042d5fa44279e96e8a8f023b17aa45c2e057e95e4689ebf3949521d2e0c92 SHA512 8a1f487783628b7a63a6fe9d5b3e9c05d93e574fa367f0569f57f8840bbd55af6dc7d14f23c026b73c26bdf85baaa04fb65b57c7aae611d77b21053e9d89455f
+DIST firefox-65.0-hu.xpi 488207 BLAKE2B 079b78ce429850a79d6c60b62a5f07a41858f7eb45e37816b36f37493c721e7cc81723b8f753b937e9716a530157f39bd692925bdde0afdcd6806f3605d9295a SHA512 416f42291bd97efd66a212a85bcf466ba0cb8a1d699c8d2164890ed19173e57e0301e9272157255c0ea5c9c6ef0b56f655dd8d0c86400bd642ae3386e63b1823
+DIST firefox-65.0-hy-AM.xpi 510217 BLAKE2B 7fdd3c5a5d5ad1aae1cd79d7f867e42ba82db683c33bdd6abeedfd1b1637f22b1909bda6a292b2c0ca7085d502078be94962957a3d41caaa71d9c4c444863037 SHA512 769043d4c5136f5f39ab06b06ef0e20f3af613aa582c33bdc101052ff657605b5bf9c6f511c1978fd8b5bb4994f11719ba0d91d3e64e5266f78de69a31204125
+DIST firefox-65.0-id.xpi 459182 BLAKE2B 276a1e80014ec014debe930bb8e997e108a117da1513221c0df9e0813a1952a1d2180cb0c045bd4588ff7b94f3f17aa6634c69462d1aa45bfd3ac00984ac170d SHA512 f747c7b048b13bdb97309a6617cffd2f1021a994d57aa10a65f72f37a7de9ccb5714105f2ea539ad6dec018faef084b05c0d52d0a4f8f9577ae57b673f57ed36
+DIST firefox-65.0-is.xpi 466957 BLAKE2B 45a873e9d9bcd9e89e8c47db588d2f899ed447b27f1175aaeb88554ac19d548e1fcde439430adedb751a8a0c7cc0aee9d2c28e7ad5eb92afbc0b5e83d30c5dda SHA512 0b2dd037ecb7928c2d9462af5e535f14b47f63986c72aebbc03765dedcd1089375617d44789e9d71bd9bc304b140de6096dab3c60fdfb6af7108d386a0869eb8
+DIST firefox-65.0-it.xpi 356549 BLAKE2B 77801f130f251acb15423daeee4471610e1457f228c923335bb64331d62bc85dbf6c78ec9a0ae570abf6926db87f6e400e1d2709446bea8f36aec9f0d8e4df42 SHA512 6238c31eb36722a12cde258c12a00289800ab9cef4943c942cf5e38cc5943bb03d65e03e7e878decf15f7471bb3d5004453cac2ce788e1ef3bb714becba942c3
+DIST firefox-65.0-ja.xpi 504397 BLAKE2B c6f3a020ffc269692869e918b5f70c99c64b304c16b5f0ce462fed0db77c633670c09aff8dcb05462ebf089a69bdcb29419e2c8b4d65e3117a3ca0ea5f0bb0b6 SHA512 cab0ade26644f016e3a15ccbf467e17b4ebab62fd0a684a19a64507270a27c92a48a28fa0175a54973e23194a3a22f0a79b1fb806f7c59e91b0d384e3555a7ae
+DIST firefox-65.0-kk.xpi 535904 BLAKE2B 4963a13af72a65a7f8addc5fb7ccec3e9a3a394a08ef19a3492faaa7fc19c6b42c5399efa45372fb6fdd0d7d87b3c5b7bbdbafdfd464dead4b17d8f83d1dcbbe SHA512 981df2c1d22d8ffc7d1ba1d983a5b41d139d6d405ae213b80079d98ad9ca4f98d631e68affa54506e8788fb7a2e954e14150540ad5d05ad86f7879b9765d88aa
+DIST firefox-65.0-km.xpi 526578 BLAKE2B 820be259dd9925ac18fae39a0091a318d63d3a967ff37fbee695b10a58b5d0e3d7e03be16119faffa867cd2ac01f7dc93442c3301fecb022be2bb1f3c05fb79d SHA512 d990097b2ef2080c71278e8c727543f88c847ab2f4578ecee085e907dc21de2fccfb9f97944c77e05974bf76c971cdb226d2e833ff9df717b28ed845b64df9bd
+DIST firefox-65.0-kn.xpi 528125 BLAKE2B 3f8e5bd026165e5274f14553b0e4bad743c1e3044738686f5f615121986b726eaa08e764331adb681eed8aa0202ac9abc955f2509bb13a91631591a06ebebe4b SHA512 1d0270561ceca6695d73c3268cfbda8d1bdba3f719ca5861f9bb2d5f8fd511aae3d415b8e8ed751fb2c46da4c731b4c50bf2df45a9f56112e536a78a38eabf26
+DIST firefox-65.0-ko.xpi 495305 BLAKE2B 2d81851757509998c72d0a6b2007593452f42a665f9696ed48e12c90215da84a2914c9955e00e5873c79400b47ca06c2a15e3bb89c5f0cb1ebab2ebf563743b7 SHA512 83233402efcd68436965c55b8cc83e3af768e5a9efc8777b659cf5a31eed41cf9470060e8faeee78f31ed17ac9bd7e15e13a561673b3062a69051ce6120f0802
+DIST firefox-65.0-lt.xpi 490193 BLAKE2B 87af99151d403fc6ea1207bd8767db92a5a102c4a07624065b852b2bd52f34d10a1d6955e8b2ce003d121506021430051cd1a2459be97e0955e5dad482c820d5 SHA512 a7ccd5f46fb92be7e6e9cfd4d82e38bb9e0a37e28d77dd6ec1eee2f9b3d9416547aacea2df8c33ac2a0e42811cfb10aeb8f24d0fea82f13383ef760d22ee9705
+DIST firefox-65.0-lv.xpi 478935 BLAKE2B e22c72cde62aa66d8ed1ee270442d2c6462a14d69f557925378a6961af832b41ea7e9293ba30093715f76addc69608f8ec2618d9198b2e1458ed512f693f0edc SHA512 291fdc7458204433f500529258a22e640ac933aaf7eb107fa0be6ce9d1861db27b12865b1b792a63b823c57a6c676562b69da6ec5a9ec06575bc9cd5a8667c2e
+DIST firefox-65.0-mai.xpi 489178 BLAKE2B b210be2b9bcf6e7f862ade17db8e7f03f0ac5837c4e398463db6f28ef4afc703e6d694319dc44de8a75a49d00fd9d046301747a4741169b27b548ef78a45abe6 SHA512 5b37b21e7604e39e14e0b68c4732122c29bbee8f8863ae8b8c6a5c268e77e1c1c8b909533886664959db15733eb819eccd380d9f434cfb97ebd93d5c14f4512c
+DIST firefox-65.0-mk.xpi 464187 BLAKE2B 040d1f5eb493f823c8f1ceae89c2a5c81613d00d0d903330fafb2c9098ab6e0103ca98647b69bb30a7b6f556703938ef8fd2d501208cd2d89ce9dfe779ef0497 SHA512 ee85597354ece18c33d093b58a3be4dd1a4a6540f3ee40397e986c60963110443f39882b85c9bcab2063820e907fd8fe8005379256608816767b20ce51191b59
+DIST firefox-65.0-ml.xpi 534382 BLAKE2B a1581c225f5f2909f5bad334d53cbe984a005b015b0f4119f2b9aa5b21cdd26cc2643ceda4928c1d63de3d922221cc036a19e9c68c454df69c6dff1434237f9e SHA512 32fc275eb10fb00fd54534ab9d5b387711ee7f015cdbdbe23bc1f56277dc5defa5ea31d9fbd561a3b4e5edb76aefc7bccd93515a98dbd77f3d1d7e3a3e73c677
+DIST firefox-65.0-mr.xpi 528018 BLAKE2B 5b3121391616d08c331861222314e0b2c1c44b1927d527e9f5723f84fe9839dc10bccfd09dc2fc902f26a5f492b8d55d6b280542e2005e6fcc595cbae7dcb302 SHA512 055f21d49ff1ca7045f5dc5e467aeee1d212e9b846f87a599871e60ece65ddf5f59350fa0b6b5774a0cdf6728c99d17ec02901575a04f8d0492a9b7caac434df
+DIST firefox-65.0-ms.xpi 460717 BLAKE2B 5df53410c4170765a1fb443643fb652c1aac1b1b82c355c4ab63f7886adc9f5a2e2034a61cb9a166031de264da50479106d2f4ae9516cab5aaeca9c2f98f9b8a SHA512 1e828ce8dc67d164a19d12acff1d5a9e4d540870df17375111033b2437928ecf4738eab04a9e7dc54df1e21879237b2c4fd87765618bddf4eac4360e565675dc
+DIST firefox-65.0-nb-NO.xpi 461048 BLAKE2B 286454d3c2f7394c85fc9b8c099eb322c66a76c679221a1e039c17d46a858300907cd08ae94a65eba1c37ef65717d00797c4423d2f34ceab603dc4786d1ef894 SHA512 aaeef10f11cdbde672504e2cf544952c394a6963d6c2ca1a8cd39fb901fd0f1cdea4f9da0962280308059d75017965aa747521ca04b5de6399ad47a47ab5c45c
+DIST firefox-65.0-nl.xpi 458731 BLAKE2B 666f9b9b2658408dc9103ff76c4a06696eff75ebedafcf9e459bcd00601469bfc96e0e42ba776e155a002f53c6f2194d8809de1a546b0df77a3700c62d6cc6f6 SHA512 03ecdd1b6d28299c54428cf737a8edb57b7365514f14d8cbba266fd6527ee280f7bdc8aa7deee78d6b48ec6e94809d20f7b9b364fafcbc9e7d52198f30251566
+DIST firefox-65.0-nn-NO.xpi 460163 BLAKE2B 00402edc07e45fba1b76d48d55516266009d19084b74e120dedb3478dc035aa117aaa408ffd929ca3ba46ad1ef7d2aeaa585505ba317f64e20b7152b7fa163b1 SHA512 b2be2aa2aabfca1a7fdb2f481bb170c44bb12d3148b3a5dc62c27663d56590bca3869105daba36cb1b2fe48754c7cf893cfd37e906d9c6d6543135e312db36c9
+DIST firefox-65.0-or.xpi 479085 BLAKE2B 4bc9e04d4afbe2ef2c40d162054cb01c060a01fa9b44344d8546cd882bf7236b6190bafd774f7f77daeaf662f42cb16c7b9cd70ab17b3955ef6bfc4aa89531a1 SHA512 04bbda20452496445054b161239292562f95f4e2b37be4199c38395e26faba6873bfd4d2065f516d95c4c8f1fdf7854db11d9cc81adea06c861f256cf521c01b
+DIST firefox-65.0-pa-IN.xpi 510889 BLAKE2B b25427f9f2e3d57344f6af533a9cf831487728a50ec63591d6f5d1d684fac34f2ff0c025b04580d7c1c31e8e4011a5c5b857c22be20db9729a024e268e0ceb6c SHA512 ce8364a8534d3f5002a0a6075623cec39837e7df76d34e4cdcac5c560242926caae7385be20a2f73d1b1872292f3e66af8dc13c3e66af8b1a4ba3adc796a5720
+DIST firefox-65.0-pl.xpi 378829 BLAKE2B cf1d47d896011ac1d54add46c4c64e2051419a21fd779dc12ef15a104aade07b55ac1c8c4f2a5c22b47f61bb8fc065941b3a3a7dac43f8a603d6f434634ead03 SHA512 af8ceb2e5e488b79eec9335744702291392e190cc9b528e45587276729483d1b5acfea9ce39a7422c21ebd25689c80e111394476f8540cad5bec73bece0118c9
+DIST firefox-65.0-pt-BR.xpi 463443 BLAKE2B a71f1900f432f3bd815ff85e03578228c096868995253c19aad2532d675a03d0e45764dc197093ceb3c27de025e2ce71c3d27ae8a410a8d6b3bafee6d4eb3a47 SHA512 983629b945431e8b2ae2e2a564f873bf0805bef1f27fccc609ceb16c5ef28be4aa9335a5c11d65b2970d02c7e4188e84a158a9daa06ef539ebe686bf870bde87
+DIST firefox-65.0-pt-PT.xpi 475344 BLAKE2B 9d57896255fd4d6048732f8e06f15eab8ccbd3ae6c8a7dd1fcdc599692b77cbb373d9996e1acf4bccbc4632a6e2a356330d0a795d55b8dad46d524cf202870b6 SHA512 8e4c49c65e71102c98ba38fd6c8cad53f66e256f4de1750cf2d68d9145a8633878c96504250370538e5d231364dd510ba8f05042f78b0c8f231017b879ad3d13
+DIST firefox-65.0-rm.xpi 466660 BLAKE2B f71923ef82ad239e9023d9f333b67408332481b1da23e991803aad241833a60283b19d1651c52a225f8646dc148035c68a85c4157ada2540950a4299bce9bfc5 SHA512 c8e2536375a733975411d0cb952cd9c2c9de40bb08a474467226772e6280e34e31475987b5180b2e2b779281edaf07804058df64426196cb1f0bf827a966c8c3
+DIST firefox-65.0-ro.xpi 475441 BLAKE2B e328309c64d107726caab9a8f82d2cbec68f6e98e28afad87b0635210b6a6f1bf55441a1051fd1cc112ec2cbfee102b4e492ff2715bbeaaadf8817ba2b1b1c3f SHA512 86bb80b6ab38f88f288039c749ace3eddb7619d5b469611b0c0e1d2c09d9951439fc2f657cb9829b37c6f3336adb0cb65a04ccdfbf38f40e54b4ee38259ee57b
+DIST firefox-65.0-ru.xpi 542358 BLAKE2B ab445df21f847b8f7672307c53f4def2c5ac4b4a2d3998afa8ac336675c51949b402a8b65c8b25460725c647d4ee7d9c7a90d91ffd0836ccebddb10695122387 SHA512 cabd487c5f085b76f731cf8e2a608ccb99dc4d88cebe817d496a82837bfecdf8f0663caf2ba65f4f0e27dfc5ea1feb99e57264deaa4e11a7182ada4aa7d6665e
+DIST firefox-65.0-si.xpi 491181 BLAKE2B 7ea139acd339d0d279dba0f345bc48c2e65e06859a2d1c46f91836d996dbc1075fea703558920345d4653d800a6b4d2846c9064cef1b5b95822ea578b9f366a2 SHA512 4882b6590a86fbfc512579c66005dfa345a8df166870badf76cc67cd8a4d6e1db5c2460904f90ea36da2b7ddebd1b01a955e1007cf315cb9664b2a378f124e53
+DIST firefox-65.0-sk.xpi 492573 BLAKE2B 21c252d02746c678010d28a3d3e3bccca70bd4a105a213268ac92e95eb70524bad092ad144f11f1a9275c0ba54ac15a0815454643194eb04ed9992eed232298c SHA512 7318a37596a305a21f65f83b8437b1158f2d3a5ed2e508e3c5fa83fd94e19d3dafc091c0415e89364bf8c56fd79ba763ce347acc77ca98780098a055528b44ad
+DIST firefox-65.0-sl.xpi 468039 BLAKE2B 27d7c9a3375e3aeb2857696baa674daf4905e0a5a1d1e9dfcbafebd9571a888303134c7ca79cd865def79704306c435721ede5456c35d760879550f48100553b SHA512 1decbf03bddf5e2d6d5df18d60327a03544c33b6ac63ec22c3e630fa35820db9e8035d9091e1b4e1629323c19ac38dd49ab0d46d0f69113e5fc7d28da402c25e
+DIST firefox-65.0-son.xpi 443501 BLAKE2B 1645678f284d9b7ad4c7505c17ce821af8ec5be7dc299da4df3a54d1058e796b25a0a1a85dbfc85f738deff6b0b0a74ff301a19e5f73096985de363b58ea4bf3 SHA512 c6ad371e379145463f258abbbc37c17c89dd487a15d5c30a438537e9785389a4bab3146282837bb11b11b0bbaf8b527a0e56fa9d4f7409ccf7ef64e304040949
+DIST firefox-65.0-sq.xpi 483758 BLAKE2B f6d52d68ec0d2592eaa73dcebf96055b504cafe3057d733a2c508ca283129704bbe2f040afa77e141b541ecf7c4e58d13a0e7642c8f7495e05a731c3668413ed SHA512 85051fdbba4bca2a9e50ef38a93452b82c5fdd8aba8d186888a18c3b42747bec228273e587753152af591bc004898138da1141576ccf054d60de316f37e27688
+DIST firefox-65.0-sr.xpi 498950 BLAKE2B cb1f18939d120cd589e16b0e5e0b78cb0e502f2a67652106b74927d025a9dc21adffce48d3af2282918bae6282b085cf057495305be226731fbde8551a6fb0ed SHA512 c62758cafb913e73cf120a75f365b9ea86d03aad3ab02d339e0b33063a3d74f474acadecf832e3751485be1deb2534586f9e3d8beb4fb506d4c5f93f9ad944c0
+DIST firefox-65.0-sv-SE.xpi 470813 BLAKE2B 3c1e90eda65456fd739074bfc7fc670abc5229a0d04c734d1e76e1f33e5af84ec865e27abd4b7a43769b73725d9bcd3525d220737a155a40ac0ed47029b42cca SHA512 d23d3356e53121fb3f708e2c1f88ed0693bc1fe1682697000c50ce8c8f02229dd7246f4d7b896aadf96f4b563e5e3bd318b9aa171da36cad1e7f73974926adad
+DIST firefox-65.0-ta.xpi 522778 BLAKE2B 0fe74c96266391656eaf8b042a624bc6f9bb93bc0ac75597d9b345105b19a2697d3a553c0875ce681a3f95acbb0c63024ad688cf6d20fc8448ff1aee6de0b11b SHA512 8bf87d0915232e314edfacc3c2080eeb65fa67f176bae53814a6f9b4b67a420107f4eb4b204e84b2f29674ecfa74bef51baad02286029706abe6c616dca94853
+DIST firefox-65.0-te.xpi 534585 BLAKE2B c9e82862485e34a5d3653b3a719e342a8106589e105651561f06f616c589c3f9540f02d0aa16d163a3168e9679141cc9eac16e9b80ed8d89f3ef7fd4e86b228e SHA512 9421d08247a30bffd750e6faea485da01d205488b855f3526b9109271cb8bb99fdc7e4bd779ff55e64eec63355ccee7c85ce97af6e5ef9ce52fbd439859fc275
+DIST firefox-65.0-th.xpi 507521 BLAKE2B d2f08f40c2cdf4d7d46fc701e0e168aacecbcd03a045c358351efbeba89d2a21998638e35071c0d56b43b782edcbefec95a77853b7c017de6642bc43ec69b9b1 SHA512 9f8e5107875903c412f12ff9bf87aa5beafffb335112a6c86581bc14186b2c7a31a1c0e2c472ab00be0b838331ae8793be59de94c651b4d2b6c343aa4f79cc3e
+DIST firefox-65.0-tr.xpi 481299 BLAKE2B 9c098c7fd0ed8cd2c16ba5d0b2f3054e5e5200214f0f2968dbb25206baadff400a72a7804390c642b0cd5f9f430b535e67448863272d9ed783713d83ec0ef41a SHA512 7f156cc1d9c07f8069c77daeb116c528c3c4ffa37a753d0593348d78860ce957a6bbe05eb377b4ec6a8aa95f3fb24a2cfcd0a71917b82c362e11de9efa0e9753
+DIST firefox-65.0-uk.xpi 528931 BLAKE2B 6247b254dff6662695201de732a937d3352e331048af7693d16ce9dd98827b3af62f20d34ea36956b46256c6a07078939d8f15e4a473d39a05da0a8a465ac689 SHA512 b6f241b19e5801ad045011e2c4b9656755c8c1a77318f5d2e7e66c9f85c40e010ae84d8de778ca3c3ada86735764cff5b1bd709ced20c215c2568c8ba8548e0e
+DIST firefox-65.0-uz.xpi 460813 BLAKE2B ae87f035710046c1e15d209cc3da611eba1159f993acaa505076037541d6441e49926356023770fe415b8c82639ae349553d8c2f87bfcf82703f264159647de7 SHA512 682566323bed7f1833a98588599c8932971b8e9d429be7c375dbdcd66b551e5619ac4966838d6f39ee38c126e468490330b8f2a923982bde5449bab2fb94a06b
+DIST firefox-65.0-vi.xpi 486524 BLAKE2B 68589ad2487a8703517aa3409995fc19854c4f60f2ebce78a60243eea4da2d9c8761b1f042baad812499c1ca6c86d7628d98ebe2ab202101791366bb5df7bcc9 SHA512 90aa1e4352fe4f980cc18b8c35b61f8c1b71e2b490f5fd0eaa03770d24feb7e69a68aec08a9342ddd3d42a620a73bb4f69051d6c4e34c06799fcd60921d61f3f
+DIST firefox-65.0-xh.xpi 455414 BLAKE2B 96e131c7c5766fb8068c4714a69b0b8db7dd67e6b398e3d71be814a9138117ca6ecbed87cc00c10ea7e25a48636f3a445018ee5024c5fbec0067c05f5bd84534 SHA512 a64aa3e8978ae47ff862c27088b99bbe03dc0dd2b786160c4cb0ec839c2e7dbc22d0cd38d4ad8d267cf84bc601cd2232f10d5ac8070c8eac97fe4d8904a45080
+DIST firefox-65.0-zh-CN.xpi 494803 BLAKE2B 89af3f0830ee2dbbdecb206834e6098015fceb046efd644d2c3abbe7a892f0cec9b73b3c81aead84c017ac5f4d05485a56dafc144b7acf5561cfbcf4bb60457b SHA512 56ac0c0f56560c11f2d2b6a57f9774796ae45e892a69fa93b779a48b235d7fee5350a32e55a96c430a9e13e7cff5306bea139fbe15352efae216ca233ef1d547
+DIST firefox-65.0-zh-TW.xpi 492966 BLAKE2B 29af124152206fc722012e8cce49d590dfbdd2c165afdfdc679ef1001815296baca28b722a0cbd80e4a43061bdb1101027b092994641f7717a5d1cbc4a7ce5aa SHA512 27f7c1a37d4c86ffeb1db89bcbb36abebe1361189654bdc31b9d7cf1ee9dc85127cff71d396172e1f014441c2f21204334135b88fdf8005fd55898707366cb68
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
 DIST firefox-bin_i686-60.4.0.tar.bz2 55650466 BLAKE2B 4ab62c79c0824a4f2b324e27842996489fdd6a1eee25e8d3fa76e2083abfae794d46baa20b982222e0660045fe8468e53340c451f516ecdeb48cc76e944c6a7a SHA512 633442082d9dd1b4fe689764e4b0328c4fb31a06ca920ddee72265bf25519285251d26e9b6a5815f28136e1e2628cb83cb26df8414682c057bdb2fd55ec6d82f
+DIST firefox-bin_i686-60.5.0.tar.bz2 55559470 BLAKE2B 13de319b54dff9e95f965abce80afa7d72864e78bd842b6de346b9dc2d5a1a1b6bcab24eb5fb887dc5dae9b1a20ab18e35680e6f2a958fe50644440e8533c6d2 SHA512 e0f81dbd2f7798adcf66e22040f50ba6f6550c4d5e2bf0970228284a2dda98725cd3f40f3c5304120bf759cfe6e3f74c7721eeac8335a72cb714d2f5e4e6dc76
 DIST firefox-bin_i686-64.0.2.tar.bz2 60990199 BLAKE2B 3b7cc7c6f3ebeb20be56b6609a190476f078315c32d90e4fb4b966b27e6d53ed4c60a4978d25d802727e3e4b9ed34aa89da30263bbfb670d904aafb1989fe89f SHA512 dc2cd76c4304a8f1e03f750a8e4898b5bfdabdb7f93dfbd3344474fc91a3533574029d18d6e1a4e0c98c29d790c255fae3b8a6a9ef7054e371b28bc7875eede8
+DIST firefox-bin_i686-65.0.tar.bz2 63128201 BLAKE2B 91e99a41ac753f4efd2b3645ab7186fe891862d412f440bd71fd44291163e19ad9ab9a4eaf78b6199262f938cc845dc2b692c4a0610af5d3ee1771451e9ba118 SHA512 d7d8d14d25e4864fe3707d4d2ba7895556b92e2f375b237c73aa011afd952d3163e8492db8ec150337bdcb440c935917b3586240b44c9a5beeecbde545ec2821
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
 DIST firefox-bin_x86_64-60.4.0.tar.bz2 53244850 BLAKE2B 73e576e7bf40fb2a08781a6060315220be2219f01cd89f6a15bc07749cdd7e62c7a908dd05487751f023c34ac9743a545ebd171679007bff32df4f60bc7d4663 SHA512 a68277c61c6452f95b8a2c470e8204874df8238cae6035c31c79a0ceb18835b5d7960b93ad1316fb0a963525b0297909252e4376c4f6a42c80dbc1e5beb24c17
+DIST firefox-bin_x86_64-60.5.0.tar.bz2 53371698 BLAKE2B e7dd2f7270d99f777cee3907dbb3bdc3ecc252770f35d1201f56eafc5b87c78a5eff95e92101f582344f45a9baac5927c75ae116c543951c43c50ac44707e5b5 SHA512 c6410a1382025b0304b20d94ed050266b52681f9a960f84d9229c33459d13e8f4d5cf613b71cd2847d425abe0545bb12ece2e28a68dc81426766dec4ae8212c0
 DIST firefox-bin_x86_64-64.0.2.tar.bz2 59315788 BLAKE2B b5a7aa38f47aba3cf2361c635605f2486fb594c8f4222aa104785ad3ba43297e60a29fb8b4ec53406c9ce3f2ec01d65cbfc26e4aa04e1103210e0880f81faf1f SHA512 d6fce66e5f58fddb695c6acad01963d71bd19ac543daefc35cef499abc49ee690d2e5067c3dcdb43e0cec62676d4df9f8ef8e683fc9953325e2bf52a2c27e92c
+DIST firefox-bin_x86_64-65.0.tar.bz2 61528691 BLAKE2B 11fa9c91c3c2575225df3073e8aafe4b2e887b608a6f6f1c2be40e2f35bf04d745a876197417622ead15ac3da8259e85de6b821c5d2f0098e9f96390d4d9b4af SHA512 482bc1726399663532000749e600ea5c9c490022696b40d869e851951a9983745b26a7c4ec7f306bf174479e4213103996d075c11e2e1f9a721d392c7c615933
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
 EBUILD firefox-bin-60.4.0-r1.ebuild 5381 BLAKE2B a83d9422f9edf5d18401746e24ca114025024721a87b7ee7b62605593189ec5104f7e938ecd6dc1529b285705278d481b9f43f08b31539db4b1308531c14090e SHA512 5d6851b82b4272afbaae0d16e2d76d405178988d6f0af55c30b68a88829274459133be8c6af71fff92d48516ddc4d37ffb4d2593b0172d88b52e164f842de5ac
+EBUILD firefox-bin-60.5.0.ebuild 5381 BLAKE2B a83d9422f9edf5d18401746e24ca114025024721a87b7ee7b62605593189ec5104f7e938ecd6dc1529b285705278d481b9f43f08b31539db4b1308531c14090e SHA512 5d6851b82b4272afbaae0d16e2d76d405178988d6f0af55c30b68a88829274459133be8c6af71fff92d48516ddc4d37ffb4d2593b0172d88b52e164f842de5ac
 EBUILD firefox-bin-64.0.2-r1.ebuild 5381 BLAKE2B 64c73a62f6470a8be7e278a99eaecb086897e98932e90f660c69cc96d9d9178cf6981e1e3016fe5a44c9bfef4fd8a5e00a05e0218230fb6bee0ff85c0646b372 SHA512 2d9f7a895aa2753b3abf023cedbfab4556cc2ecff7d4e43a8c5e2a952f15288f731e17389227755289301fdfc555f4be50880dd969e99b5c56e5d97a6cb8ad91
+EBUILD firefox-bin-65.0.ebuild 5381 BLAKE2B 64c73a62f6470a8be7e278a99eaecb086897e98932e90f660c69cc96d9d9178cf6981e1e3016fe5a44c9bfef4fd8a5e00a05e0218230fb6bee0ff85c0646b372 SHA512 2d9f7a895aa2753b3abf023cedbfab4556cc2ecff7d4e43a8c5e2a952f15288f731e17389227755289301fdfc555f4be50880dd969e99b5c56e5d97a6cb8ad91
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/firefox-bin-60.5.0.ebuild b/www-client/firefox-bin/firefox-bin-60.5.0.ebuild
new file mode 100644
index 000000000000..ebbc9c131293
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-60.5.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=1
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-65.0.ebuild b/www-client/firefox-bin/firefox-bin-65.0.ebuild
new file mode 100644
index 000000000000..0567f8c5f39f
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-65.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=0
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-2.js all-gentoo.js
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		MOZ_INSTALL_L10N_XPIFILE="1" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index b9d96300fbdd..8e5807716ed2 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -190,6 +190,99 @@ DIST firefox-60.4.0esr-xh.xpi 511859 BLAKE2B 20505fb9ed4b87e358556b1f4063dd1aed5
 DIST firefox-60.4.0esr-zh-CN.xpi 543585 BLAKE2B 787679f3a78a9556183d2e57ab1a744150a0d1a02caa629fdab46dfa3838cade0a1105ceebc7965810a1becc88956e9683db99bc25fd1d09fac38cb113b33aab SHA512 e2c9662dfac8e2cff3a719149626be02fdb3cf4a713c3d32cdba7df37df4a98fd90eb88a8d16d3a61ca4870c0f049d5343cb6b41470464e9399c6b1153d059e7
 DIST firefox-60.4.0esr-zh-TW.xpi 541910 BLAKE2B 5ec6659b0bb94fa7d52488a0e043b6bf6372100a3652bd509e46f1972fef3680224017fef32f3faefdab7f2c683576eb3aa4c3e7435fc5ec42ad6ce3cc54e461 SHA512 229f070f9eeba9e88b44f1e27bd47cb79fa39f4b9d6a8d50edc8afe9e4dcb8ebfc03acbcceefa9106d5dd726146b680d83578271bbabf19c19800be2800591c5
 DIST firefox-60.4.0esr.source.tar.xz 268425148 BLAKE2B a72b8c49d9be601863e2c9680603979b2a453b69aec7574e91b045971a9b32d2e746c93afdef6f2f99bd1cfdac1ea6f7b5636284b14bec63031efdf9ed5992b2 SHA512 8119f52b2fc06f76868bf0781fec9d46c8551f0a3ca832ac9bdef6aa6d77c1d785e50d35059f0df5e3586f3396b912af06e448d65e7f5d1f468338eebe8b2cd4
+DIST firefox-60.5-patches-01.tar.xz 13332 BLAKE2B 53308d415369c6814504697ed9692023e636c42b58053867fd14e8edd94baa2777ed9f33e147f796d6fcd5f30c1d2258f9fd3247392e37a921a53f41a6903e92 SHA512 de24544c5aa8ade35e4e3e0fac10399f8eb44ea4bb9063b85bbcf2db12280d23ccc5fd29032f33f3723c0a0c3c2381429e2c19bd631e90615908b4f68f745a21
+DIST firefox-60.5.0esr-ach.xpi 496841 BLAKE2B 774ba2e7e020f484c44e3bab5d98eba69ca9ddc680e04bceb5fbf2ecee385afaf16d5cbec74da33f3de897d7faa76b155ab640654522b3d22862f69b904c2b09 SHA512 3ba5cf4f35d1d3f80ccfaa45bd9e6ba91459ffcda14df89deb39e648c00ebcf8ec05700c5410f4d50d9b33017304c35d79e2980683a27137c34b39d08e7da488
+DIST firefox-60.5.0esr-af.xpi 487319 BLAKE2B 52c28405aa3430e0fedfb2ffe0b83726af7bfb060de7d04425eb2a83705e6d748e08f6f400397fc5ff843c746b1adf853d6b08d66daf10b0e86251394a063f30 SHA512 e867f1b2d1da76344d984eee6177638e519f1877b15e840abd6fe7f9072e2d2a6e825f9d8292f09b5086dad8a6deca2f5041ba9197cbcb43138587958fdb8346
+DIST firefox-60.5.0esr-an.xpi 520504 BLAKE2B 1a1e0f36537608be2c422b46e6276061bc8d3559808b0b62ddbd14e6dc7942f6e19d819ba0a3f5daa08d1d86d7c666b76e3af7602e23d3cf72d8bb0d95b2cb6a SHA512 9b5ea81ba0999de854c3d58326e1feb41f9f8c4c30c0e1a2287aa95efc88c4c4a3363344b1b4171fe48285d6f6587fe2199e2b74329ecb93baa522501dbac5c0
+DIST firefox-60.5.0esr-ar.xpi 547823 BLAKE2B 148a05b0c22023c355fbe223d2f3a6d43757f4858f05f61822b66f3d9e230a6bb6695d0922104c3b9a4e3e1a07588052c26d78c88e2932abb4fa9749bbe09b48 SHA512 b9c254b57f10a0dcadfb01cca561c908cf20c0f83b0e61be6732d90e7906703a88d46ca410fd1ad39b8f1105339332fb38f7f407b3308d7b809d5cff4eb735e6
+DIST firefox-60.5.0esr-as.xpi 530728 BLAKE2B fe83412a85c7a6859082d1c4f4a329f5e3d54e12a3c7c9e9a9ba8d0432de566d73a7d618342adb5ede1bcf9f5c2d8316f8d46c84d27ad16fb046b84e8f5acbbc SHA512 9fe7d2a314f1e03b97e124aca66d721be6ba7f641aa724424abde7b579d53dc722ed87c54a87dce16d0875bd8f84fb09eab771f4a87d5c812e5fa76dfacf57d8
+DIST firefox-60.5.0esr-ast.xpi 508655 BLAKE2B 04ce0c6a86a412b901802d44a368ca4cd1ed0fd812f49a95100301b198291d00c7dcf3fa345a68c5ef1a419dfc1d33cfcc5d9fdf2188d21ce48f660aedd9fcd9 SHA512 1a84f52a5d61c59cb9b9aaf35603ccf22f04909eb836a9ca87776409bcdce09fbe47cf4dd4109c4c59b468457d4c62603680d1d206b0292e483d9041f94e43a3
+DIST firefox-60.5.0esr-az.xpi 524747 BLAKE2B 9759a2dfb2df84d52a317f8f1205437ff56718ce6ae5742fedf392bb56c532bff87e1b7752a43658406d1c3d1ad93e2144c94df2f4a98bf903f08f47587651bc SHA512 6b2c03f7139d2fa45c2607778b4677706f26448c4d8e972254063f1622b40345ff185a64213d031c4a930d29b8fea1e8a84633236cc4f9c7042d969f54bba8ab
+DIST firefox-60.5.0esr-bg.xpi 573852 BLAKE2B 3a65e1cac8545b3008f415e8fe1897175567b99df1807b486e89ce1ebebd201c9d4980d680388b8193579d8f1eb3ee651b7ab27eefde6dcc17ece10cf18491cc SHA512 5b30d87ebb6fa20ae2b7d7831a14e0240609c44eb355ae9a1cf5184f174fc1f4d9dd22303ea6969917ec5d81fdb66610d4161c93e08c8c6ef124ded2acf969fc
+DIST firefox-60.5.0esr-bn-BD.xpi 590423 BLAKE2B 0923bb2a9abc123494f7195483a8d3ab49fe11209e9111071bd100b925aa2fa7de751e7630cc5f127fecbcc3d1c66f7c07d32d9f752999d34c8b8da80d15596d SHA512 5a502fcd383af87225b647bda7a6bf54b7667d1b029c7592e418484ed6957c682276ad40fcda7ac3a1787e6ec4fe36d01398cb8006de74e552034511e4209c31
+DIST firefox-60.5.0esr-bn-IN.xpi 570870 BLAKE2B 104af3b210d8d5168a00ecff1a4034c2f465c1223557559e5dbfec67767a88b7975ce3f53d8c56a00248fa7d621883292c04f633178054db5ebf79352ee27d68 SHA512 08e56df55943a482fcc7b5ceae26376ce62e86b7986d4131f88f07d894db86dd454b272a54b03ae4dabc8f77e2009f78b86468939d0a98509e83cd9f4d94b89b
+DIST firefox-60.5.0esr-br.xpi 512031 BLAKE2B cd0cf6319f0719e54bedeb138b48def554cd2059972fc89f47c4424627c74268890fd81680014dd7c851439244c94745c58180104b1037dc4b57f57465f04603 SHA512 af07f94b1160000c706c1fa30c228bd4d6f9199e7187f65abeae235f1a83a57771c32f7aee45212dc93c7f13880d519b60f0c1b072a7c9fb3ca8279a633a51a6
+DIST firefox-60.5.0esr-bs.xpi 514714 BLAKE2B 556b5f90a73ffe185f1aa65b77024b913b3936cedbbdb09296d248af79d4533b85cc0a85d17882de8553c9e270350a85be0995ee2845ee0da3b5ca1880ed5c22 SHA512 1f6fdfff56f359e5006b5e7d5a989ff59e1e7961552c1d1c68c17f1bb27de2f47fe144749477e89a1dd9d87ecafaa58427f24333f87541064497d67d07ca92b8
+DIST firefox-60.5.0esr-ca.xpi 525262 BLAKE2B 3ace9d56fc458d8a77de83b43e522b2fce34cc39fc6957f056ff50994d692761197bb122e6b1e886df14bc51e39434a07b34384538547357170736e927f4b796 SHA512 bacd1e1c5e6c258fec86a098d26aa7e2ec9a55844f3aaf1fa13cf6604983df32f09ab9c353a7b15b405347d8994b9ce1280d0fc9321014f52a48f78ff967c738
+DIST firefox-60.5.0esr-cak.xpi 536296 BLAKE2B dc309ab2fa37c0f0b570021d1dbf3f11e056de9dbafab9bb5624651814674d5d72afb4dcb7d4322f37b9d6cf9aa128c57e4efd31512afd6affc2e1a66300a8e1 SHA512 fe01f42cd727a42f633e951838021c8d9912b87d38dcc9458e7ac6b4fbb839ea06c921e7d75fcc42a1d0bbeddcded58799e95cc65a02f2d820c3ab19df11e785
+DIST firefox-60.5.0esr-cs.xpi 531796 BLAKE2B 0f8e891cd50f0e344ef01bc4c5117db698355fc576f3f6629c2d844e525e0ed6a83d89c7f17c4bb3632d6ea03e18c0d1ae920cc52788f5f36f8423a12e4c8833 SHA512 0d568015ed0e176bcf207f79187ff98f5c84027bf0f8766ac73dfb9a1d4f19e08e94e2a2c6dcff15b0297090d27e9e0be56f83c126e4a3a3ec6a154a74105270
+DIST firefox-60.5.0esr-cy.xpi 516642 BLAKE2B 5eb115740e6bbaadb719bc3f906626d62d802f6f6d68eec0b59e41620ef688972748b86e5e61925269fbe2f9fa9f79870b11021d0fd9483d267b401adfc999b9 SHA512 72d5af5770a88670ff95be3ad24ccbced5217b6ec667362cf7a501cc61430a5a2b626b360c87a88b95ca178421e63ea1a9088e1884078ff123c5dadfc85a7877
+DIST firefox-60.5.0esr-da.xpi 510754 BLAKE2B e7d8481e6fc821b5d6669e79a82bcb752878f741b054372827e2f49a30e9b29ce014807d7383cd2a5d0967bf8780aa1ccb11f405b97c62762107859d9d7f436f SHA512 0dd50f3cf6275e2bcd0f06ca7623e5462c791d0c55208f58ee719a9544e9482e5a417dbdecb69173fee5af9db8445b3b32b2c3aa812bb0af06f757e19ad36b22
+DIST firefox-60.5.0esr-de.xpi 526524 BLAKE2B 0c8285408e3c0ff88ccc4ac228e72d8ccce4fe74e47b58c180ec30f3805909278a637b27d4b8a7c6d3fa116910a9230cd28eb1170117d077494a62f10b73f4a5 SHA512 76568d485db7a47cb70867853957a4f495452cee5f5ef0f0ec4fb4adae894d44af1b28dba8ee20f9eb2c6206ae7bfed8d8fbd4afd478487de296f10af922ae6c
+DIST firefox-60.5.0esr-dsb.xpi 539525 BLAKE2B 0dc33b391f9eaad83acf60c93ee33b63beffae6322e15eeebdf8f00858b0034b980b39e537100626fecd2dff777bf1868265c197f625025295bacb1e9350f63f SHA512 3bf7eeb7ffb6611465dd8aa9f5fadd6506214218eda6992b1d867ba01d38554d1f3f9e841126c14938fba8f47e4547a4463c447cd4422e3160021a2ba9db7bd0
+DIST firefox-60.5.0esr-el.xpi 593699 BLAKE2B ccb653025f97939da5c62700b747e250e3fa71e5bbcbcad039ed17086e7f410bfc92f73a489d9dc5a1fdc64565725a7dd31fbd46f52010dc2de4b6a880876c0c SHA512 228286536367cd085c50cfdbd370402a8b5777bde2b2f6ae1412da199527a1c3fcd18c6b2144f0970befc27326abaaf38a0f83e8f34a354be2844de1106c99c1
+DIST firefox-60.5.0esr-en-GB.xpi 491694 BLAKE2B f50ce7d35872c4beb6075cfde5feb2517e5ac919318c4f71d61859486a5215d2bc10fe5d77dd1f57147b71c686dbcd8a9abfb4657edb78dfc230bb4e5939f01b SHA512 96d273d530673180d20b247455f7c7f0df9320c7b65684c1df15f59d7d45c92ca5e740e2b592fdb3b216a0c59633f9fbb78d6c251c987dbef2f7dca46dbc15c8
+DIST firefox-60.5.0esr-en-ZA.xpi 474686 BLAKE2B 5e138225720db70841ce70d22dd61f2043aff12f276ddd8c8dab1f372755dfb0b83e18a01cb97d925d10467b8a09910b059cae92181b6aaadd91147dd01dd797 SHA512 caa2547abe69f8f6454fe7131101716bab945a0a1b6adddb0dab5f99d499e4978808b9f279f556e3168195f7e85b96ecba674b04900ef05fbe5570fb0483d9ae
+DIST firefox-60.5.0esr-eo.xpi 511271 BLAKE2B 86a080d19d19b82ee1ab7e8b8c7fd583b8d236986713eae394831104e4d9a38f221b72e5775f47604f2c75f8545e9daa28a19949a98b3b0c2adeb1b74ac9a571 SHA512 412a3c9f0bcf94ef145d1ed6157f47cca731afde82a16f9b343e2aa2a81cb3af6547ed48c5b669c693a112b2cef4a54da1ecc6fbb4a902fd2b6d8d4b47342812
+DIST firefox-60.5.0esr-es-AR.xpi 524654 BLAKE2B ecc40e0ad56948c1113668cf312535b1b22416c022d00d2a18e88e0872037aa14209e98fc35d71c9291b07709431d1f5b10d707f5fd59ae677f8f7e1d8012828 SHA512 4fa200b3ef03e42dedb9d91eaf5f30e6f2ede58df198f1c820b886e49a2922dbf2bc6e3e2b9bc46a9ea8de352e5877d241610cc49f6411d396bdadd793aa9792
+DIST firefox-60.5.0esr-es-CL.xpi 527329 BLAKE2B 7747182ca28604ea1547794680157b6573bd7c5cc29833071015889053a240b69269445fe72255b376b2ac90aa001c2b70b6769bffb7b816d5aa1a6d083f4dd1 SHA512 a31ef998de1d4779358674aa5fa9427ffe5a32cedbf09d33e4469ce22246f3335413bd7b6aa372ee9f48758847049f36d73a880a3871d3b596f494a7cee5045f
+DIST firefox-60.5.0esr-es-ES.xpi 459968 BLAKE2B ee24d3e021882c04960bdf1aec199de1397790c2c519d23e1473e1355fcbf5f5efa165c1e2f2c4d863ea92031736084e4150ea60706f140cfa0e9a904c2ce4a2 SHA512 6b2810802c9f5c177f6c17fd53de6b6e9effbcc0f2b8de1fbceeb290cda3a1c435f5fa39b00e958820e1cb0de04d84d8d046fc631afd414a50d980e137c238e0
+DIST firefox-60.5.0esr-es-MX.xpi 528670 BLAKE2B dbaac11c69f2e0a8a156b0951ec1ab5f6f18a0f339fa9687d13f241b717b5e4021133716f7ecfcdd8afb321aa738bfc506323d94e642907ce6e1ce6e2713acdd SHA512 ceb1bdab4b87e7ccd22ed793a537daeb0d5b214d164945d6955cf9d7a60a88c4c6ff31087a159d081db36bf641e16e258ec01e583d5b6ae379a497e1cede45a7
+DIST firefox-60.5.0esr-et.xpi 504972 BLAKE2B c4b1f86f2e72f68bee84ef4a09ec44d3cee5e6da3d17695afee0f2596e8406ebe41bddee60458ecf987c8e042e04323a26ea1b629a93b4bf40ab12799e674dd4 SHA512 f8567b08e1afecbc0cf9fe61ca4a308a6121e77f75bb4678b593a70d088617ae26ba22a731da57fea9b5cfe76edc8f39ad19f87867e1a909728b1159e8afbf4a
+DIST firefox-60.5.0esr-eu.xpi 511713 BLAKE2B 9185742ff1ab86c71a516345ce6746db05f7602e1d7d76dfa30037cff5b75b1056ee17095434e7ad5e781c87df3a98f30e730a836df895ed233a05b6cec143dc SHA512 1085721f8fa5e03efcd3042f0b6dc0fd1b588ba1cdca2e9586114f90aa2337130a6f96d4b9e42993cbfd4f1f6d25c92c5f6e931eddc27b79d4897e543272cf6e
+DIST firefox-60.5.0esr-fa.xpi 566263 BLAKE2B bf0a034fcba2ed61972e7660e93ffbb64fdaa7ee2e832bf8875b4719a1b957581d86fd129fa441e3f8b305085bf25adef215fe277984bd570543aa49e8528785 SHA512 31be8633a948459d979490bf1d6e635da3c1b9fa513d4a69a9f345c72a67ea56ace8d7b487ac257de5ce47b8deda589c90fb80c2fc95a2e0e30e3ca11a697f45
+DIST firefox-60.5.0esr-ff.xpi 512210 BLAKE2B bd4dccb2c5b6e4fd763a1d6fca07fd8dab6a981473cb3919b649e9b564c822edef1a398d1c8a6278ea1c5339f38ce6bf94d75691bed7f7cd3df12b850bedc14a SHA512 8df4df0fdd8e39bb88dc6e066682045f1c9094ab3d1c46d11ed88fc42a209f4b01f2b69e5907b15902ad56b8847548f580bd661208b6374deb7ea5ba80739761
+DIST firefox-60.5.0esr-fi.xpi 506177 BLAKE2B 05d198fb3e559b908321b78cd27779f016f54e0721e46937c7feceffbd9852b3703048a5166d450d559edf94acd167acdbc3a3ac5b21fb8c02cb5da9954c139e SHA512 d994dc5a849965f5c1c635eec5daf8a6e3b15eb8ffcd45e786d7cb292efd2bdcd8de93e8909b5ba1c027b3f763d0419b39f89762842ba3a95c10b26bcede43de
+DIST firefox-60.5.0esr-fr.xpi 536081 BLAKE2B 581dfeb4da50334e369c072a4869b48cdfa1ad1c55e4ec9d7b08d37715912bc42e7e985ba907685b43331fab9b15f50515d2467f790edb2746a77cd155231a48 SHA512 355765d3d1e894d9ff5234aa69502f9944e83f42183546bd46d900535e3170a946063491dc86626dd400d908ee90ad639cf567ce506bc7c6a560c64c3b2784c0
+DIST firefox-60.5.0esr-fy-NL.xpi 524529 BLAKE2B e24cea5384766696a074502c97b33658356f8d9f04764058384fcc471ead8cb32789c4785f8ade5473ede1f0ac37d487a05d654658cac4129a8de1da9b316faa SHA512 6c0414efd961628eef8d1618a5019f363101abc7f63e3e30c1eed04797f0d5a69f4f07a7d536abe70144c20c4d11ba996b880a77bbc7bfd3a5c837e17630dd6f
+DIST firefox-60.5.0esr-ga-IE.xpi 526991 BLAKE2B 05a4732fb01d9ed05b1529afb39e8e38d7b2a11b1dfca235a5cdc14a983e518d0324e934cf4301ecfddac90346e5dfe7fc4c77f87ebef88950e6a337324ecedd SHA512 0bc13fefdfc9954efed99783d59ea6bc1188fa6d0ab306653c27f466d049286084ec2b846355aa324b10be73165cb247e829a0d7523a6049fcd5817bcbddbda1
+DIST firefox-60.5.0esr-gd.xpi 520877 BLAKE2B 40c5024ac43767be5bba83b1f0c50198e15662c0fd942e1b5894d41f09c5655a61ea22244b667f8eeb6a9b6657d7579becb1eefde91be8ed550a853d20a9dc3a SHA512 19463941181ed6b11f72a34d4069592c8d4df338ad31fef06f8e3c1c8efc7aff2d219877fb3f0fbe9259aedf3d805ed16c18929f6f31964966b859cf2d810290
+DIST firefox-60.5.0esr-gl.xpi 497371 BLAKE2B a77cee6dbaef4371ae5addf2b26b01bfd01b7fd533a23baf8a06cf8bc71f5d95999d60d039e49751b98193697a79458361f6d57567f827a10ac4d458a53f1595 SHA512 2918ba2d810b8980f719fd3b607750feaf0832eff53c9a40ef97ec0d4b4e11e467b4890f2283439d4a5aef4c2496b74ee107532042059591705f9dc940a430a7
+DIST firefox-60.5.0esr-gn.xpi 533215 BLAKE2B 954ac89cd343f424948b6a47294d04de6412469abd2b9b4748ce9c25e93d7bb8ec570c798bdb8608b47339454a65ec7752378d219cc00b92d6f77292ac9c5624 SHA512 88257533b6717efa0fc3d5c3ff7e53952cf472299cefdbe207ee682ef355cf3dd02ee950732e6f0a98fb1a27c734b3da43485d9fcabec4451f4000ce5bffc98a
+DIST firefox-60.5.0esr-gu-IN.xpi 590271 BLAKE2B 9fc174729d31b5835fd2deb81030680f0d73e1fb3725d9ec863031f4d9d517bf340f3bf4bc9bf9893c65a75d2035da533c8b86205d74b524f2d41933daedea00 SHA512 75c488dfe3e2354ebe3b0de2a5581dc3d4066b2edca701a66fdafa65df1cae667605d2c4eb1ca6f0c7fdfc8f1f4f7c2dd49e27f63a636f2f33cf4e8c3fce6269
+DIST firefox-60.5.0esr-he.xpi 535983 BLAKE2B 320fa43a23a006142ed9403444352ecafec3fe7b46edbded92f1293d6c443178da5ef23b560d833f1aa794cd6c52d9f0845656264a5d75baa52175db977fc0b5 SHA512 02de7cacdb5ce1b3da822dbf0cb40a79c730f2c04f88cbd95e680906755dd41d6b00957d292dbe6a833360d5a5931c3fccc9916fb8f4c4afad1b24ebbedccd6f
+DIST firefox-60.5.0esr-hi-IN.xpi 590858 BLAKE2B 3b71cd9975bad76fcb7dc197c301944ed2bbf28a8f6d85a95659a4740589865660ca80c243b1f0b4b990c70718400d6876294b09028a2e16bbf0f4c221a4e1b5 SHA512 6905a7c26ef59a752faf533f265d3ab4f6a3810a76a9cf550f8af58a08fe16208a1de40daa67a1d7fb23c6380550f68d754aff72701d77d5c570a8e5f9f3a1f4
+DIST firefox-60.5.0esr-hr.xpi 515957 BLAKE2B eb4da9ff9b1506435969b479bfceb1c86fb9d70228b234ad5b51af29ff1e2aab8a949b3e69544990e13b67798d6076c45de72a98ea2ace0efe1ea61e38ec1265 SHA512 9995864725c1c5260308e95019be426a68cfcab3d44ee12e31347ed2328be99b440ee74a3bc069a1589cd0b047f2da9e7dd94d22d0def8d4d65246c912d4786d
+DIST firefox-60.5.0esr-hsb.xpi 537071 BLAKE2B 24e59e30017ee4b250bc9151e7a6352f21f290fc99be1df451d440d0c8f797b1fceae10773f653a777ef325f061b8314b40be1f6d8167104e3fd86351c3b5cca SHA512 b3ad40a83160a963a657dad147eda2bec73a6d1aaabdf683dd9bdc0a38c01e0ccadf3dadaebcf71b8c4dde2cdf2515ea8e20ab35582892857150269f09e141ea
+DIST firefox-60.5.0esr-hu.xpi 538420 BLAKE2B 0dd001d6244f2fc393c30c0fe927b9e90049f27d46e02f2c6e0685329b3b08d7803e9f52d73e0c9301d731320e270748cacd99d205f3511a3dbd74e14f20b8dd SHA512 748daeb39376a6179a13f986f90013ab71198a1ef4f3a909b9849c86722aa3a3773aa32ed5961b8026d0572140eab9ca67ee3f5c084a282943d147314c8128b2
+DIST firefox-60.5.0esr-hy-AM.xpi 569422 BLAKE2B 812634001a431ae9c2649962ba88ca5527a20c41d9b5f677d5c31142cc470541dae829f4bd40b11d70b4ced18e322a4388cc7f4057b023bfbc4612333e1bb9fd SHA512 7948232d14dbdf38de3210f2d928a4461d08fefb93e63de8b4017460ec2b85d3d431795c96a80a36504a0806b4f52101091d5c0df857345ba5581ba126a9b507
+DIST firefox-60.5.0esr-id.xpi 502224 BLAKE2B c6344627f4e796fb1c109c79163952eefe407c0d3f1930b1683c3bb13b8d07ae40108380ba136a950c198c5c9ba0e1bd0eaefef5802344e1c3bb479c6e13090e SHA512 a26763f288fe66b67bed6275dc236533700fc4420ccf07d6c1d08dbf82d9f7327db0df8e634d294bef3606a66724a30c7b1388412677dfb524d2b353e4947c4c
+DIST firefox-60.5.0esr-is.xpi 513272 BLAKE2B 8e78c7c70719da1b9f61488979e6233ff1ae13f193fa077e332e7866a83656f2a22403ed77c48f06db7a9f25a592dc91dbadd21ca808925967605c2140121776 SHA512 cce0bdc22d13f929b4aa59c0ebedd2ae499feebd765f877cf06972507fd6373a39e6309172237e96d415d3d5f436b47cb740b9c6412c078f563cabe457484a23
+DIST firefox-60.5.0esr-it.xpi 399110 BLAKE2B 288bcf4e3de5b9100cce0abdc00b0ea4386ca2777126ff70fbcf0e95ddf71e3eb4ef341bde41b8a4bfbfbae922b54d9052c26af2eb6331380436023b63426932 SHA512 fa6a3c4218ca6b7a9feede5ee01f1be5398b20f6a0e7d1b1eb60876d29ced6d0dd2047ffba90d399e92f523d522cc8e8f681e228c176c029b5eedfd14dd9a4c3
+DIST firefox-60.5.0esr-ja.xpi 572017 BLAKE2B 8ab9aa9e5cb128b634ab9b768da8d235d4869834ec83d0c826ec1ca919afd14bac5c686277189adbcccbb085f663d2c02c969c1770d48c42a0f33f9f1ad4c48c SHA512 4b3ce9c846ba3f2d9439a792310bdb77950252723f218c33431963fb3d43588be8a5c45d2508eb1caa3e3994d823fb012fb8b97d55dd0223e1c51c68573bcbc3
+DIST firefox-60.5.0esr-ka.xpi 556850 BLAKE2B 36d16de02413c063336c5e51060823927af722c226965952097de8d61b20fb783c29cadd6adae98bebc88a927a59187806176d753c26972ab3e7055f06970f2a SHA512 ab7e24909d25acf0ffa0c7d3695ce3767a5a8523c7bfd7bcc33eb1ff65fe91a53b7163b746d6bd25cf4a766a0706e975fa70e826bca47162ecae4526efd19751
+DIST firefox-60.5.0esr-kab.xpi 520403 BLAKE2B a488a827a312127fc394c59a4cd59113e88d35cb1d3fdc8f40c09d926d52be4de77970de0a3dc915ee55baab41384556161076e7d0e32c061094ce1bdc2132e5 SHA512 6deb224d8c1f100918e5ef83db53205895818c0aa4d97df2b5cdff8c53ce5c42724a648dfec086bb6c3ab0dcac2a6d897aaa4e4ef75f2cd38144d50aacaca6a0
+DIST firefox-60.5.0esr-kk.xpi 582984 BLAKE2B b70bec7686582ddc882e0d4eb0e5d7f09eaade456c2e280a1b2ce6464c5ee77513f1f83362c9e41c54df2487718350e884aa880f87b53d93ed69afb9a7dfcd0e SHA512 9b6fc275fd17a729d93285a5b417de39675b4bc25d0e8a250e6102d045fa84bb7fd117647b0d0bc4c0d94112a150c5bd0e6b1f8fc0ffe9a68b878ab88ca1b1d0
+DIST firefox-60.5.0esr-km.xpi 583120 BLAKE2B 7629198d467486f35c00814678a7232ba0b53860063ede4275379c174a4838539245c5252254bae11398e1981669b6a6bc48a562e7599abacfe996fef5fdd4ad SHA512 aefb5b057d48850e9d301f3bee528a7fe7a52778f78135725950b4f1ec7867bf88e462859595770d126383c015089952d09cede95e4b87f8abcd44df9269e0c8
+DIST firefox-60.5.0esr-kn.xpi 585876 BLAKE2B 05af689e47c3eba7e43bb801e30372578f06b06a4a97e3febe6d8e921ace31540145c1f6ad98ff682ecaee76f9ca32114a355d859666c00e8085eb3165a74c60 SHA512 18aede1fbcf4a7ee0d919e02b096561380c019e239b7e2fbc731652bfe2210f0439172b17fae73fa1b4cbfbf02c018bfaae5a1baccb7a4a11b2aa0a20c03dfef
+DIST firefox-60.5.0esr-ko.xpi 547827 BLAKE2B 9a3144452fab14908a8451277aeb8ef18baab8d7de35fc53b33a031a790619fc03051a07f442c1c550d21816dbbd4c0a00f4bd1301529b6f0d04ce24d29b41cf SHA512 0ff78733e07b9969c69252b1526fcfe9184bbffa2b10551badc9306d83e9d7d6911a1cfe3c252d61751a2e84a1a8126cb672fc510930aa795bf171ee115cc825
+DIST firefox-60.5.0esr-lij.xpi 513183 BLAKE2B feeed787ec8e98790c7062cfa95971627cc7a73b784d7ef0ef0ae8b7d0dc91521620d543751e113c42273e38c75fcec764aca37d1b70cea67750c96f2f9e631d SHA512 52a69b6de81d36cc0af05eba299afffdb311d904222b241efa4adc881da96a3adf8614efff184049a1f63dff15c8481ce25bcd142c0ecc75481daa8aa8b8dbfe
+DIST firefox-60.5.0esr-lt.xpi 536465 BLAKE2B 544d9a043c1ac30c84032d82a4b8570d7798c9643a8b881c06a6a800e737dabda236d72da3ca2cbe3667692eb25e5cb01503527daab079c7b3b4cc0d5c0e3a90 SHA512 00302167197da51612eaf7cf0f90d188d99878ae0b15cac0fd6a8e643920b6dcdd0a1d473d8a3a892d0ab7d88cd9f60c897451b843624dc86273e1ca798cd5f8
+DIST firefox-60.5.0esr-lv.xpi 526420 BLAKE2B 6e6f95a160412c95d7c6d124e4998b5432f4659e4ff450dd30a46344b7e2a1ff65f3b2547bdc2d6d51497682e069e0d9de5d892c4c84344d96e1e60543a3079b SHA512 1e18b7baa51af95029a8a24e25966012832f56334871920b35de3b331192cc553d627e1d2bb56a4cbadef3153be261a5aa9d3f6fecce64497eb5c4f781a4c942
+DIST firefox-60.5.0esr-mai.xpi 549255 BLAKE2B 8a1853b9711f5ae0f6881e2fc3321dfa0e65ad2db94774e2fcffd3ab505ea12f39ef3dcebf6cd27133dabd3b7477125e691ddf1b1dd27539ab62379d9ee49c82 SHA512 338e51d214b0a9a51a9c77e5c427e18c09483ec13e2888ca87ce02e648dd4b91637355e9df732a60ce728e88eb3459543c58e8798dbd303c33cdba15f753a8f6
+DIST firefox-60.5.0esr-mk.xpi 513806 BLAKE2B c29f6afecbd43f9a984cef2e1ef16e075b3578fff0629325482a2541f55948eeb27dc16e4a694ee7f22dd9f4a5f6a2bb551dcd5e4fccf029366fc7b7ac33fc18 SHA512 cc603f32476aba3acfcccb40310de8e3725a44a2a6b765c6fd5cb0a082d42e3cb68824a95e751e118313f31ff9bc4c75c731e5d863f42a0958cee11524ceaae8
+DIST firefox-60.5.0esr-ml.xpi 598978 BLAKE2B f48fd73ca93ddbec089c0f7d1c09195dd9c700d3e336010dd865799b96a9727442b486e55d350733f25c682026c205d9f608556f311a987616fdefdcfe157cc5 SHA512 fe66e609f857a758286103547d5dfb3335d5308248b176436308058498fd1332fa881832f19d50531fbcf7a0ff18554e616caea0a0146743bd0b77bd05a33545
+DIST firefox-60.5.0esr-mr.xpi 579120 BLAKE2B f91e6d9ccf85fbf9e50d37de16d6547a648c998c370c6b6b79f722251eadc08a24593be9fe49d4869ed02712ffd956c61bc6f9f82e11e16751d857d62deee092 SHA512 1f80defc914d14b83d4563e264035d488db6da891edf9165e0420568153aa1cbe6f5c3776d221e0d8c6472524edb16ccbdde816bb1ebf2718bb95d9cf348f07c
+DIST firefox-60.5.0esr-ms.xpi 509554 BLAKE2B 6338409b0679ffceee839fdaaf9a5f9b72fabd76ecb8a9c77b1283c0165ebae2b664ba2b0d15858add1e44b5bddeb2b9bafb54665f16af6a4cc248e3af1b67ac SHA512 90a17679b0be08ab92753948bbfc1f5473ec4e7886ffedc20df7dbf3464eb95c4c329591b55ca2dd16e677d3bbf1207aeac4c3bedb4426fa0296146bc10adab8
+DIST firefox-60.5.0esr-nb-NO.xpi 509891 BLAKE2B 5a230fe839e714e84bbf44585c4652dbbf3199f279bfaec83996c0f510204f290f7308e14e3619f58d96e10802697c0a453e817549f15fd66d40cd653b69399d SHA512 7ab61067a0818400fea55e67fd1aa2cb4fb55e023222e609ab57366ffe7dfb9473e29562d2368f26d65a5f2d3ce6f23ca8ad2865954199234fc6eed8ef56edaa
+DIST firefox-60.5.0esr-nl.xpi 517455 BLAKE2B 6571534eb7baeb1f757e588af054ce5c129559048c2df9242f918f247d95fa391c706911c77abf670213a8763e95c72dbd1ff44de8ba0b618681ca85f0068e51 SHA512 f34119cbd9becd4a88af8ca3922145de523ec7896181134b779c9f99c1840272cdc1a13ca87c40024f89bbc26d02abd13a413cb93d72a345cd560c1ba1f44ecc
+DIST firefox-60.5.0esr-nn-NO.xpi 511434 BLAKE2B fe86088d98de79a7e945eb12c990d20b7d25ceaa390c5c92e62111181e65bef2cceabefff56aca8fe7a6069c0c580f1f5d5e2461acde388ca010c2875aae0ccc SHA512 de69a12eb70c1a5b9dc705b49ad4792f3a7dadd15bcc3e588c2ec412301e35364557123ab61ca59e274790bad84b01dd398e01f43117526bbf5fd37df34b866c
+DIST firefox-60.5.0esr-or.xpi 540875 BLAKE2B f099744ad7f6fedd17f2bd91e60250d24b8602dc548aaee4792a3c7c426f480e124216097ad3d43f492b88d41a547c03a3f2f9dbbec6a81e2c7484113ae1f35a SHA512 9a6ff9a825cb1959c4b56c38b77359005cb900049de21ff7ee7e0955ad0ca2b578b174f354c2c2f2d34923c774837423fc7b320a984b692272157a2559f8f2e5
+DIST firefox-60.5.0esr-pa-IN.xpi 557878 BLAKE2B 7e0dce62ab2b10a748b25655850c2102d1ee1bde2d8949734378b2707f7ebbe6d846b6770ccefc529fd1624341a6c28cc85bcdbe506d1165d211f6b771375d27 SHA512 b130f289a776e86e8c971f31d0e4644938339574b6003f007041815e939159d0b0c612578ed20110ce67ec7f8b93dbd15574d671b6a799e0a8723f54cde54689
+DIST firefox-60.5.0esr-pl.xpi 419026 BLAKE2B 86df42aa1130be2a04935e6b401c2fb7250c86cbfa2be01ef6fcf24a9ad5a80d6c9cb453986052fc82796ff019fdf8d9f620e62c846978a21ff230c3dbc6ad5c SHA512 f8cdd442a58c3dcadf41fb42c4e8018327782cf245937e1a2d82399e4a6226a029a50c5351ed58b1e2b4d655d3e120c0686f8b17c38f09133cd9af02b0638035
+DIST firefox-60.5.0esr-pt-BR.xpi 514760 BLAKE2B d3509f80acf68431d03ed36a887b84adee9b638d1277015ab7ccf135872cd4dbea9d7613e811da93b232a87f896fd1bc48de20892ae88337468e99bb512aa3d8 SHA512 e1e2e9d7d0891115dc5898cfee690de7857935f874fb2a82040557d3125654ab06b766de6699b4534543e9f263c53e4f2de7be015665da7665047e33b0e5dc41
+DIST firefox-60.5.0esr-pt-PT.xpi 519358 BLAKE2B dd4510794bd3293d16fa7d76f5b9ea5b732435395e232169b48f17343d946f3b79c3e6f735d1ca921077a1f29686cd11368cff319ef9b2fe27b2493f61e35a65 SHA512 afbdead75ddd1338b7bd6c77bae9d87b75dbd5dc0a1c5911eb0144d0c0c114b73669f99df26135d6a955a4bd04d87d7134f8566374c611fc517ce7027f660fc3
+DIST firefox-60.5.0esr-rm.xpi 506037 BLAKE2B 8b327b70448cf462cdf985822c63ffb5c76c90678f03522739fa55f5799f27a3b59ce47a7ed61208cc6357f05771145be7879f80a7b1d04ea5100df5d485c295 SHA512 0951fef3b40ed9d98317df78eef92187ed04e59237076e72c6c188016b919cec303189ee3d5ac3c3ad8741db7cf9b6f226a6c134c9ae7f3724e46fdd03e0b05f
+DIST firefox-60.5.0esr-ro.xpi 514052 BLAKE2B aabd25bc0409f238892fd54ffddaa6588b75e647aa11251e224dd73071fea0a3c67d2ed2c4f81e662abfb6b4d64f344efd5cde0cdbe07665a81304cbb2e31421 SHA512 f903cc07422db68d2990dfa2d26b050de0d4a298722078b5b768abe9b727873001c0f4ba6e9dd1b846af8d4b532009c7602bbe913d584ff2ba45c767fa1430b2
+DIST firefox-60.5.0esr-ru.xpi 591402 BLAKE2B 4e50db8e130a763bef2ac276bd7537acd5db8cba13d51cab5bc70f7c51454247e6a9f381101e50c448246deb8da304e542f6d7a296d23dd865a9c32e10f99984 SHA512 056244c9d8b0685894742e55b52156257feeb4cd575a0d9d79ac0a5ece1e16255bea83f80aa78c51c0e45c0b9909abdfd81f0ab1acd00d4c37f2c8d28a837a57
+DIST firefox-60.5.0esr-si.xpi 545576 BLAKE2B 228a3e3bcc5cbd9a66c9c995e478b5acf73780c6a00311ee81858408f1770177998d913db2ea5071cc384c82de7b296b56d3bca7f367f64c34b2c875c3b3caf4 SHA512 e4b905ec02d851317451159b02b11e465705ac77e129455f738e1c82dc11319bffd4b9a577f21928318072ed8c6f888b7c14dfb2ce4232bc3da3b8aba071e3dc
+DIST firefox-60.5.0esr-sk.xpi 541705 BLAKE2B 49e64f89a3aff024c756d0a7b77882004c38b65eb38ffa6a636c84142fe09811d39a2be8eabaa5006e2707fcf312dddc4dbf3a8b909169b901d921b3ca68d960 SHA512 346223bf3fc8f07762acfe2842a0d596461ef0b3aacd349455a58683fcf6700cdb38b33f72b1be0bed323b01fd5316d0f8491ec03b90b2c2bb7de803f2791c9b
+DIST firefox-60.5.0esr-sl.xpi 519375 BLAKE2B e8a7627c7cffc569f5bcaa05f6419e02ad58b1a99db179534c828332d398083366a62b043c99373fa619e358b5a9806ef67528e988370441bc79dc8a70e48850 SHA512 d89b2a8482cc9fc4895470bcae4dd59c7081701675c5ebe941994dfd40f0fabb50a500be70fa16b32ad448d75501f20cc43b9cba47b85d314db08d8a604682f2
+DIST firefox-60.5.0esr-son.xpi 497693 BLAKE2B dcac349ca37abd2a774f348512e5521de6a4afcc38906f82117092994fff09f30465f73cf57a6451ab9b5bbf4a1811e872b487326288a67b8ec6e64c79540262 SHA512 7b86ea4722b724275dbaeccf0d51d01baa38dcdf3cf96109c1b701d6cfb648dc9d9409512bfddf567eada73abf4c23b9f9fb9aad5a965c38d169f40f26b8ab6f
+DIST firefox-60.5.0esr-sq.xpi 521271 BLAKE2B 248f6ccc6931dcd52210efc5a741fe25269ceed22c64e6d2f802751b8907f609fc29556815cde113f95b0ac233bcd08af2a9a2ef8141a2c6efc4d8e83e146cbb SHA512 33886d155bcfdc531b8c9b42dd17cda515922155469259cc84800d82050161156eaedac2cfc6064545f073bf071010cc7f9bade821031e76fad8357b5ddf0ec0
+DIST firefox-60.5.0esr-sr.xpi 548776 BLAKE2B 4ec53025d4df6828582416ec4f03fd1ccc978e9c4dde3cb6795709dca3e8f3817607d83cbaae01fc0d9f57022fa4bfc958739211cf1b3c75d6a9f96c2f8488bb SHA512 ad5a9581717230240e60a4df3621f6a2ea0652f3c84d2c3d1076cef00e75fb33dd4a91ad2340a6ff597ac5acb2bcce17696070ed4c67582b56f7fb17aeca6f27
+DIST firefox-60.5.0esr-sv-SE.xpi 518664 BLAKE2B 5ed13f5fb83a6e2e4a7f0b406d228c39279ca6e7182bc67fedf3a9cf325b87b091fc5c8a47006f7dc220513ffa9c1e91cfb0e023ebc0dac77d95ea193e81ed1a SHA512 0f7f030732e6a080119e2272ddb84409d32f64f3b219a1bcc9e8c167d5b6089e54d5b0ef6a9168514850c51ab3b631406c29176c20644eac5c81bf49797ab735
+DIST firefox-60.5.0esr-ta.xpi 577921 BLAKE2B 73cfec3d32521567e7f9e6137a1590fcf3fa0685191259d2cbc4c6bec7657ef5bb673fad2fc5ae3e7e1081673e174acd24af8fad4d36106c6cb3b64c4d3eb14d SHA512 d46f8cd8a38f9e5ddae5c1d78fa0f6585bc9c92515883b9cb5a68be8dbeb997f3c9fb1cb3aac4d9ed6d73be99bf411a2995d4fd089ba66f5d5164cdc4a72b050
+DIST firefox-60.5.0esr-te.xpi 590962 BLAKE2B bb628127950f4f2996cfe7dfb528f3b1426cd81e673111ad602cd9f03a71cbde7900f8522aa4da099528c5663a2c3dae3f851d6ee23ed7aedbd55c365699d3dc SHA512 61cf51e28c18eba81c1e1d58b2c703d9589fdc5cf80d6960878d9b38a58b53678f28eae3c6ffff20bfefb08d6c78ea88346f343b5262234e6feceabdd68abee9
+DIST firefox-60.5.0esr-th.xpi 562823 BLAKE2B fd564c4c45794671c8ab7dbeac28f5264cc7ab5f88d585ff7d72cb85b348cb3f47ad1a10a56ea106310b2bee441590823567a4bac38cad36a468f57762c2c09e SHA512 d111e9398508b4419475c82c08d1ae73a5aee18dc130d5746b86b83596214477634dab1785c7656cf4c8446c5b826ef44813fccebee7976bfa64f91afe2a04b9
+DIST firefox-60.5.0esr-tr.xpi 525862 BLAKE2B 778e147a2946f8ba6d9393bada44f28e1373cb57a7d008db7c221e9652b81053448dc7c5984f752d3aa15c6aac36e5d8aa26f8bc39952cdb5cd365e69c2a1462 SHA512 12d0261004b0218a10b583980fcd18c9ed7f2ac1466def6d93df2d812fa3fbda0d3d737e462d9faffc253f2a945d64e677de2234298ba638ca2bac1efc5072d7
+DIST firefox-60.5.0esr-uk.xpi 580926 BLAKE2B a4a76db1525dda8ecc017f8eaa73874057eb56ddced4d960cb7c6d52d96118b265b04b309f16936bdc730bb3e2cfedc381f79ebae574b285a95d008febc6748d SHA512 f7ece316cfd1c586ba79460cd183a993d5721101c45b87d669fb4c23722411d36b382cda8d96373918d81c586950e29142ab9bcf012b0e15a628a5e5a043f9d6
+DIST firefox-60.5.0esr-uz.xpi 513691 BLAKE2B dd20a5b553b7fb0d59aacb3da51d37351c38e981598fb1c639fb994608f093f457a6b31475686cdbd96efa5256964ea56e47fc01a5f71dcbe61368768b141ec0 SHA512 49c3d090f63174fdcf73f0a1bc3780f429d7a9bd9b2fee21e50cee1ced922c23f40aa0ada4b90f24056f9a5221999b67cf5d07c17ddbc53c563f37761cee867a
+DIST firefox-60.5.0esr-vi.xpi 528193 BLAKE2B c218b8efa23d221faf652b87478b91320cd03f260b9ea72f717eb9f3192865b76eb3cbc887e9f17f7f71be36c759f60ec9d6e90bd7be14c9dd88491bddc7bcd7 SHA512 57e15bbb476bb30a3b1acef5b7b8242736b25a6786095567dd9e33d210bbe109e9f725e19e5140a5ab56854e91b520bf1472af76bb170eda9e1dbaa89f142163
+DIST firefox-60.5.0esr-xh.xpi 511860 BLAKE2B 39e34631b4ac241f6d959094497c8d5df5d11d994ad5dbb04f7c463848a1a94dbeeabae20c70c5ce5d4b4928a033950546c99a985a01c61ff10cd9a6a3b756da SHA512 5b90d5e1249dbc4f14890ff18fcedfaa2af8d6a96595acee56df34bb3481ff6f3e6b1d0cb5bf770a296678a059ccceea37e011832046d6dcfb2d8e2b3b78087a
+DIST firefox-60.5.0esr-zh-CN.xpi 543587 BLAKE2B 80aa034f254b8ce580ba320d6fb0bd148ff7abd894df440a357c7273532057f6e5f142ee3ea250f77e94e4edceff2a1292d2a80cdffa8ceccfe6b50056d1e411 SHA512 0beecc494c416e4195812f74e4934509958226ef61605efe0e8315866d76a1a1a5089c24e91f75d9802d48a0c8a2b07d337cb08166481cb3e100cbdaeed49f8d
+DIST firefox-60.5.0esr-zh-TW.xpi 541914 BLAKE2B 767e09bda7aef1cbe5aee711266274069331133f3f45f473f7e4ab3ea7cd5dc2190e01f39e3cc86f50a3b3a0427aba91c7625ebfcd9fdfbd254456eb6810ab0d SHA512 15bbfc4609c6f382b695423776d857b5675bf19f887b9133c1bc8fbac476c967642bfa58bdcff96f538af2728b636c9712798fcf515b7fe8d02a0fdbca881a94
+DIST firefox-60.5.0esr.source.tar.xz 268065616 BLAKE2B 7267336d543e0e6b18dbbf4bf9f0412fa6246f275642706a06c799cbe6e06878bd3911fa67b71846759259260797a864b8a3b224a7f3102b8a05cb49e2e1f2ec SHA512 dd47e38a87a1339b733c06ea3f235576bf8dce414194ab308d0dda07bf15290afbbad92b8484732daa53cf6a48b57412f7f41e30ae0ac21144c8657b86047aec
 DIST firefox-64.0-ach.xpi 455463 BLAKE2B f9cbba19f002a625bae23a1c4e7157c4090cd41a16872993603aed0610c1b9124aaf7fdd90a3263ccd0e841d0e1624cce517db929d62833c6a0a91e7942ed352 SHA512 5e7ce624293c24e8a8f0e1d323ed1f6d77c8476915c1ab60c2ba74725bfabd011ca7de113a98d118f112af633a7a9db014c3961a7421344db4b97c23d9aa7848
 DIST firefox-64.0-af.xpi 431976 BLAKE2B 366e4fb57e4d9bb48c08d98b290c4338ccd00d1c56b61773c6ef11053df8116fd453c4d4c1ce34175d60c7600ee8acabe2865b4fb70f5543dd6c8014a62bd43b SHA512 17d2015fe636f8ea787d7b536f10767be4e5afb754c883c1b5d68dc65b45a620e1c0d2c81ff4d155a07f8db5c775ad7fca74d88e8759f2cd178d0914ce2a0331
 DIST firefox-64.0-an.xpi 473568 BLAKE2B 512627e73a3b80d0b7de9ed209a4ebb1f5928a1825fb29907e004685cfed298cbda4d528546090e6403b8bd520c4b589ca51fa02cb1f144dc21b9876269f8157 SHA512 7979c4a0eabd79169249b7f3741ef349c98ac56f2223164b5dbe793ff4bbc85e976d06d8fdf74c8abd3bd9c2783f5958ee836167dc9efe65bf3934dabc4b3aae
@@ -375,8 +468,103 @@ DIST firefox-64.0.2-zh-CN.xpi 507524 BLAKE2B 950b65dd32218b6f4bb3d3a47742e8a2d20
 DIST firefox-64.0.2-zh-TW.xpi 510624 BLAKE2B c218ece3ecd5f38e73f384c5342b6725668bc7b79412f756ee5a6e97d2524fb879b87485e3771e469aa747d98159d22207c4a0adb018b3c821e12eec6dead03d SHA512 aae4519528e733a8629db0d00988d67d020fc23b55f54cb7ac52f5e4db627e256a9814a15649bb5e7812819589b0cbc9ccb066e857bdbdd889a16de3342b7740
 DIST firefox-64.0.2.source.tar.xz 273075852 BLAKE2B e7309b08bccd7429838510441a589003225f86cd5ecf84a45bf816c6d4d134acf687348195c2ae0dba2ab89e799e004462b215be6616efbc5649d051c96cc1d4 SHA512 ad1e299fb0e1cc35ef7414d6ffc50edb14c365fce7e9383ea82f77c9f38f408024e2941952ead5b39725a7078a43493617924626cac723a0518e4504a2afbfbb
 DIST firefox-64.0.source.tar.xz 271865888 BLAKE2B 70ab6cc51f80993dd2229fe4924d82a3cb83c8bb0e7f2c6a0930da3a4e1285198a774f48c55afb4095a37276c3af3c2de9c8a8cec17bf80162f865f114b14696 SHA512 1aaabcaf133f76edd1a92037a1a8ca4c6dad2efadc6cd97724d4bf4a5a6af63b662a68f9f8bfc41cf6482b44fbf4bf8943a0e82fd08cf9e2aa219b6a97fff541
+DIST firefox-65.0-ach.xpi 447455 BLAKE2B 0f53c39867f122b871aa4c75e2a7934caf61b59e508df5d19cf218726b01df0ca65438e3f619d7810e2211b1ea36373fc6630d083444366993a10eb175d098e4 SHA512 1e609b117838310d5b634b005ba8134f1effa6b1d71fd50037038ef99166439609bf37bc87501f8acf59e1dd55349549f2b40b3bb5863d126918fd211f0171d5
+DIST firefox-65.0-af.xpi 437793 BLAKE2B 0a9b7058e5eb2e271b49c677386201b1f91ef829e809634b0a58e2cf33a73780086a5972bd68bc63c0f0ab8d20cb95a0fceaad06d03526c57e6145749d92fdee SHA512 a89bb5f477961328db5eedd94b8ecaef31c399fccb2c7d05978a4227c8dd6fb2760739990cf2df3bb79dc1a25b7f2a49917c5f650f02a03bbd7d7008144f5210
+DIST firefox-65.0-an.xpi 465005 BLAKE2B 4bcaafa6fd8a0c289c475189db56d546edfc411be220b96c4dd375085d2ca28175c176680684dbf341ef39ea7d83d9736eedc48beb2491de517d23c1e755a163 SHA512 7fc5e79f3fe98946ce52ce84b2b34dde64d70599820f1a3f3e83fb517a8c560474a72386a316ad08a238a487e9ca4943e08cb56aa7d9a71ac91411e28281f921
+DIST firefox-65.0-ar.xpi 509019 BLAKE2B c938224f38e2d9d8ed362cd3dd9d9d715f9d5f8da3050bec5e99f41248c1099644fd4a821b382bf0e1d11caab9f5b36e9c306eabaef40480471cd94540238568 SHA512 b7ce9d833d45f2737b540a2ab560ae4652aec68a5e844557d75aa198d356516e96a2ed529da516cdb0e5bbfbe1ef9323cc564cebccb72b7c1d61ee2b70ab23f6
+DIST firefox-65.0-as.xpi 472923 BLAKE2B 6ba56701024544b20dbffc2dcb06d8e3b23a62dab523e0e3f57c0ae81514c3f253edb5d4fd7ad76036a61a23f44570c06802ee61ac76b5c27f9d49084a77c1ed SHA512 0fff1cf461470258843bc6ed6d3de858fda860e6e7196a64206817e9cc0f28477141a2503b5495f55b9430a30526b1da932bb37c568c3b5952fb15d4485e24c8
+DIST firefox-65.0-ast.xpi 462336 BLAKE2B 394e333ce569b31db919111530e21677d6cef86b9a33cd216cf9f1d15f40af4bd221cad5fef5ab670ed4f70130ae38773d7fb0cc30ee283bf559852e6c63b1d5 SHA512 ae6e5907f99c05a1cb779fb9ac1bb72fb54923b4ebe8d8de5d0b34ad996e9daddebbf79e9bfc5c6755ac30f5d66486f0b96316e931ab50bd77da4f41173b063e
+DIST firefox-65.0-az.xpi 488813 BLAKE2B e6096c7e0639e67690605029b7b09d8a80bab1d727740e9d4610b691d912f9d1739fb49ba11283d2652bd8b6c5079dd2f22b94fa7350547f3581a5a4981436d5 SHA512 a212b75fcbcc7bbc19ff4ddfaf89938dadd78d21baad2427b6bc2fb2c6bdb0dc812576269f8ec3d2a23403ba14f97f7422e1376ca0ea4679cc407a5347494ca1
+DIST firefox-65.0-bg.xpi 521952 BLAKE2B 0cd1e568d7794c2eb8d8c2891020b869d4de6498388c14acbf903e69d04e6bfc3d776b368996ccd5688651b6691eb92f8a00425648916438f0a357fb8d017d5c SHA512 bb00bb0b06a676740953f9d82cdd7859ab10aaeb7868e08b4a82ecc26ef2de026301b813aed9361abd7a5e526538f2a655524bb3178d8f68def6148668f144e1
+DIST firefox-65.0-bn-BD.xpi 536531 BLAKE2B 40de401afae824508f5a011266cad03d90d790859da7b542122438fa9ff3194fd1fc26baa662e8eb1448319771e731c070780e04eae28305d3e7d70c0b10d193 SHA512 8391f6f8935f580d33a7b70f8b2581a74c3460a7bdb4fcf5fe462d312cbcec1eb8e2bbcd82535a919d4ebb7d7ef0a104b07b272d4d2529aee5210cb902852334
+DIST firefox-65.0-bn-IN.xpi 528104 BLAKE2B 8e9910cb9673f27f0312f187b49e3e9d3e10286f91f24ca7555718b785091489a03d3509a27f1407afe72047aaf1bfa6cae1eb3ab62cbe218549aad39f2f02b7 SHA512 52a9bcb7b43c9d24df10560d204c9a16566de524b10c04e9ce45c1bef3ba285a94fd8b01ad7c087202fc165a03f4f85ad471dad6946e9b49b35b0a0d70b72f8d
+DIST firefox-65.0-br.xpi 468614 BLAKE2B 11283013c257319a9e49160a223ed2224973ff76bfe3f5df243aa4c5f2b82c533e53c12c84ae92f84b9901cb8edb398f0f188dcf2f54600760763f5a8c221d6f SHA512 fc176e4844e5000e5c9a6f366e822316dd05674e75ed730e802d58ce82638bb3a3b43527c9070cba836a7a81e5ccfe220e6401a6f49d82c5d88a019ce4b99d0a
+DIST firefox-65.0-bs.xpi 463209 BLAKE2B 16c06baa7d74fb4427d5ab51049ab56622a6c809bf117aea70833b54ff80cee37798add1f5a81afc689c2f7ecd21956bb86b4677eb7919e254ec96b5ad5bbe5a SHA512 42e0572b0a4f004bfae3d4b3dbbfba79c0c0b8c72818dc3aa76ca7ab5a23f2dae78c5fbd555bb3b29b5b07e833aa54810f145a33083f948f3179052722819cf4
+DIST firefox-65.0-ca.xpi 469759 BLAKE2B 3b38f6668f8aeb95c8a5a51509780fea46ad73d4b23e2709d3e7c301951da782634f5ce0fe8dbc232f59a6d69ab06d47224ffa12aa57c672003a3f6fb9a78324 SHA512 14e608e455b22c36700a042fe33b093d0433ba203fe0b2b0ad28e78fe27ef2d95e3d5e307b6b49f296a383dfb80308532091c4b08c28c94b3b386addada56e77
+DIST firefox-65.0-cak.xpi 492515 BLAKE2B c21af254dcec4b2f79c78ed90a689be23dd991c95bfcc6d46f631113a8b5ae276d9b0a519fd0fe99fa96c2824196e31c865f946f7533ba11a5856de2e684bd9f SHA512 de8578b2dd64981c0b080fc82fad59c2163c0f8e08b8320ccdf2f8ebddd59c45f80ef550e54010dadb6e5da55d7e112a9076329b3f210f650894ed510c79b975
+DIST firefox-65.0-cs.xpi 482367 BLAKE2B 1017a0c0e75f110912253ad2fdd308fd70d546cae6e83616dcc73428aeaf4d476b159382bfbf354831edd70a28366dbcf272561ff7ae9e38e1bb50c2e324213e SHA512 916f559213bb9fbc0b4cf2b8d2fab17ad869ffc73f8c10d48c773ed3fcb692ac9943957dbb7aeee16094b44d5161c0319b4d15fdd8fd2dbd968692952d9826c4
+DIST firefox-65.0-cy.xpi 471834 BLAKE2B 19ee66259e3b1a0a1c11b2907759f9df96c2207c51e9a4b75fbf3bd8bc5e2984be263f251effecb95c444915ae34d89376a6bafb3fa56fbd32125e7b7f5977aa SHA512 79fe179064f528951a21204feece2de6a102b519d96d910aa29932df12a28774b37b0cfe5485197f2984a0466fdd91011d9aee0725d1dcb74139f7db0abe54af
+DIST firefox-65.0-da.xpi 474705 BLAKE2B 17089fa296853cc96ec53a76253cf0aac4aa9e3cc72b7bbbf96d4991f2d6f721bc06abc1479084b1ba73a09e9913f68c5c4e71a3540a1e5706d98558acc36e98 SHA512 2b508f6a53290dc259bff17dc4745014aea2a1522b738516fe214a6d403d720e8af8c9e6ef1cb8569af03b0d11eb41a8f1876215c545029f491c13b083aa8937
+DIST firefox-65.0-de.xpi 482311 BLAKE2B ad359047d7dcd5e17c0f3a0c17a87d9f60610f1ced347d9aa73decd410fa97755129d3146fcd8bc98e05b60749d5a79770f6a693edcb6227060ca5c5909929e7 SHA512 c358fc3343dff0e569ab058082197409093231378859eb6e4693ed35df28aae2d93722db713cafa3f5d819c93bef6c650df7ca35840081004a7aca9aa19055b4
+DIST firefox-65.0-dsb.xpi 491040 BLAKE2B 4fabb1484a78bd4a39a6202bab74b67c99098dd273ba054725c3ec72593461e31adfde740e75f05620856632e354f728e86c4347781012a5cad9d12df016f6bb SHA512 fef27ed10bb328cc25f3206081876e8cbeb4ec37fef501e29a30a610f26cd1d067028ae5e4d1ac33b4501a341ad4bf4b0245b11f34057ab5a86a16b3e8a410b0
+DIST firefox-65.0-el.xpi 549048 BLAKE2B f46b43ec160812670b358aedc6c6457a1783cbeba46c61359122a058fb2569c9351b78a8686778ac2ddb48b9accf8bdc2cf6258693e87d1cea94d93b693a86e5 SHA512 cb90713035c9c36e6b8e4325bd4b80e11075e4fd25c67db49a37588456ea81003607d2c0a26a725b3c2309ec8997e5910011cd6bfaa9fda51ac6f0843b963fad
+DIST firefox-65.0-en-GB.xpi 441644 BLAKE2B 711ffd92c08b8c7cb92ef28f5385ea0c860745601fa33fedee83a714c32dc43924227098eb14ad1e9f7ae6927c87c7430b268b653001c64e0eb8eb4c7f630a07 SHA512 c9db46baf8e65c6dda527f881b7d187c4f418fc2277798f5125f023cb62de8354d1167ed7b9fc98c97b73c196576845f3e6e4bfb17a68bc746cd56fdace3e32a
+DIST firefox-65.0-en-ZA.xpi 421339 BLAKE2B 1b073570a2c0ef868fee062992fea8b4f2de507f81aafd341c3a3cb0450ca449f532c6f430efdd0753ccb554b788fa81089d2fc4b9171be02431afada870aba1 SHA512 675b3850971a80a740eca3543793f3e19dc32f258d9f023cdfd88d9f13afd139c53146c957566aba48e4517df14fcee9dfe4549120984f45f7c7296834a59569
+DIST firefox-65.0-eo.xpi 469163 BLAKE2B 34dd945ab2b94e17d2548eb7b9241e869e0ad04cd38c7272994e1a012bb3f9f962921c0b09b1f4b4fc5d90fda36ebae739d589bd887abe316f6c68bdb1abbb7d SHA512 97cc2f3ded259ab1b0efe3e28b3a304629d66df71300aa6a2fc252509a120017cbe5056a635cc1775b051296511c2f71dc7b9994b86ace8bbd2d6b3b51083ff1
+DIST firefox-65.0-es-AR.xpi 477375 BLAKE2B 6518600b6c9b1c7050a0ebace9fdafba64df235166f9613df86fa0771f9112a2dc6173a3d1260b6bade02cb0cb036c24e4d14ca8ce61be080069b77705a05c89 SHA512 a71e538d8fbf22d525037447a9e07b103eb3aa87de36c4204efec022e7c632e6d3401b7bf7f7c2a792a2aec328da2565829d98e3d884f999931f1ca8231db654
+DIST firefox-65.0-es-CL.xpi 476261 BLAKE2B bd81e90d215302f9c7cbbd3a3dc1eefd66f6b8cbbae06972ecdeac146d410966a558b552b4e587e902580be17d7bf3f12d713ab9498001f3f8fd05ab15f9f0f2 SHA512 0b3e905cb88afe512f3d8202875dbccc22874bb2f25a239ff77dc8ff22bd6c084445fa8cdb4436d37d4ea18a1e6d21832ea31668bb7106d55624878c3acbcd71
+DIST firefox-65.0-es-ES.xpi 437102 BLAKE2B aea00bb3f5302ffd0ee38e67628e994c538b1568be0e2aa1ef4e7ca2b5d98d4c29862e2d8ecebfc3b329d93debdcd328a8f80f0d8392a3518c78a481eec6cc7c SHA512 c18df1c1d8559416fe544df203f9e192580f6123e2d5f258786e7150b55aa6d206ec5dc39a3697f4fd6662681a058b87a89350d18a6ad0c6f1d66792d3042fe0
+DIST firefox-65.0-es-MX.xpi 479493 BLAKE2B 81a90a36a2ea2a11fbb9b9017066a9f992dddb946447bec5bc7efc9bf236d3dc05c96bbfa77129030c2fe812585304c9904c4e4c9ece064010a3a32b98da42ff SHA512 3c24a6858c4d050813aab711242a1d70bacd683ea471076435546a3d04b50073347eb1106a9cacf03c1494cc5f0906e22907050831d994130557dd1508f7adc2
+DIST firefox-65.0-et.xpi 460954 BLAKE2B 08fe504af58ecefe7d23df4babf287af6bcdc3f8d4720267bf8a7e7af7bcec209577243f89a67ea7d0de6f39af7a8900dcccc110d4d881b0f940dd5704d2553f SHA512 6aadb521f204e88be670cb3c8d5936c53752ecc37bc58ee6ff1ec9c5d5c535951c79c4131fea7e326af984256a518fc501ec3bf56071f58f2222b67ffd410db5
+DIST firefox-65.0-eu.xpi 468842 BLAKE2B 343293ee8e81bd85dfe13114fcbef5a3c205a3aa918af9985b78291e817b580e6a52824aac6b266fd360cc1c89076b6581061ffeb62c67eae4aba7d65b8b5c6a SHA512 24bb255a5ae53c3f1d7430a5a186fe752f89a1da6fcf9a80042b3c34f6df6cc5f33547964ebe40573a0f6ee5ce54578baf5b40fa3f42463d9ecc3c637382ba34
+DIST firefox-65.0-fa.xpi 520143 BLAKE2B aa2be76c03d377b6a354496505fb9b3a4e9a33b3f9f3ebeb7c42656095237134677c361160e90c670476c9cfe484ff3afe411c2fb165cac36913dc4b56003356 SHA512 59947bf9f9b67e123fa2457be8afcfc145be5e15c1aff55c5ecb8c4e22c0065b8bf1dad5543e82d60e5003c3caf7d6343a51f50a88f1c300a4c59df7098de9f5
+DIST firefox-65.0-ff.xpi 461634 BLAKE2B f3068803c330e294ddf277faa8a45f90b224f58ea97cfeba4eec93a02e85b6b858222333461bb818f519b87c5708b45245a4beef7aa6cd6108db663f71e52d42 SHA512 b3a55b93e6568beb8b5e42730e5a1d08ab30d27df0eeb7819f1b633a8516a82dfc548d9ebe949a05c2e9316493bf244536fbf565e65bdcc5d64e1a394f00518b
+DIST firefox-65.0-fi.xpi 459819 BLAKE2B 3e993d9f96cd05c3486411a7b7343a4ac5593656ee6ee899406d03f65d1ba1dfc7d525eca717377f074075bacf7f10ead66992369efbcb9f16c8af0a35fc4788 SHA512 88999e95bd1a5d5c9eccd78bb24f08821cc22f6ce2045b7ddc45525f9ad5985d05ecfc4e9ae6742cb26e333e770a622938421203bf7f02b2205b5157f3851135
+DIST firefox-65.0-fr.xpi 486273 BLAKE2B b64ee8e392a1db27b35c48a41405a4a9796f62bdc10377683d292fcfa692f5c9767206cc05dac409916627e05f7c46c6a116b136daa9e4bcfbbef6cf2bc43447 SHA512 962e4eb660ce59a3edd8ca0e18ee2e437733375e7fddad9c1f92a75dfcde145ed0fb0fd5686e7531ea7e248dac3d280451658eed158244972be6274baffaa084
+DIST firefox-65.0-fy-NL.xpi 474527 BLAKE2B bd5f384f88f1021e95c5ce5907d7b67cec29ebbf1d3f7b50e3eb8f172288dc504d1af2140027e555b950e71273ac0813134cf54fc19f5405f73e6a4ec5db5d09 SHA512 80f29dffe1e524451b544f4953cc5fb4b35febdad6979c40ab4f31d0caf38531ce741ce50f60870e4b8cefa68a67edd778e45afa02ab84a9c6e0c69bf0512c2c
+DIST firefox-65.0-ga-IE.xpi 468124 BLAKE2B b2fa49836a5775f00a604f94cf3ad27f3b193963d96ea7f8a7ce74781754fbe9abf9db91296f66ea6f82fc396228bdc763862b5f088f3763e10071f62d29937e SHA512 807100c54012e05fb0e4958f1de76c352057630699d14d644a8bcc1128b951508080d32ea00f01d631f6f636a84c8bd32dda08302a07bae50a3fc81207aaa303
+DIST firefox-65.0-gd.xpi 479073 BLAKE2B b46eb2efd364b35e9d7ee2824f5f8e948dcdf1e731386a42984838bad78cb8d29fe93ff149ffba5b01c8c5b8591d52bab97ec2ad9c3f05aa91862eadd1c4e569 SHA512 01905fb6ba0d30124631c6325a70221464493e0fded59ecbb934a394ffe960fe05238b0c9fc1297259e00d0c8a2194e44d2319b8414dbbd8fcac33fa0c117257
+DIST firefox-65.0-gl.xpi 463707 BLAKE2B fa7f3a7aa78f250c3918f27510276af56aa6f34d923a5c634db59023d4e563087bb745954863eb8fe39c8904eea0dd3a40928fcb638f5a6060fa33432c734e51 SHA512 66b4560613c050e6e1963cc381408f3524e0cffa11126c8cf754f16f8f60fb3a3382876ac89d6337bc21218c092acac4291fcfb9a848948eeb7b5c8c8bf2830c
+DIST firefox-65.0-gn.xpi 485000 BLAKE2B 5bfbfa03e89499ec46cc77dcb43e3837341d72408c0f87d86a298c1ebad1dfb26171d73af25e86d5477bb89e2b77118dff9fd9002b37bb51531f0073144cb3e5 SHA512 a044c6f15d30838b4f16d76133f0c5277967f8ae9bd122b966fff74472f78f0994d23b8d3d70d0a8936c018b04f945d5b8582bd132c5f06acabe2eda604d53b9
+DIST firefox-65.0-gu-IN.xpi 544747 BLAKE2B af5e88f11742c61b48c25f2170f2ba007bbb4f0983d1f958c0652109dd1fc68742bc23183a5d8573a80dbcd9722c1763fb7d1d8a2b142cdff1245f3e5f871dc1 SHA512 1233798a2d2985e9ae960704bdfdfac6b10954887e16e1050b22f99b9a43309d1e5200bba3a141110e61b83852a59c069f193cfc46f653481c786fe63706d7f6
+DIST firefox-65.0-he.xpi 485643 BLAKE2B 392527a00c8cd2b4448052bb0f9ea1da3877dcdb4c61f02f3f399697cc7471bc8bd250b4d7ab1a083dd04b0ae0f7f449adcba4f2805a54380f6787fc013e4e82 SHA512 5fcc9b4b5e5499505e7ce41ad2b96b2ba2be7cbe9650bd9865f10b0f737f00754aeb5f2dabb46567514fe5c9666ccddff13e2eb2f9d01c137a7e40cdf0ca8505
+DIST firefox-65.0-hi-IN.xpi 533022 BLAKE2B a0f5e64b6911f2ac805dd98527fc65a4bd53fa8ebaff97a443df1ca122015d7d6a0e4b431fd16c9224efe7313a9587c17e528d191d5cbedbd149ec6da0f41c67 SHA512 bcaea79f929a2bf936b2c3a0c163774ac430677b7097edb558562766e13b7721829399e943704cd18b95455de6824b0a431afa59cc5b41cab6e6e987b770adf0
+DIST firefox-65.0-hr.xpi 465049 BLAKE2B 52eb009af1ff72e5532cbd7134dc4bf9220bc612e3433fd31fb4a1adea2d4fdd8c89cde868400c819b355a45cf3eb15b17fe57343c9985fc03895bc31b79fe19 SHA512 a413cdbf3906deac8479c58c59cf4953ac9ac4af78d0bf53c7da4b19404afccef1c0c3bf7f91495fbc7dd17e39f97cc093ba351afbb6832452a111a35f04c169
+DIST firefox-65.0-hsb.xpi 490634 BLAKE2B ae028d1a65d2183684a16b4a5890241210347d149797df5e5cc0b0f577fa7d6760f042d5fa44279e96e8a8f023b17aa45c2e057e95e4689ebf3949521d2e0c92 SHA512 8a1f487783628b7a63a6fe9d5b3e9c05d93e574fa367f0569f57f8840bbd55af6dc7d14f23c026b73c26bdf85baaa04fb65b57c7aae611d77b21053e9d89455f
+DIST firefox-65.0-hu.xpi 488207 BLAKE2B 079b78ce429850a79d6c60b62a5f07a41858f7eb45e37816b36f37493c721e7cc81723b8f753b937e9716a530157f39bd692925bdde0afdcd6806f3605d9295a SHA512 416f42291bd97efd66a212a85bcf466ba0cb8a1d699c8d2164890ed19173e57e0301e9272157255c0ea5c9c6ef0b56f655dd8d0c86400bd642ae3386e63b1823
+DIST firefox-65.0-hy-AM.xpi 510217 BLAKE2B 7fdd3c5a5d5ad1aae1cd79d7f867e42ba82db683c33bdd6abeedfd1b1637f22b1909bda6a292b2c0ca7085d502078be94962957a3d41caaa71d9c4c444863037 SHA512 769043d4c5136f5f39ab06b06ef0e20f3af613aa582c33bdc101052ff657605b5bf9c6f511c1978fd8b5bb4994f11719ba0d91d3e64e5266f78de69a31204125
+DIST firefox-65.0-id.xpi 459182 BLAKE2B 276a1e80014ec014debe930bb8e997e108a117da1513221c0df9e0813a1952a1d2180cb0c045bd4588ff7b94f3f17aa6634c69462d1aa45bfd3ac00984ac170d SHA512 f747c7b048b13bdb97309a6617cffd2f1021a994d57aa10a65f72f37a7de9ccb5714105f2ea539ad6dec018faef084b05c0d52d0a4f8f9577ae57b673f57ed36
+DIST firefox-65.0-is.xpi 466957 BLAKE2B 45a873e9d9bcd9e89e8c47db588d2f899ed447b27f1175aaeb88554ac19d548e1fcde439430adedb751a8a0c7cc0aee9d2c28e7ad5eb92afbc0b5e83d30c5dda SHA512 0b2dd037ecb7928c2d9462af5e535f14b47f63986c72aebbc03765dedcd1089375617d44789e9d71bd9bc304b140de6096dab3c60fdfb6af7108d386a0869eb8
+DIST firefox-65.0-it.xpi 356549 BLAKE2B 77801f130f251acb15423daeee4471610e1457f228c923335bb64331d62bc85dbf6c78ec9a0ae570abf6926db87f6e400e1d2709446bea8f36aec9f0d8e4df42 SHA512 6238c31eb36722a12cde258c12a00289800ab9cef4943c942cf5e38cc5943bb03d65e03e7e878decf15f7471bb3d5004453cac2ce788e1ef3bb714becba942c3
+DIST firefox-65.0-ja.xpi 504397 BLAKE2B c6f3a020ffc269692869e918b5f70c99c64b304c16b5f0ce462fed0db77c633670c09aff8dcb05462ebf089a69bdcb29419e2c8b4d65e3117a3ca0ea5f0bb0b6 SHA512 cab0ade26644f016e3a15ccbf467e17b4ebab62fd0a684a19a64507270a27c92a48a28fa0175a54973e23194a3a22f0a79b1fb806f7c59e91b0d384e3555a7ae
+DIST firefox-65.0-ka.xpi 512098 BLAKE2B c11c6cb2cc1b7e15a66f37b678639bd3bd48f9c0ee857e05596a72d50570f80f1b455557c889bb5df316d7b9fe8aabfa7030d968996a14c86fd4af0d3e095ec9 SHA512 4f1c28a75c907770337e6f49c6920943ffedaa3a57bd6398e603b91a311cae271ff930199a304588878e368c96ad6ec6072d659584ca83435635f3cc055de992
+DIST firefox-65.0-kab.xpi 480077 BLAKE2B 97e2cde5ec0842f9c8693e193b914851197e114e478a7d8aa4d23b564230b879721df688810646e120787e25610af9af7090c4004c12fbae397ea30b893ffe6b SHA512 c8112713867a41387a9ccc249d8f9961445b51b43aa131b92a5859a46272610c3f9ee2fc9dc5fbda769b9fe0e224e7d8026cafbb0b37aa06cefee87ef99b6a6f
+DIST firefox-65.0-kk.xpi 535904 BLAKE2B 4963a13af72a65a7f8addc5fb7ccec3e9a3a394a08ef19a3492faaa7fc19c6b42c5399efa45372fb6fdd0d7d87b3c5b7bbdbafdfd464dead4b17d8f83d1dcbbe SHA512 981df2c1d22d8ffc7d1ba1d983a5b41d139d6d405ae213b80079d98ad9ca4f98d631e68affa54506e8788fb7a2e954e14150540ad5d05ad86f7879b9765d88aa
+DIST firefox-65.0-km.xpi 526578 BLAKE2B 820be259dd9925ac18fae39a0091a318d63d3a967ff37fbee695b10a58b5d0e3d7e03be16119faffa867cd2ac01f7dc93442c3301fecb022be2bb1f3c05fb79d SHA512 d990097b2ef2080c71278e8c727543f88c847ab2f4578ecee085e907dc21de2fccfb9f97944c77e05974bf76c971cdb226d2e833ff9df717b28ed845b64df9bd
+DIST firefox-65.0-kn.xpi 528125 BLAKE2B 3f8e5bd026165e5274f14553b0e4bad743c1e3044738686f5f615121986b726eaa08e764331adb681eed8aa0202ac9abc955f2509bb13a91631591a06ebebe4b SHA512 1d0270561ceca6695d73c3268cfbda8d1bdba3f719ca5861f9bb2d5f8fd511aae3d415b8e8ed751fb2c46da4c731b4c50bf2df45a9f56112e536a78a38eabf26
+DIST firefox-65.0-ko.xpi 495305 BLAKE2B 2d81851757509998c72d0a6b2007593452f42a665f9696ed48e12c90215da84a2914c9955e00e5873c79400b47ca06c2a15e3bb89c5f0cb1ebab2ebf563743b7 SHA512 83233402efcd68436965c55b8cc83e3af768e5a9efc8777b659cf5a31eed41cf9470060e8faeee78f31ed17ac9bd7e15e13a561673b3062a69051ce6120f0802
+DIST firefox-65.0-lij.xpi 465948 BLAKE2B c735023518662c6f16f214680f06b7bba67b104f0e34fe8b9444636367255fe5003bb50c1710f424493f60bab45d08e012048aa59a7e2a5a4d5e5eabff04c6e6 SHA512 ca65088372b567b2ea69b7d96e7d1995456e6b6b038f0aae421bf5532d9f2c1f42affd93259c905e7b59f78cb19deb11860d6831056f2b7a238aef295c0395d9
+DIST firefox-65.0-lt.xpi 490193 BLAKE2B 87af99151d403fc6ea1207bd8767db92a5a102c4a07624065b852b2bd52f34d10a1d6955e8b2ce003d121506021430051cd1a2459be97e0955e5dad482c820d5 SHA512 a7ccd5f46fb92be7e6e9cfd4d82e38bb9e0a37e28d77dd6ec1eee2f9b3d9416547aacea2df8c33ac2a0e42811cfb10aeb8f24d0fea82f13383ef760d22ee9705
+DIST firefox-65.0-lv.xpi 478935 BLAKE2B e22c72cde62aa66d8ed1ee270442d2c6462a14d69f557925378a6961af832b41ea7e9293ba30093715f76addc69608f8ec2618d9198b2e1458ed512f693f0edc SHA512 291fdc7458204433f500529258a22e640ac933aaf7eb107fa0be6ce9d1861db27b12865b1b792a63b823c57a6c676562b69da6ec5a9ec06575bc9cd5a8667c2e
+DIST firefox-65.0-mai.xpi 489178 BLAKE2B b210be2b9bcf6e7f862ade17db8e7f03f0ac5837c4e398463db6f28ef4afc703e6d694319dc44de8a75a49d00fd9d046301747a4741169b27b548ef78a45abe6 SHA512 5b37b21e7604e39e14e0b68c4732122c29bbee8f8863ae8b8c6a5c268e77e1c1c8b909533886664959db15733eb819eccd380d9f434cfb97ebd93d5c14f4512c
+DIST firefox-65.0-mk.xpi 464187 BLAKE2B 040d1f5eb493f823c8f1ceae89c2a5c81613d00d0d903330fafb2c9098ab6e0103ca98647b69bb30a7b6f556703938ef8fd2d501208cd2d89ce9dfe779ef0497 SHA512 ee85597354ece18c33d093b58a3be4dd1a4a6540f3ee40397e986c60963110443f39882b85c9bcab2063820e907fd8fe8005379256608816767b20ce51191b59
+DIST firefox-65.0-ml.xpi 534382 BLAKE2B a1581c225f5f2909f5bad334d53cbe984a005b015b0f4119f2b9aa5b21cdd26cc2643ceda4928c1d63de3d922221cc036a19e9c68c454df69c6dff1434237f9e SHA512 32fc275eb10fb00fd54534ab9d5b387711ee7f015cdbdbe23bc1f56277dc5defa5ea31d9fbd561a3b4e5edb76aefc7bccd93515a98dbd77f3d1d7e3a3e73c677
+DIST firefox-65.0-mr.xpi 528018 BLAKE2B 5b3121391616d08c331861222314e0b2c1c44b1927d527e9f5723f84fe9839dc10bccfd09dc2fc902f26a5f492b8d55d6b280542e2005e6fcc595cbae7dcb302 SHA512 055f21d49ff1ca7045f5dc5e467aeee1d212e9b846f87a599871e60ece65ddf5f59350fa0b6b5774a0cdf6728c99d17ec02901575a04f8d0492a9b7caac434df
+DIST firefox-65.0-ms.xpi 460717 BLAKE2B 5df53410c4170765a1fb443643fb652c1aac1b1b82c355c4ab63f7886adc9f5a2e2034a61cb9a166031de264da50479106d2f4ae9516cab5aaeca9c2f98f9b8a SHA512 1e828ce8dc67d164a19d12acff1d5a9e4d540870df17375111033b2437928ecf4738eab04a9e7dc54df1e21879237b2c4fd87765618bddf4eac4360e565675dc
+DIST firefox-65.0-nb-NO.xpi 461048 BLAKE2B 286454d3c2f7394c85fc9b8c099eb322c66a76c679221a1e039c17d46a858300907cd08ae94a65eba1c37ef65717d00797c4423d2f34ceab603dc4786d1ef894 SHA512 aaeef10f11cdbde672504e2cf544952c394a6963d6c2ca1a8cd39fb901fd0f1cdea4f9da0962280308059d75017965aa747521ca04b5de6399ad47a47ab5c45c
+DIST firefox-65.0-nl.xpi 458731 BLAKE2B 666f9b9b2658408dc9103ff76c4a06696eff75ebedafcf9e459bcd00601469bfc96e0e42ba776e155a002f53c6f2194d8809de1a546b0df77a3700c62d6cc6f6 SHA512 03ecdd1b6d28299c54428cf737a8edb57b7365514f14d8cbba266fd6527ee280f7bdc8aa7deee78d6b48ec6e94809d20f7b9b364fafcbc9e7d52198f30251566
+DIST firefox-65.0-nn-NO.xpi 460163 BLAKE2B 00402edc07e45fba1b76d48d55516266009d19084b74e120dedb3478dc035aa117aaa408ffd929ca3ba46ad1ef7d2aeaa585505ba317f64e20b7152b7fa163b1 SHA512 b2be2aa2aabfca1a7fdb2f481bb170c44bb12d3148b3a5dc62c27663d56590bca3869105daba36cb1b2fe48754c7cf893cfd37e906d9c6d6543135e312db36c9
+DIST firefox-65.0-or.xpi 479085 BLAKE2B 4bc9e04d4afbe2ef2c40d162054cb01c060a01fa9b44344d8546cd882bf7236b6190bafd774f7f77daeaf662f42cb16c7b9cd70ab17b3955ef6bfc4aa89531a1 SHA512 04bbda20452496445054b161239292562f95f4e2b37be4199c38395e26faba6873bfd4d2065f516d95c4c8f1fdf7854db11d9cc81adea06c861f256cf521c01b
+DIST firefox-65.0-pa-IN.xpi 510889 BLAKE2B b25427f9f2e3d57344f6af533a9cf831487728a50ec63591d6f5d1d684fac34f2ff0c025b04580d7c1c31e8e4011a5c5b857c22be20db9729a024e268e0ceb6c SHA512 ce8364a8534d3f5002a0a6075623cec39837e7df76d34e4cdcac5c560242926caae7385be20a2f73d1b1872292f3e66af8dc13c3e66af8b1a4ba3adc796a5720
+DIST firefox-65.0-patches-01.tar.xz 13484 BLAKE2B 756d9e27a8df750dea4149ed8bb7821a05ccd3d4f2ccebe405cb704c0663e89643046153097089ba670fd0e4fbd9331ad1360960594c66ac82a06243bf35894d SHA512 bd93f5e00c7e637c1b5395812172e826034b0c71b8285b1daaa9992ec29e26c8a672bf3c16fbc3768f87450612b6cb10f51c201d405881bde40766ed6835c3e1
+DIST firefox-65.0-pl.xpi 378829 BLAKE2B cf1d47d896011ac1d54add46c4c64e2051419a21fd779dc12ef15a104aade07b55ac1c8c4f2a5c22b47f61bb8fc065941b3a3a7dac43f8a603d6f434634ead03 SHA512 af8ceb2e5e488b79eec9335744702291392e190cc9b528e45587276729483d1b5acfea9ce39a7422c21ebd25689c80e111394476f8540cad5bec73bece0118c9
+DIST firefox-65.0-pt-BR.xpi 463443 BLAKE2B a71f1900f432f3bd815ff85e03578228c096868995253c19aad2532d675a03d0e45764dc197093ceb3c27de025e2ce71c3d27ae8a410a8d6b3bafee6d4eb3a47 SHA512 983629b945431e8b2ae2e2a564f873bf0805bef1f27fccc609ceb16c5ef28be4aa9335a5c11d65b2970d02c7e4188e84a158a9daa06ef539ebe686bf870bde87
+DIST firefox-65.0-pt-PT.xpi 475344 BLAKE2B 9d57896255fd4d6048732f8e06f15eab8ccbd3ae6c8a7dd1fcdc599692b77cbb373d9996e1acf4bccbc4632a6e2a356330d0a795d55b8dad46d524cf202870b6 SHA512 8e4c49c65e71102c98ba38fd6c8cad53f66e256f4de1750cf2d68d9145a8633878c96504250370538e5d231364dd510ba8f05042f78b0c8f231017b879ad3d13
+DIST firefox-65.0-rm.xpi 466660 BLAKE2B f71923ef82ad239e9023d9f333b67408332481b1da23e991803aad241833a60283b19d1651c52a225f8646dc148035c68a85c4157ada2540950a4299bce9bfc5 SHA512 c8e2536375a733975411d0cb952cd9c2c9de40bb08a474467226772e6280e34e31475987b5180b2e2b779281edaf07804058df64426196cb1f0bf827a966c8c3
+DIST firefox-65.0-ro.xpi 475441 BLAKE2B e328309c64d107726caab9a8f82d2cbec68f6e98e28afad87b0635210b6a6f1bf55441a1051fd1cc112ec2cbfee102b4e492ff2715bbeaaadf8817ba2b1b1c3f SHA512 86bb80b6ab38f88f288039c749ace3eddb7619d5b469611b0c0e1d2c09d9951439fc2f657cb9829b37c6f3336adb0cb65a04ccdfbf38f40e54b4ee38259ee57b
+DIST firefox-65.0-ru.xpi 542358 BLAKE2B ab445df21f847b8f7672307c53f4def2c5ac4b4a2d3998afa8ac336675c51949b402a8b65c8b25460725c647d4ee7d9c7a90d91ffd0836ccebddb10695122387 SHA512 cabd487c5f085b76f731cf8e2a608ccb99dc4d88cebe817d496a82837bfecdf8f0663caf2ba65f4f0e27dfc5ea1feb99e57264deaa4e11a7182ada4aa7d6665e
+DIST firefox-65.0-si.xpi 491181 BLAKE2B 7ea139acd339d0d279dba0f345bc48c2e65e06859a2d1c46f91836d996dbc1075fea703558920345d4653d800a6b4d2846c9064cef1b5b95822ea578b9f366a2 SHA512 4882b6590a86fbfc512579c66005dfa345a8df166870badf76cc67cd8a4d6e1db5c2460904f90ea36da2b7ddebd1b01a955e1007cf315cb9664b2a378f124e53
+DIST firefox-65.0-sk.xpi 492573 BLAKE2B 21c252d02746c678010d28a3d3e3bccca70bd4a105a213268ac92e95eb70524bad092ad144f11f1a9275c0ba54ac15a0815454643194eb04ed9992eed232298c SHA512 7318a37596a305a21f65f83b8437b1158f2d3a5ed2e508e3c5fa83fd94e19d3dafc091c0415e89364bf8c56fd79ba763ce347acc77ca98780098a055528b44ad
+DIST firefox-65.0-sl.xpi 468039 BLAKE2B 27d7c9a3375e3aeb2857696baa674daf4905e0a5a1d1e9dfcbafebd9571a888303134c7ca79cd865def79704306c435721ede5456c35d760879550f48100553b SHA512 1decbf03bddf5e2d6d5df18d60327a03544c33b6ac63ec22c3e630fa35820db9e8035d9091e1b4e1629323c19ac38dd49ab0d46d0f69113e5fc7d28da402c25e
+DIST firefox-65.0-son.xpi 443501 BLAKE2B 1645678f284d9b7ad4c7505c17ce821af8ec5be7dc299da4df3a54d1058e796b25a0a1a85dbfc85f738deff6b0b0a74ff301a19e5f73096985de363b58ea4bf3 SHA512 c6ad371e379145463f258abbbc37c17c89dd487a15d5c30a438537e9785389a4bab3146282837bb11b11b0bbaf8b527a0e56fa9d4f7409ccf7ef64e304040949
+DIST firefox-65.0-sq.xpi 483758 BLAKE2B f6d52d68ec0d2592eaa73dcebf96055b504cafe3057d733a2c508ca283129704bbe2f040afa77e141b541ecf7c4e58d13a0e7642c8f7495e05a731c3668413ed SHA512 85051fdbba4bca2a9e50ef38a93452b82c5fdd8aba8d186888a18c3b42747bec228273e587753152af591bc004898138da1141576ccf054d60de316f37e27688
+DIST firefox-65.0-sr.xpi 498950 BLAKE2B cb1f18939d120cd589e16b0e5e0b78cb0e502f2a67652106b74927d025a9dc21adffce48d3af2282918bae6282b085cf057495305be226731fbde8551a6fb0ed SHA512 c62758cafb913e73cf120a75f365b9ea86d03aad3ab02d339e0b33063a3d74f474acadecf832e3751485be1deb2534586f9e3d8beb4fb506d4c5f93f9ad944c0
+DIST firefox-65.0-sv-SE.xpi 470813 BLAKE2B 3c1e90eda65456fd739074bfc7fc670abc5229a0d04c734d1e76e1f33e5af84ec865e27abd4b7a43769b73725d9bcd3525d220737a155a40ac0ed47029b42cca SHA512 d23d3356e53121fb3f708e2c1f88ed0693bc1fe1682697000c50ce8c8f02229dd7246f4d7b896aadf96f4b563e5e3bd318b9aa171da36cad1e7f73974926adad
+DIST firefox-65.0-ta.xpi 522778 BLAKE2B 0fe74c96266391656eaf8b042a624bc6f9bb93bc0ac75597d9b345105b19a2697d3a553c0875ce681a3f95acbb0c63024ad688cf6d20fc8448ff1aee6de0b11b SHA512 8bf87d0915232e314edfacc3c2080eeb65fa67f176bae53814a6f9b4b67a420107f4eb4b204e84b2f29674ecfa74bef51baad02286029706abe6c616dca94853
+DIST firefox-65.0-te.xpi 534585 BLAKE2B c9e82862485e34a5d3653b3a719e342a8106589e105651561f06f616c589c3f9540f02d0aa16d163a3168e9679141cc9eac16e9b80ed8d89f3ef7fd4e86b228e SHA512 9421d08247a30bffd750e6faea485da01d205488b855f3526b9109271cb8bb99fdc7e4bd779ff55e64eec63355ccee7c85ce97af6e5ef9ce52fbd439859fc275
+DIST firefox-65.0-th.xpi 507521 BLAKE2B d2f08f40c2cdf4d7d46fc701e0e168aacecbcd03a045c358351efbeba89d2a21998638e35071c0d56b43b782edcbefec95a77853b7c017de6642bc43ec69b9b1 SHA512 9f8e5107875903c412f12ff9bf87aa5beafffb335112a6c86581bc14186b2c7a31a1c0e2c472ab00be0b838331ae8793be59de94c651b4d2b6c343aa4f79cc3e
+DIST firefox-65.0-tr.xpi 481299 BLAKE2B 9c098c7fd0ed8cd2c16ba5d0b2f3054e5e5200214f0f2968dbb25206baadff400a72a7804390c642b0cd5f9f430b535e67448863272d9ed783713d83ec0ef41a SHA512 7f156cc1d9c07f8069c77daeb116c528c3c4ffa37a753d0593348d78860ce957a6bbe05eb377b4ec6a8aa95f3fb24a2cfcd0a71917b82c362e11de9efa0e9753
+DIST firefox-65.0-uk.xpi 528931 BLAKE2B 6247b254dff6662695201de732a937d3352e331048af7693d16ce9dd98827b3af62f20d34ea36956b46256c6a07078939d8f15e4a473d39a05da0a8a465ac689 SHA512 b6f241b19e5801ad045011e2c4b9656755c8c1a77318f5d2e7e66c9f85c40e010ae84d8de778ca3c3ada86735764cff5b1bd709ced20c215c2568c8ba8548e0e
+DIST firefox-65.0-uz.xpi 460813 BLAKE2B ae87f035710046c1e15d209cc3da611eba1159f993acaa505076037541d6441e49926356023770fe415b8c82639ae349553d8c2f87bfcf82703f264159647de7 SHA512 682566323bed7f1833a98588599c8932971b8e9d429be7c375dbdcd66b551e5619ac4966838d6f39ee38c126e468490330b8f2a923982bde5449bab2fb94a06b
+DIST firefox-65.0-vi.xpi 486524 BLAKE2B 68589ad2487a8703517aa3409995fc19854c4f60f2ebce78a60243eea4da2d9c8761b1f042baad812499c1ca6c86d7628d98ebe2ab202101791366bb5df7bcc9 SHA512 90aa1e4352fe4f980cc18b8c35b61f8c1b71e2b490f5fd0eaa03770d24feb7e69a68aec08a9342ddd3d42a620a73bb4f69051d6c4e34c06799fcd60921d61f3f
+DIST firefox-65.0-xh.xpi 455414 BLAKE2B 96e131c7c5766fb8068c4714a69b0b8db7dd67e6b398e3d71be814a9138117ca6ecbed87cc00c10ea7e25a48636f3a445018ee5024c5fbec0067c05f5bd84534 SHA512 a64aa3e8978ae47ff862c27088b99bbe03dc0dd2b786160c4cb0ec839c2e7dbc22d0cd38d4ad8d267cf84bc601cd2232f10d5ac8070c8eac97fe4d8904a45080
+DIST firefox-65.0-zh-CN.xpi 494803 BLAKE2B 89af3f0830ee2dbbdecb206834e6098015fceb046efd644d2c3abbe7a892f0cec9b73b3c81aead84c017ac5f4d05485a56dafc144b7acf5561cfbcf4bb60457b SHA512 56ac0c0f56560c11f2d2b6a57f9774796ae45e892a69fa93b779a48b235d7fee5350a32e55a96c430a9e13e7cff5306bea139fbe15352efae216ca233ef1d547
+DIST firefox-65.0-zh-TW.xpi 492966 BLAKE2B 29af124152206fc722012e8cce49d590dfbdd2c165afdfdc679ef1001815296baca28b722a0cbd80e4a43061bdb1101027b092994641f7717a5d1cbc4a7ce5aa SHA512 27f7c1a37d4c86ffeb1db89bcbb36abebe1361189654bdc31b9d7cf1ee9dc85127cff71d396172e1f014441c2f21204334135b88fdf8005fd55898707366cb68
+DIST firefox-65.0.source.tar.xz 278317028 BLAKE2B d22312021e0191050134995a442aa2f0f46a1c1d3f1ba40311e3aa755f40d049b07d91aa93cc7fde65352c51bc1482d999dbc43928ed03130799b063664abeae SHA512 10ab04612c55f020fd4fe9ba7184f77e27bb62e7204ebd4e2e8e4af9fbb97b5594dd057b3c9c1fd960a48cedfd09c11939210dba873cc66ee651dc83dc9cbed2
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.4.0.ebuild 13109 BLAKE2B 801e447f2c1092d9a609a55f503e345124ae5ef2a0475d412db0fb0976f54439a21afd3734da065b9d232a0ff19f8cb0c185da086798cd3b9b074a0179bf34e3 SHA512 9fcbf423d429c7609646c45a0a9cdfaa36c0c0781ad924ca9152b80f7805cd5cb8ec4c2a4d2705132d4ce9d96ccb37e4d683692871f1c90c9e35e7417c91723f
+EBUILD firefox-60.5.0.ebuild 12961 BLAKE2B 47aa339449a2d9e495e50034886276e17c3d7f71473d1dbf60bcf6817abf8a94ec39d1eab4d6ca2ac54be2c9290f96edda50a6febea64b3e4a7d5b3b13b41563 SHA512 93dfe5d6a8be6e56095d62d4d8516eb5635d5c8d90ab7ce114e44d0429be36c9ec63cd986f6e93a5ab4dcc2b8b2d39f31d233714253f7373d56b578570c4a6dc
 EBUILD firefox-64.0.2.ebuild 21029 BLAKE2B eac7a907d5b30232fb8d4cb5956f0375ca2364ce9373d9c2c6c88753a052f2d59a2ab52f826562b78a26b92e6e95cc7a6ddd48100f6b79602861c8c6d772f2a2 SHA512 a198dc420d93801a9f9198563fd00461ecec8d1984684aeb041f46bef5c51f002ba6e59edcd3aab93a8fe9ba6f52bee4befdce8a307157ebaf53464c96ff612b
 EBUILD firefox-64.0.ebuild 21029 BLAKE2B b2efd97d8713756d7a594b7e8bed66080b62f8da1f9b63bda0f9fa842d0c65552c298d95d3023eb787587cd55447cf195e8ea632a2ca972bbf3dae8f0ed11ef7 SHA512 f4addd905f0b3125573fb2fedc0e7726152f63135d9d798885c00a4e71dc26025a3fc7aafc82da29c40b7ffa2d94d23d576de3983be39a49e669816cb1e499a7
-MISC metadata.xml 2290 BLAKE2B b820d2a49926c5b313d55161a92e94ef88638a2c21d80d346a0cea93d2d9d2f6e81f23c45d4f4b759357f19d91f4162445deda77e8ef7dcc87fb5bafc4bef930 SHA512 42513d5043efca1f8cf3cd6e9114a84c2013c3f782dfdb0f2c1c3a27b0b1d95d889f032b0df7b75a3c97d07782f70fdc316e2944fafb2a140d191ae4127857a7
+EBUILD firefox-65.0.ebuild 21710 BLAKE2B 9e7ecf0630f951b6de98afef7dda7c46a5f3cae5ffab55aedb53efcd8e90b24993ae3360b1a7c52fc9f4e4832b726263164fa40137eeaca6ebabf815c7ee33ab SHA512 2d6955a3828658512ead9402691ce1bdfab2d4809fb65af35ceeb333058dfd35b7b5b46fe46edecbf5cccbb0b6c263767e8ceea329dabbb1a1904f74c869ca76
+MISC metadata.xml 2397 BLAKE2B 6c0f67d6732ec78321497ebbe547620e91ef12b5a635826307085eb7f288429f0bda54a79205ebbe2e3ccde2a775e33ecea8011a66adddaea4a1de42501d6724 SHA512 7bed3ec1b0ee7a8f2e13284516b00f2996a260d3521aae52d61ea56b0c0588993718d3a74bf68e8bcf384b1451452b4c97b188ab360cc0653321415f4bdaa03d
diff --git a/www-client/firefox/firefox-60.5.0.ebuild b/www-client/firefox/firefox-60.5.0.ebuild
new file mode 100644
index 000000000000..c457f085a7ae
--- /dev/null
+++ b/www-client/firefox/firefox-60.5.0.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-60.5-patches-01"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test"
+RESTRICT="!bindist? ( bindist )"
+
+SDIR="release"
+[[ ${PV} = *_beta* ]] && SDIR="beta"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	system-icu? ( >=dev-libs/icu-60.2 )
+	jack? ( virtual/jack )
+	>=dev-libs/nss-3.36.4
+	>=dev-libs/nspr-4.19
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	amd64? ( ${ASM_DEPEND} virtual/opengl )
+	x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/firefox"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Default mozilla_five_home no longer valid option
+	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach build --verbose || die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if ! [ -L ${lib##*/} ]; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/firefox/firefox-65.0.ebuild b/www-client/firefox/firefox-65.0.ebuild
new file mode 100644
index 000000000000..556ea09a80ea
--- /dev/null
+++ b/www-client/firefox/firefox-65.0.ebuild
@@ -0,0 +1,666 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-65.0-patches-01"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2 \
+		virtualx
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel
+	jack lto neon pgo pulseaudio +screenshot selinux startup-notification
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite
+	+system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.41
+	>=dev-libs/nspr-4.19
+	>=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/gtk+-3.4.0:3
+	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-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
+	system-icu? ( >=dev-libs/icu-60.2:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.25.3:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.1: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 )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.6.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.30.0
+	>=virtual/rust-1.30.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 )"
+
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened ; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+	# bug #669382 #676908
+	mozconfig_annotate 'elf-hack is broken' --disable-elf-hack
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 ${_virtx} \
+	./mach build --verbose || die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot ; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index a4a9dced62e9..1032b6edb789 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -37,5 +37,9 @@
 		instead of bundled.</flag>
 	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
 		installation with secure-delete enabled</flag>
+	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
+		instead of bundled.</flag>
+
+
 </use>
 </pkgmetadata>
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 9a2c5e31ae83..49cd27dc6570 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_72.0.3626.64-1_amd64.deb 58378464 BLAKE2B ff5b17955f508349074fb1f005d2062e0efd633787df4696685b00a0433b156568c62a8a29cf8d800dd81541391d7e427119949f5fd76b52b6e9b635cb8a9571 SHA512 c294f289bdc93a2323a607b00eb5a0ae0e5217bb76604c3a5e90d480f3129d2eb77bb0150af6fccec5ba2c9ebe2ef9e3e7ab2cd6048019542c865a1aad63770f
-EBUILD google-chrome-beta-72.0.3626.64.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-beta_72.0.3626.71-1_amd64.deb 58360214 BLAKE2B 0cef3065af93efc258920d98b145ff14423e5c8a9d3bede7becef3b2058dd5f3d9fc4b273581dd8575d21973de55f6007d8b2b9fd3a93c2ed1f4c76e1bb5a253 SHA512 52ac25b235ff8614ab2672af31ddd94f9b95ad6f1772f86f2e632b72647642abf8ac8d9111de87d6bca7a17418100bdda801cb61c4cfc63b5c531b9018c512e2
+EBUILD google-chrome-beta-72.0.3626.71.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.71.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.64.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.71.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 44e79ab7938a..eb134f83dcc1 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_73.0.3673.0-1_amd64.deb 58449494 BLAKE2B 112287121a6fd309b05a40fe6c5c0d557253ed5a52ede6618a3a767c154d70e8265e9fcca1b720f18a48b9d5a9089496169d191f9158586dfecb5fa4ec0aef32 SHA512 c2bcac1d792cb4f602b1b08483b788efbdf4499bc765ee88125f357b4f8fc1e0f170ce1bf05ea52631254382724fe8781e4cdb768805d5a4a4a49ae6719af7fe
-EBUILD google-chrome-unstable-73.0.3673.0.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-unstable_73.0.3679.0-1_amd64.deb 58489980 BLAKE2B ae86ce9cf87fda474fb024323d84a7a173c0f021bebb5bcb1ce758ed273d0f78646153a7253df1753a9d5f78e229c171a537c650f61ac1c74c34b860dfb05054 SHA512 9fba3e4c2d947d6c34c1b9232724a1696cda3da2efef0b4998c5756cd33c34287689bc7070914f96a251e5af61a3578be96ff056b5f5454aaf0b23fd8ff90088
+EBUILD google-chrome-unstable-73.0.3679.0.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-73.0.3673.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3679.0.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3673.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3679.0.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 9537fb4ecdc8..06922f55a541 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,9 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
 DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
 DIST links-2.17.tar.bz2 6694577 BLAKE2B a762dd810d8d939c3276ca13ed8460cc486d275e3436015440527fdbe16adc29ccf4ff26c59de2354c50cab5fbc6ce72d4b94cc6e731e4295f86f892eaf0af64 SHA512 871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5
+DIST links-2.18.tar.bz2 6703625 BLAKE2B 7fabfe805e5701bf254c7088da22f03125debfe764815b649a5533bd53ae6b61195c7005391140673baa2aa87f356e8134042f78404b6abbc4ce560ec75d7085 SHA512 fef25d90985663c64ab04d6b6ef445ef2ac80c8b297897ff23b7d798c0607b90c86432f1a6fc4f02d1b1e61fe934cd01cd554c5765500248e8481f5cfa71da51
 EBUILD links-2.14-r1.ebuild 3154 BLAKE2B 2a7da112c77549c395a25ef5e10e07370f4cef1662b7165f26757b56db9752389bfdea21c24f2ab6d579a9673bad742dab3450280ee9fb37483bd4e6a26e0859 SHA512 7466c89b39e13047cb68de185499bab9e8d89fb6df88610104bf3e8f0693fc0d3f2c03817a5b12de66e63344d07bb318e2675360a29ddf1a03c31797434a3b4e
 EBUILD links-2.16.ebuild 3164 BLAKE2B f6eabfc12eefb0bf2cb96ec494ee464c0c581afca3b4e4142f616e007122158d9bb0c8ef06acf26860377a1c84dbd7eb1b2ef3697604ab9b783a886046c938d0 SHA512 f28d9f11d8a1bf6e156b9ca79a0160861fd5fbb2c3dac81b5c690623e22e1966b0c59fd11134fcf5687b2906a33d537983082e2f1cb0fc7d57485b1328901cbd
 EBUILD links-2.17.ebuild 3164 BLAKE2B f6eabfc12eefb0bf2cb96ec494ee464c0c581afca3b4e4142f616e007122158d9bb0c8ef06acf26860377a1c84dbd7eb1b2ef3697604ab9b783a886046c938d0 SHA512 f28d9f11d8a1bf6e156b9ca79a0160861fd5fbb2c3dac81b5c690623e22e1966b0c59fd11134fcf5687b2906a33d537983082e2f1cb0fc7d57485b1328901cbd
+EBUILD links-2.18.ebuild 3161 BLAKE2B 91f7b0891538716f78bbe4e242b7f537ec7c8d3d4b8be20a3a4c817c8d6dcb61977a718e28511cd90f64230f38834a498b71268f324e451348d0fb466319018d SHA512 76532be439333dbb7a623af789d0795d436deb90c24f6687350024afc006d6ff6f6fd623553f40392641ddc6b894565b062a0653b13d681755e954f7c0c934f3
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.18.ebuild b/www-client/links/links-2.18.ebuild
new file mode 100644
index 000000000000..fba1f9ce5002
--- /dev/null
+++ b/www-client/links/links-2.18.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+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 ~x64-solaris ~x86-solaris"
+IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	xdg_src_prepare
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with libevent) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_preinst() {
+	use X && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 882e5aeb07a3..751b0aa15341 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_59.0.3206.0_amd64.deb 72786094 BLAKE2B 4bbecd0a0e9569259c17d54f0f47a1c80589c22c562033dae5253fef8078434b49efd5dcd8c5dc9ea5dea6c1c677f342c266a4a3486a5ed402eefbc8c65a7650 SHA512 a04ca66095ebb2057f80ffb421284f677f566b87c0d29a709921497a546445fa5db6644e95dd7a82b6bf3703f9c134b30efd75550c32057229fdad26334e43c3
 DIST opera-developer_59.0.3209.0_amd64.deb 72788730 BLAKE2B 2553bb432040963fdb92484aa4c38d7d0fe9146c297cc725b97ccf842d886cbbfa24603068fb36d19ea26a3a4a014040e5d7038750222b4f30579068f21baa7d SHA512 2d46ce04aeee887cdf85bbda4f29a62cd3fdc33f44a0ceebc0a6349c83d71128b083e0c9c8047f1ea7ea124b894dc5f4842b3ad2b154d9cd2717c0d10025f6f2
-EBUILD opera-developer-59.0.3206.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+DIST opera-developer_59.0.3211.0_amd64.deb 72210034 BLAKE2B 6623abc0d3cc3a48fb21634f34801bf17768bbb646f9ebd9fed8002660f106f3f45de7b827725f105d9870c0c6897a5928d4afce8cac0eb522d698f1220dee5c SHA512 53deed08e954c743d4e7b1d70dea66bc1ca60bb6037bd9b0929e90ef5402477af40742863a237f96d2b9ccc73fa69bce08efce9ffbcae9aa1fc2f6b00ea79018
 EBUILD opera-developer-59.0.3209.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-developer-59.0.3211.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-59.0.3206.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3211.0.ebuild
index d6081fb28694..d6081fb28694 100644
--- a/www-client/opera-developer/opera-developer-59.0.3206.0.ebuild
+++ b/www-client/opera-developer/opera-developer-59.0.3211.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 19049a78e348..553da640445e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_57.0.3098.116_amd64.deb 69884028 BLAKE2B 4f6979c598a6a7b3283da0947262bab7fd6aba60fe74c0a113f3cd91a90548c61158421e6418cfe70e9817afff7da772c01279670092214b92662ac36e9961cf SHA512 2b774b6103af0508bd0ed2e82a65599abebc28ee660f6fc73a50068949e06090b1279e5562ad49390a070ae4c04dd93924641d6313b4f7b204d0eafc83352dd1
 DIST opera-stable_58.0.3135.47_amd64.deb 70369746 BLAKE2B 64f49d912bc97d1ced9fc085d0ca7c4a27133f060e287269348e51771bb612fe11f3441250307893c5a80854356694a937e7330abbef5006b60e741f334d2dfd SHA512 e4d52eb82eb47ec066182c76de839e87feccf8edffc55eb1515fe02ed39b86dd682e84bb49976bff934d876be4c607a2e430aedefe5eb64596ba028ae20d07ac
+DIST opera-stable_58.0.3135.53_amd64.deb 70878962 BLAKE2B 52ce54fb2670344b40be51de9e5c0ff69b062c7284b7a72d39b23e266bdf733bdcfaebb88dba187c118163f9b43bc15b17949ef7ea02fc78006f4757be4b2e16 SHA512 a8febc4071bd7ac51ce0778bf3f178b4054f182c1a77c1eafcf7645bf3e3add8e9665b217cd66a3783255b77c07928880bbb3e25cb35c217b6504610ed5f9fb9
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-57.0.3098.116.ebuild 2303 BLAKE2B 60e55c55eb93f5b3df8b34b822c3b8a43b240b459dab602d540cb39029009f909c97e2bbe33c3349532ba419727fa4783e576f8be840f9446e51c0e636bcb669 SHA512 8236bdd316026522d515bcd71315476df4a0b08a91af5b3e242e68e64be566a91d2efb08b49cd57d47cfbcd88c57c9e8c22f788cd5bd92ec5e0c5c473bc65837
 EBUILD opera-58.0.3135.47.ebuild 2303 BLAKE2B 60e55c55eb93f5b3df8b34b822c3b8a43b240b459dab602d540cb39029009f909c97e2bbe33c3349532ba419727fa4783e576f8be840f9446e51c0e636bcb669 SHA512 8236bdd316026522d515bcd71315476df4a0b08a91af5b3e242e68e64be566a91d2efb08b49cd57d47cfbcd88c57c9e8c22f788cd5bd92ec5e0c5c473bc65837
+EBUILD opera-58.0.3135.53.ebuild 2303 BLAKE2B 60e55c55eb93f5b3df8b34b822c3b8a43b240b459dab602d540cb39029009f909c97e2bbe33c3349532ba419727fa4783e576f8be840f9446e51c0e636bcb669 SHA512 8236bdd316026522d515bcd71315476df4a0b08a91af5b3e242e68e64be566a91d2efb08b49cd57d47cfbcd88c57c9e8c22f788cd5bd92ec5e0c5c473bc65837
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-57.0.3098.116.ebuild b/www-client/opera/opera-58.0.3135.53.ebuild
index 28c78dd8a552..28c78dd8a552 100644
--- a/www-client/opera/opera-57.0.3098.116.ebuild
+++ b/www-client/opera/opera-58.0.3135.53.ebuild
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
deleted file mode 100644
index d2abdbd4920a..000000000000
--- a/www-client/qupzilla/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST QupZilla-2.2.5.tar.xz 2532760 BLAKE2B b9bf3f5415aa5a06397a7b9f98f56a16a7c9238d561bf6a2583214e43b23c53c825c8274b51ff0e34ced8aac6077c12dad60968d88abe810ccb35dbd2a457e0e SHA512 78e02141f18268a5f31a896c49e4f6cbd709e609dfcdb50277fc20123526e5316b79ede612dcac74ff07103334c381e4d657b18b6e187a10983d5a44a649858a
-DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
-EBUILD qupzilla-2.2.5.ebuild 3168 BLAKE2B 80a43b236bad4887ce94d26580e0018a53169f10fa2dd78b3e09617197e0ad8a87d69386da4bb502703ccb431bf49a84fa92f4ff8332b493c3e0717586ef089a SHA512 3a68d13d169239d0d939b9fbf28c27143e2f91668006b17a6e660e0bb7781f9029e57b5c5ed5d63446f38656753e25cfa5420d990079827ad9fc4b8db0594529
-MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
deleted file mode 100644
index 0f7954fa4ccb..000000000000
--- a/www-client/qupzilla/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
-		<flag name="nonblockdialogs">Enable fancy non-blocking JavaScript dialogs
-			shown inside the page, not blocking the application window. When closing
-			browser windows with open dialogs, this can crash the application.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">QupZilla/qupzilla-plugins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-client/qupzilla/qupzilla-2.2.5.ebuild b/www-client/qupzilla/qupzilla-2.2.5.ebuild
deleted file mode 100644
index fae01513ce11..000000000000
--- a/www-client/qupzilla/qupzilla-2.2.5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_419 es_ES es_MX es_VE
-	eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP
-	ka_GE lg lt lv_LV nb_NO nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK
-	sl_SI sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA
-	uz@Latn zh_CN zh_HK zh_TW"
-
-PLUGINS_HASH="80fea7df7765fdf9c9c64fdb667052b25f1c0a22"
-PLUGINS_VERSION="2017.03.26" # if there are no updates, we can use the older archive
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
-else
-	MY_P=QupZilla-${PV}
-	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.qupzilla.com/"
-SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
-
-COMMON_DEPEND="
-	>=dev-qt/qtcore-5.8:5
-	>=dev-qt/qtdeclarative-5.8:5[widgets]
-	>=dev-qt/qtgui-5.8:5
-	>=dev-qt/qtnetwork-5.8:5[ssl]
-	>=dev-qt/qtprintsupport-5.8:5
-	>=dev-qt/qtsql-5.8:5[sqlite]
-	>=dev-qt/qtwebchannel-5.8:5
-	>=dev-qt/qtwebengine-5.8:5[widgets]
-	>=dev-qt/qtwidgets-5.8:5
-	>=dev-qt/qtx11extras-5.8:5
-	x11-libs/libxcb:=
-	dbus? ( >=dev-qt/qtdbus-5.8:5 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( kde-frameworks/kwallet:5 )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-5.8:5
-	>=dev-qt/qtconcurrent-5.8:5
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtsvg-5.8:5
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* src/plugins/ || die
-
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	l10n_find_plocales_changes translations '' .ts
-	l10n_for_each_disabled_locale_do rm_loc
-
-	default
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		DEBUG_BUILD=$(usex debug true '') \
-		DISABLE_DBUS=$(usex dbus '' true) \
-		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
-		KDE_INTEGRATION=$(usex kwallet true '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 863d3b608ec1..5f31fe4ca30b 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,4 @@
-DIST qutebrowser-1.5.1.tar.gz 3566699 BLAKE2B 55a5df744fa0558697ac38d020c40f358c64d9e47e887f77489c125ee359fa93b0af530aa5cb44491b98481869a7341c4b782055eaeace72be2795e763db969b SHA512 6db4ed253c9b69aeed190c4920f85e2fc87dda5403bd2b263cf92ec47569e64b8275677a45c4de4f255fd6f9987d90fc2ccacb7bb10eacad1ca683daa0ce513c
 DIST qutebrowser-1.5.2.tar.gz 3566709 BLAKE2B 4b317c87770cbc817e19808f7e1ce58c030bb8567aba21bf23c6d57f136ab13763ef6b6cdf0c078428b7b228ef32b1156eb1ab125df037a5073c110f83df806d SHA512 29c48d86b95bf2b40459ef06dab37fff7e30409f78d8c50c494ebafc9698a0c0123a63d160679b3a4778ecb15e5c339dc67357a60f493499ad4b6443f7dacc7a
-EBUILD qutebrowser-1.5.1.ebuild 2016 BLAKE2B 08656591e6576d6465bb48ce0e4a51ffe952cd391702c39a2f8868237d817cd3e41b17790226fcff4fb04d86ce5772c7aad2b45d55cdcf7ba20a3c33cd3fdbfd SHA512 3cbbadcf0209765038f4a2fe95a89a76bc44503ce66d6d32322cd8b8bd4792651be06ad8846088de25fb112687a2675ac7334fd82adb7511fa468fae961a71e5
-EBUILD qutebrowser-1.5.2.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
-EBUILD qutebrowser-9999.ebuild 2016 BLAKE2B c8baa854aa36a9a7a65d357f762ae35a2bdf82e86d00d637d36db1a3cb69e46a3657deeb5253d9a2dc907cac00422b684b4185d324ba9cf3ea9192d467c962de SHA512 c84bb4603ad2c4236c15c294109bc0c6e46b805b2265541f72ded5f1037eec20831ae255ab85458b8aeae6f3357e292e7ee824c8d38a945c9f5ad25a0f0f440a
+EBUILD qutebrowser-1.5.2-r1.ebuild 1980 BLAKE2B 7c1a7e42b25c95f5af08eca93ba8add13583bb19d5e3313c18497bc1313ec20b94065c9872de2ab8dc1e48bd780b53382acada68e431c57a61c2809add45400f SHA512 288c5a7aaf50dda6c03d27e90b7b959423a86850beec6af914b18ad24217b38bc38b88fdfa1b930eaf62307e267d50f5a6421319b113ecf1a69c7598341b6085
+EBUILD qutebrowser-9999.ebuild 1980 BLAKE2B 7c1a7e42b25c95f5af08eca93ba8add13583bb19d5e3313c18497bc1313ec20b94065c9872de2ab8dc1e48bd780b53382acada68e431c57a61c2809add45400f SHA512 288c5a7aaf50dda6c03d27e90b7b959423a86850beec6af914b18ad24217b38bc38b88fdfa1b930eaf62307e267d50f5a6421319b113ecf1a69c7598341b6085
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.5.1.ebuild b/www-client/qutebrowser/qutebrowser-1.5.1.ebuild
deleted file mode 100644
index dc148cdc4722..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.5.1.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
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,multimedia,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..9870584a71be
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild
@@ -0,0 +1,72 @@
+# 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="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
+
+	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.5.2.ebuild b/www-client/qutebrowser/qutebrowser-1.5.2.ebuild
deleted file mode 100644
index 2ac3df7f628e..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.5.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
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 2ac3df7f628e..9870584a71be 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-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
@@ -31,7 +31,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=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}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml]
 "
 
 # Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
@@ -58,10 +58,6 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
 	xdg_desktop_database_update
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e6296863f192..7b0012b06e13 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.3.1430.4_p1-amd64.deb 60070842 BLAKE2B 3e8916863074ba212d3ff3675d2ee107ab537509cecbebb99319f37929ae9bb1053377bb3369e409f0fd6044431a4e029d62dc7de938edc77889185572dd0b23 SHA512 7ea0728954dba05bb69e6a73bceada063e7a4b78fce02ae11bf4f7870a66d27a6f6749cb945a4706ef70bc03e5063fd5e5aabf0933953d37c241eb864a030e4a
-DIST vivaldi-snapshot-2.3.1430.4_p1-arm64.deb 55566018 BLAKE2B ea2ac73e8750b7d8da4a51e528f64e766db78d01fdabbe7b4099b08ab0ff4b34f6712eece6a65666348b3cd7ffa463ec83ce2bab68e548b9afd58be100d7caf8 SHA512 22e3596cf883fadb6a2e54ce4f14f91c41c0f979c4598730345241b759570f2a4951c786a34f256141265e0ae46e19b56b64cc2d20db68fbb8bdc6691c30c716
-DIST vivaldi-snapshot-2.3.1430.4_p1-armhf.deb 52620910 BLAKE2B d13e4deedd9b65b4837ad934a57a0981e0cc6e47a2243a423ab23e7802b3fe4c7ce9bbcc91936c3c9a6685194a6c9bcebd2f80a13ef0f8fab8eb742d1021b0ad SHA512 703ac9587c0d1f0c273ced6211072f8e53fbe6cb6747cef8a4171d6ce2f683859dead80eb20bd0ef140fe5b41d697762f244282ffddf5678793bd6869f5de053
-DIST vivaldi-snapshot-2.3.1430.4_p1-i386.deb 58168494 BLAKE2B 78774db95227fa1e2da19c647ed2d65319a74036ac7ed05f4d51c4518003cfa74b9dd356c6d91b5da3bb77eb055a593a94fe8e74ed8285ed6988ab33dd0dfb5e SHA512 f155cfbd3825b70387d45696cd8a10d8d37345bd2a3ed59751e3e8529369028c64abd80dda59e8d9517b53422569680143053fbb95cb3aebe3bd7f748b627f5a
-DIST vivaldi-snapshot-2.3.1435.4_p1-amd64.deb 60053830 BLAKE2B a27077bff1f6c9efc4e2d6603bfa67ceb061b9c9e005bbf0106c44f18f2f8ff3461b6e39a012a22d9fce8d475eb3208071fecf22a9d23417abfeb1320134f1e6 SHA512 3070ca51a07f2164f86f37bd981238fcf09e767307c2b0a7589c9291c3890eb035d08c788242d53c9d1cf460fd24c99e04232fd0b86b9478eb2ff5cf33d5b3f8
-DIST vivaldi-snapshot-2.3.1435.4_p1-arm64.deb 55518226 BLAKE2B fd0762af3c632b59a0784008e479fcf096d05943e9169019d4036367b5d52230e1e9754121c4cd09821a35e3604517e8f3f62921c8446fb42a421b489aed0d58 SHA512 dbeb57f4d603e1692a4c9f3e73d2d415f4a908872afc3d44703d50d3ddec3f3e9ca4e36c9f32c93f6b86facbec279e53f2e12d91d7d1dbd4793072ed1dad18a8
-DIST vivaldi-snapshot-2.3.1435.4_p1-armhf.deb 52637338 BLAKE2B 614f0c2c32b9fa9cafe44aae2971b11842fc07d9ebc78651c6824d5155cdbfc0d8f8f2f0e1a9b29baf1c1d13a66033535f22c17f51b10cef906a2666e1120b5d SHA512 c7724e82291c0c219b017d62bb3227115aea8ba2aa5227c30d6eca508c97e8324aa8bf5f979b418490519747f21602402c08cdf8f4f953c6e3cf887b82409d84
-DIST vivaldi-snapshot-2.3.1435.4_p1-i386.deb 58230554 BLAKE2B 32b11af7c021d8326b1d4924e1047060db24e04da6e943f070528db18425c9e4d0155740b94086efacadc97ec73e49495a0bcc1d9c2062239f240c25e8a05c2f SHA512 4694942262e79b2628e845ef94e16bc881015e0deb2bb93e5b25862e5f6fb4c2d6a1eefe013512c48de0c18e907efba8b8a545610b9e6c5eb73eb93b00c826d0
-EBUILD vivaldi-snapshot-2.3.1430.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
-EBUILD vivaldi-snapshot-2.3.1435.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
+DIST vivaldi-snapshot-2.3.1440.30_p1-amd64.deb 60082270 BLAKE2B 46f87ffcaf4037432a5a1dd84a4ea88392e2f1e822c746e3ae6d7085d7f71b271b3c785d4006021050c127ed675eec9707ea413f3eefcd3f69e7423cc3e1a078 SHA512 24966de38644f804bd7439f5bc15f143b889f4c7596a64608ad30491bb533dbc3610dda1b2db8c4eb88b3d52ce1015f0d2e0177bcdd877bcd07631109c3ffb60
+DIST vivaldi-snapshot-2.3.1440.30_p1-arm64.deb 55528562 BLAKE2B 67cf470363a74067253b88862436931bca147c259ce7b9d79d8ad590cd9a52d8972c4aae79b60ce409a2d920fdff5177e915a5faa4178a8891b3a5cb752b3ef6 SHA512 5eaab35442ce995d80638a8a4f253497840a0b760624f9660b7309634cc9bfbd75b99db4fc15e2ca186976ddcd0e27ca6535b5d137e4f472cdc3a6d559996b71
+DIST vivaldi-snapshot-2.3.1440.30_p1-armhf.deb 52627502 BLAKE2B c4a3fc76f0d94f1621eb6c85f46be71ca1c7dde71acddab5ec268f66b0a3cad50842efee869b9bd89137edd1646cc1fa4880b3c39013b8b63f5ba5dc62827196 SHA512 750eab86137c7e027bdee5399eef699021fd19d885f04b7f48aa5388c1ba53bee619fea859f3740efae70e34e1359e6daa10e4491b3669d7b284574058acafd7
+DIST vivaldi-snapshot-2.3.1440.30_p1-i386.deb 58219006 BLAKE2B 06bdb5586fbda14e6d71a8d4ee520b1570bf8a74c939cdf3dafe5f1089d2be2d3f10819416a2342242fefe383ae2f900dcdcaa484ebc8e3315081dd1435b58ef SHA512 ccb10b527bf7566fb8a161c7b51352c902bb241366e9d3c57436ead5d40dec5cc25bd8528b258f956dbed898f22d7cdbc9120b9c9836c485c193ba8f0de6a2d8
+DIST vivaldi-snapshot-2.3.1440.4_p1-amd64.deb 60081518 BLAKE2B 35c80dc7437febc019e5db3c1ba34217d8a4107c93cab64d44b07adaafc6505a18b14412ce1f08bda39d3045069d8e29573611190037e73d53686184b0ebcd82 SHA512 ea35cc1e3f39c484442a09d8be676308ac49b11e140eaddc2cdeb4ae1c5ef5cb41ef9ba6f13b1553e560479616fbfc502367d7fa6ac28326912cfab45ee34227
+DIST vivaldi-snapshot-2.3.1440.4_p1-arm64.deb 55537426 BLAKE2B e8d8cbe6594aaa98e694ccb86412314ab8f8a91ceaf7481a4dd42487d41ca3509895cbc81dc327ad89acfb7eddffb85815e9c082573966c5d69a2d9c9ab4005c SHA512 afb3f52a607abddeb7b2172775b72990a987560ef23c94f313bfc6af5fb2ba7555999b77c90b6117d9077b01fc3a9f4598f605630fff273df01dfaba434485e2
+DIST vivaldi-snapshot-2.3.1440.4_p1-armhf.deb 52643462 BLAKE2B da86e557518f69bbafe6c9214775ea5a74e3953eb03af6c05cea01f989ee0fabe2b6b3cc3eaf01428c661945ee57cef83a6284a4ef7ae4b1d8dd2f0be386d272 SHA512 ffb3bc7952d857ba39e9b2b1ebf977e09c7a268adaf94cd8eba030c7365d385320e8bc7afd7c3160b0de6f5edbb89220f80e13354f3b43e2864a3773f944a3ff
+DIST vivaldi-snapshot-2.3.1440.4_p1-i386.deb 58193634 BLAKE2B 2202d72b6a9687b08342f1c2bf6942cad1759ffb8ad6e579e43f67dae986cf005374d703ffed95063680aa91d6eda8b2482dfea8f61c42a17439a8f3181f237f SHA512 d532f10d5aa67f9b75b248fb276395c6e44914f7d3ce4969e36c9c3e3dcd6b797a72331fccdfdc24561612e790cb2528e9237db3eb36ddf57cd13fb4f7953683
+EBUILD vivaldi-snapshot-2.3.1440.30_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
+EBUILD vivaldi-snapshot-2.3.1440.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1440.30_p1.ebuild
index 91bde2d57460..91bde2d57460 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1430.4_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1440.30_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1435.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1440.4_p1.ebuild
index 91bde2d57460..91bde2d57460 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1435.4_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1440.4_p1.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 81ace730ea9c..10b07c1a784c 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index e5cd41985a4a..2606411598d8 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,7 @@
 DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
-DIST urlwatch-2.14.tar.gz 36587 BLAKE2B 6c4115c58cc9aae5ac8c62f7cb360ca38afa9a9ceadc93f3c9d2bccc7808ab1accf912a0f5756d984bb7a33fa448c91c1bb90e841bd45e2f8d34c4d74cae531c SHA512 8c7b479f80973da28e281e8437a30038c6dcdf9036c30cb5e685fdb9460fbb7b90a27e9d5a27290cfe30de1a0f443644b13c8a10740c205ebd58bcb2bb29c888
 DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
+DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
 EBUILD urlwatch-2.13.ebuild 1456 BLAKE2B 1d598c7f7ca1176c1d259f214f6fa96ab4fc2f79845837ea9ee50fe353e20bd9c95cb77a05af21648291426c5c13d3a1f523e499b45afdcbbf537091ee0e0b80 SHA512 949c500620ec76076dbe0a7218e95f383b1aedab5799064569efaa1df52818477dbac7a3604e0c0d71582ad171d28f7b2f10dd21a43fba564acf6d80e1bf007d
-EBUILD urlwatch-2.14.ebuild 1493 BLAKE2B fe4c9fdccd55b99d9b8913ec0326b47be7cba8c38fa2eeb19685c3912656495567f4eca82454c09c1e6a05c03caea572c13dba858a1aeb58cda78ba6247d7b36 SHA512 2667e5e93784b44e4e2f65a7b19605105006824e5dfc310901bfd647137930d5aeb30c183083d9a94b3ef1db9f3368f7f5dc01e14a647698b4199cba32a93af4
 EBUILD urlwatch-2.15.ebuild 1490 BLAKE2B 056ddec4a14a17793044cb1bc8019467ca51d21d370458662cdf4e991d615862aaf7737582b02e6fd41a39e2c557f19a071ac7be54e1e0c4afa4296ad2e79589 SHA512 32131157fa3668eee2ac5fa5eaafd6b0cba532639d6d35151b92926d16b4c84aabb6ece38b246b778c25b4e00f8dfebf174fa75a9a5848bf57c671e1234a73df
+EBUILD urlwatch-2.16.ebuild 1530 BLAKE2B 7a200665942d25e0167d1c437c947941bba8d65b16059f9a247af60212a7635ecb98c72f8f4b14acb05865a91814882d6c4cb588bab41393063e0871a10adc50 SHA512 3b540101f4ad8e88016496c94241bdffdd9b4923e79496b6294881ad098eb8c20d77a3431ed02f41be7f944b422c7bf6e37a1fe2c1e1ee2ee8cb43db57fd7330
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.14.ebuild b/www-misc/urlwatch/urlwatch-2.14.ebuild
deleted file mode 100644
index 6dce261a7b8a..000000000000
--- a/www-misc/urlwatch/urlwatch-2.14.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/minidb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-python_test() {
-	nosetests -v test || die "tests failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version dev-python/chump; then
-			elog "Install 'dev-python/chump' to enable Pushover" \
-				"notifications support"
-		fi
-		if ! has_version dev-python/pushbullet-py; then
-			elog "Install 'dev-python/pushbullet-py' to enable" \
-				"Pushbullet notifications support"
-		fi
-		elog "HTML parsing can be improved by installing one of the following packages"
-		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup:4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.16.ebuild b/www-misc/urlwatch/urlwatch-2.16.ebuild
new file mode 100644
index 000000000000..be9149902a11
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.16.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=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+python_test() {
+	nosetests -v test || die "tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			elog "Install 'dev-python/pushbullet-py' to enable" \
+				"Pushbullet notifications support"
+		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
+	fi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 217e64d92c0e..030765464a4c 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 64454da5862b..dfdad9fd36cb 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_72.0.3626.64-1_amd64.deb 58378464 BLAKE2B ff5b17955f508349074fb1f005d2062e0efd633787df4696685b00a0433b156568c62a8a29cf8d800dd81541391d7e427119949f5fd76b52b6e9b635cb8a9571 SHA512 c294f289bdc93a2323a607b00eb5a0ae0e5217bb76604c3a5e90d480f3129d2eb77bb0150af6fccec5ba2c9ebe2ef9e3e7ab2cd6048019542c865a1aad63770f
+DIST google-chrome-beta_72.0.3626.71-1_amd64.deb 58360214 BLAKE2B 0cef3065af93efc258920d98b145ff14423e5c8a9d3bede7becef3b2058dd5f3d9fc4b273581dd8575d21973de55f6007d8b2b9fd3a93c2ed1f4c76e1bb5a253 SHA512 52ac25b235ff8614ab2672af31ddd94f9b95ad6f1772f86f2e632b72647642abf8ac8d9111de87d6bca7a17418100bdda801cb61c4cfc63b5c531b9018c512e2
 DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
-DIST google-chrome-unstable_73.0.3673.0-1_amd64.deb 58449494 BLAKE2B 112287121a6fd309b05a40fe6c5c0d557253ed5a52ede6618a3a767c154d70e8265e9fcca1b720f18a48b9d5a9089496169d191f9158586dfecb5fa4ec0aef32 SHA512 c2bcac1d792cb4f602b1b08483b788efbdf4499bc765ee88125f357b4f8fc1e0f170ce1bf05ea52631254382724fe8781e4cdb768805d5a4a4a49ae6719af7fe
+DIST google-chrome-unstable_73.0.3679.0-1_amd64.deb 58489980 BLAKE2B ae86ce9cf87fda474fb024323d84a7a173c0f021bebb5bcb1ce758ed273d0f78646153a7253df1753a9d5f78e229c171a537c650f61ac1c74c34b860dfb05054 SHA512 9fba3e4c2d947d6c34c1b9232724a1696cda3da2efef0b4998c5756cd33c34287689bc7070914f96a251e5af61a3578be96ff056b5f5454aaf0b23fd8ff90088
 EBUILD chrome-binary-plugins-71.0.3578.98.ebuild 1359 BLAKE2B f82b7bd52dc714f125e41c76245e1e4f95ca85d1ba0132a60deb71d12d499f4002185c90d66d0b9d5e63571c135ad7ab67613adc2b44b392ae3af8a103f1c19b SHA512 c3b0b3ab0b01e196af602a4173dc00e0356e34ab4b4821e4080f713d40ef48fe1752aaf48ca37b2093fc21b6685fb89cdad12cef557fef3df4566d8e358e94be
-EBUILD chrome-binary-plugins-72.0.3626.64_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-73.0.3673.0_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-72.0.3626.71_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-73.0.3679.0_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-72.0.3626.64_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.71_beta.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.64_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.71_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3673.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3679.0_alpha.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3673.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3679.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 64b159f9af9f..7fd5a8243e61 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index bc280179e5d1..00af6e152d8b 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,7 +10,9 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
 DIST lighttpd-1.4.51.tar.xz 723268 BLAKE2B 524874a5cc29b3fad23b1d2d623bcaf5b781556d7f11848047bc02fb4793480acfc5b5eb6f60304be9472a8b42c87e8c23baf85352bc9479ea156c4a03990bad SHA512 ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f
 DIST lighttpd-1.4.52.tar.xz 728668 BLAKE2B 6ffce05ad8cb83895f8865cfd2ce627c39c881e7717992ce25d1ed899c51fd1769d91d9c43f621b013e536a3a24d4350e5525426be333aa5b21913f480af5d31 SHA512 3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72
+DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 EBUILD lighttpd-1.4.51.ebuild 6296 BLAKE2B ab1f50593c428124a4de77d7c1c487129e7e7653eb0256c63c35a62ab0615515ec3517bbbb257e485a5b77a6d6b4ef84082ae3e6e2f228cf610f6f4ac19c97b8 SHA512 38d9e63c64af8fde307c713d65af732eefe5da1103d48101c27b3476dd7a1c61719c778c467974218687b0be2a38bb7115d13687cf901a0e22fabf8def1ee59c
 EBUILD lighttpd-1.4.52-r1.ebuild 6336 BLAKE2B 780ab30ce6e2a1e996015008d687b5788202706fa28da29feba154f7f437e391ce777084e9c9116b228f7946c6b272fa6f9f7ebe77e01b44883fb0fe7b0ccef7 SHA512 6536f0fc2a909c115c8e94ef93fa8f159b6a3c93e8d2929324cfa8c46edad43a8185290f4c98d3d3d8724771e74752e6d8be19e9d0a5e6813456477335c2cb2b
+EBUILD lighttpd-1.4.53.ebuild 6355 BLAKE2B b7ca748e2512744dc94def22301f0a28121142a671e6aee120b9d33eaeaa367a0e4021e050d1515dbbc6abf4446e844f033f54587c4cf35a1c80de7f2f10ef09 SHA512 791747f51b6f353f271b84301444cc2dbb5e11551c9be0f09d260895efc7d679fd8ede7c027e78b1122a7eadbea28a866bdbcab696ccd2b84a43226fc28f90b8
 EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
new file mode 100644
index 000000000000..aab14ef82eb2
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
+
+BDEPEND="dev-libs/libgamin
+	virtual/pkgconfig"
+
+COMMON_DEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( >=dev-lang/lua-5.1:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
+	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite?	( dev-db/sqlite:3 )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )"
+
+DEPEND="${COMMON_DEPEND}
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with dbi) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcached) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_with sqlite sqlite) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dodoc -r doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/pathod/Manifest b/www-servers/pathod/Manifest
deleted file mode 100644
index 5489d15db9d2..000000000000
--- a/www-servers/pathod/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST pathod-0.10.tar.gz 245837 BLAKE2B b4284f1db594b245e948eddbee0d6a65848bf02ede4fe2f56b86b61fe2d71b53401eec81ad5651c6fd893af5ee2254ac8c07979d8d234153c26ef2d6a039ca72 SHA512 c096268cdd459ffaf2ced67699be57bdcdc51db271ce141734d4984795d045ef24a7301f18d67af9b48d802b5107d246ec891b5eed5dace52d0835c2c7dbb336
-DIST pathod-0.11.1.tar.gz 271616 BLAKE2B bcb6eebf8c1772a3761b9de1d14a69aa39b46e87dac603cb6f5ab88969b8a8836f98c2144b99c1ccaee9583765457e25fe7060d3bb14c00778632a0023139a8a SHA512 8fa4957bd7f25492a9db58eec7e83a67cd998bda17f93224435ef3f75ed6723bec96d24e20956069d148af3708d81f04d9089c2302d260d3ba95c1993ee0954e
-DIST pathod-0.12.0.tar.gz 228515 BLAKE2B 9706697f47bf53100d40b3d869ca4138fc37af0c558a9d08ab15596637b9b2802de876c2a35d101d774196b4612247aecd5611da3e7b9a624b07e5b4fef253c4 SHA512 5273736b972670e009d24b610ff1e43d1296ae5e5a42e360fdd7ea3aa355016c02ceccd8b6d342e99b754b5fbd9f7beca92852607b9dd3af9d395128453fd0af
-EBUILD pathod-0.10.ebuild 674 BLAKE2B 2a8496ef271342799849b3bb3182ba038c897026acf9458a1ed58dcb14cdb8868ce08dca6530ff90ca948884ccfcb2ab2265a742e22dd06a4a253050091841e0 SHA512 e77569bcf9aee8618617611f1c173c7800dbd5be041a1359060cf3e96c2c0ac781a7a35543116cfe2ae41ae48fdde2cd115d25f274cda0bb4047aebafb9a51c8
-EBUILD pathod-0.11.1.ebuild 853 BLAKE2B a4ece5a6b82892301dc2725b672bd8d2035321fa49937765a8b83a7ed7ed8c2ceda629977e4bd0dca19c2beb257c89a4c886afb07555201e689e4dedd856f433 SHA512 aaafe2a3b0e8ff6467dee63243b8297e2e621dfb22a4dbbcf6898ba916d26c2c468bafc72a3fd7e1874984593dfbcdbd36c4de44b40dc4e71a419e7caf80653b
-EBUILD pathod-0.12.0.ebuild 846 BLAKE2B 28001480cd0286a07af7decd6af6153e868e6acae9c52b0a8574845ba2c3c6ca8c7da69cbdff9165bcb29d159f66f0b9841a6db47e78ba352be4264b89ceab61 SHA512 8de5db23e937baf0b53d675ea14ee90d279cdf6acbf8abaf2724a56443728a3dc46bb4c5cfad83e8f22fe495ca6008de9af89e5d5a78d52147942e61b7b5f5bb
-MISC metadata.xml 315 BLAKE2B b4df390e91f4ff27b9c0a7283c3b5230a5a76299dd413c9f668c8afaf85fc8e29eb10fe36b8a48d73ed48b9ad8f59f126f005d391a2c6438687b96489252d7fb SHA512 b02fa957ae01e6f61b4b12d9f4a999963c0614046837f7eed5482424e37b3c6b6d0d4c0cb4cf02ec6b217c5c4b61f584f118d6f2d3d0cad85c8f4829c733696c
diff --git a/www-servers/pathod/metadata.xml b/www-servers/pathod/metadata.xml
deleted file mode 100644
index 68ff95d14148..000000000000
--- a/www-servers/pathod/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pathod</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/pathod/pathod-0.10.ebuild b/www-servers/pathod/pathod-0.10.ebuild
deleted file mode 100644
index d87e7bd29861..000000000000
--- a/www-servers/pathod/pathod-0.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/pathod/pathod-0.11.1.ebuild b/www-servers/pathod/pathod-0.11.1.ebuild
deleted file mode 100644
index d368b1becdf6..000000000000
--- a/www-servers/pathod/pathod-0.11.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove bundled netlib
-	rm -r netlib || die
-
-	# remove unnecessary pip dep
-	sed -i '/pip/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/pathod/pathod-0.12.0.ebuild b/www-servers/pathod/pathod-0.12.0.ebuild
deleted file mode 100644
index e6d9ff95ef0f..000000000000
--- a/www-servers/pathod/pathod-0.12.0.ebuild
+++ /dev/null
@@ -1,34 +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="A collection of tools for testing and torturing HTTP clients and servers"
-HOMEPAGE="http://pathod.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/netlib-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/nose-1.3.0[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# remove unnecessary pip dep
-	sed -i '/pip/d' setup.py || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index fbd2038141eb..a71f4aff3d40 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -4,5 +4,5 @@ AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e0
 DIST spawn-fcgi-1.6.3.tar.bz2 77607 BLAKE2B eb6331f2f4ec1270f47ba317dcc60668e5d02dea9ed3a840033febd98443a73194559bcf56ff039131c8bf374108b72c47ccc531b7549bb3dee5f4f111308608 SHA512 136a198cbcda0d3ae4e445eac2ccdcc5483801514ce77542c630d615a7a19a68864b9d7d79733adb16347ba64c833afbf2a18df82937107a6bc8467f630b03b4
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
 EBUILD spawn-fcgi-1.6.3-r1.ebuild 784 BLAKE2B e7bf66cdf6281dbfc877e7953df82b1a39fc6826b3e72aeabb5cccd6cf868f5098b8a6c3bb2ce046d3ef203ff5975d32c2bec1b4da08288f59d368a5b6b84ce2 SHA512 402d57c189dfb2bdf1181f84ddc52cacfe31b663cf56fc80c7dac1a5d41f33e81df242ba752acd3d3822214f9a11ae38b4acd283a4e95f3fa7801d163065087c
-EBUILD spawn-fcgi-1.6.4-r1.ebuild 753 BLAKE2B 0a2f3ec9b32d168fedb18954cabad015414c19c6018ab8ac56d7d257f824c7bb6f9c545ad1483d2036d7fba886494a5880e87e25ea0e9948743377088707a277 SHA512 189949b622f7038703eb9554585fa9c7db3de57690000967fc25dc9a6717ee928581916294e9c6ce10f126a87c51d3e48f13cf68c83ae45263e2b8897bd12ca2
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 751 BLAKE2B 0597e5f3c3afa2a9643272442df98ef521166ba672753248d294b325302181fa1f3b1c8c14add0af98e4400c6ea56740b36646b757d0e0876788be52c4861d40 SHA512 3fb9ad454767028358c5c3d54c7c50a2b8b3bfa9d8f1938612ada2ee04efe74f1ff88c73cb859304e91ba633641bb82776f7af54080b7c909b5ea9f502b1aaba
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 92e2c3777b59..23329411d4fa 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-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
@@ -9,7 +9,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86"
 IUSE="ipv6"
 
 DEPEND=""
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index ac5456af108e..55fb993db497 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 14b714cca66d..713d01074b97 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,5 +1,5 @@
 DIST xcursorgen-1.0.6.tar.bz2 124545 BLAKE2B 03813fb666b382cab2b4076cd708eb0c67bc35e16122edd04da8ba897e53f67df3571a513023b6ad21066a92f497eecc619c9d00f431a940df23558123a9c5fd SHA512 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
 EBUILD xcursorgen-1.0.6.ebuild 401 BLAKE2B 8e2c0d06acfc2992c9ec63e070611d803aafbd8dd5473fc72e136e9ce04a7a2d57da717d071a8be4b759b28f77349a77cc2810a2751cf893c4bac611f87b8ded SHA512 e3c930a53c3e0716a656154f0d5f5d1f82025ee2827a7ecc79cc6f8256a324f695caab3a2adab9745850d70a625f618f47b71d157c47ca0982d5e82daaf2c9e9
-EBUILD xcursorgen-1.0.7.ebuild 402 BLAKE2B cc62dcf545b5bf57ef144ef1540d7b91bbe86580498b4a52ee79b79a54bba93037d190e6b216c261081ac1b3009a0af4c21b30b676f85c332cb6727bebdc201a SHA512 5efce820a35440c55ea5b7ff62fe5d82f56ca231a7a0571c4bef9a1b59dc04878747220e93aae8c0407866a7955f13ddfd76f2dac7d812addabcaae87c2d81da
+EBUILD xcursorgen-1.0.7.ebuild 398 BLAKE2B 07118d24680c4ec043f3e521b9f006e8195cf12815a9e390786a8a0cbbd58005db877e9ece9047952530b0b7a3bc7f8769cee0023b097241a4e83e21ecf6e79e SHA512 de5cb6333c30ca4b28617ba7c02707aa1eccaccf9f4827a742b8073f5506a26e382c8711e678352dd298d23c383738c7cd1d03edd39506022c3305697b981f15
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
index 02f9d31c1b9e..20b958c7dd87 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index f193f005adea..2c8c0efe644d 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,6 +8,6 @@ AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f9
 AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
-EBUILD xinit-1.4.0-r1.ebuild 1761 BLAKE2B 8ce3121bf37796d389101b0845afb90f32a41430a71778ff99325113b0685735a404c748bc64ba816c6038803bb3995c22cdbf5296b157539122633fc696a38b SHA512 6b2f3a87ef2e14ed5884daf02f23a32905e63d3df685f5ae02fbcfee59149b9c02d3a2ec060a7d9fc83d2dcb1f8eac02626a333601b08342ba4b5df0218dc7f0
+EBUILD xinit-1.4.0-r1.ebuild 1757 BLAKE2B 50e4b80f2b75a9fa3ed301c170aa96b91c6eebe8767f3c058983f36d95dc44bd215cb3b8ae4bd3898c2b1daf3baa849380ffa9a79fda05b5a44b93f774e1a50b SHA512 e4eb0bfe69557a8de8d3648d80d5a2668b1551b9f07906486ca7e829439fd7a94c5bd27fb83d9340de8f1eac3b705d278ed0f432a2685419e798807bb9109ac1
 EBUILD xinit-1.4.0.ebuild 1749 BLAKE2B 4c676cb420ce5eec590e71b24fca1f90c3858fc250bdea1a9d351a83b33d839090ce779005a4145deae2b35550aed4f562377b0632c5f139e8a1dd543a6fdf41 SHA512 71824c125bfa102a46db4101096991bb1fab3a604f3ff6a933213d00f935648b2ed191438fd31efd2088b990f2f089fb6b0b00709fbfe6ed34c52549dbef4be9
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 3cccf1c55081..6d66726b011c 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index a4332323cd6a..443d219a6f5b 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index f56398bbb163..08fd4dd56de9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -16,7 +16,6 @@ DIST NVIDIA-FreeBSD-x86-390.87.tar.gz 64326801 BLAKE2B 91cf9e77040d8c710a0fef58f
 DIST NVIDIA-FreeBSD-x86_64-340.107.tar.gz 61179967 BLAKE2B c12c7c07c090fd7bca78a30082890d0b0330dde07ce9beacdb94fad97d40e9ff9e1413fc36fd94116821137e74076d99a82ab85ecd0a8e16d52b47abeb747802 SHA512 661a4cc79a0adc9a1abebfb3567c26e69628266794b5b539c112112a0989760ea1ea2d8c35a5fe7539b579d4e9cef2685e3e1d12fc7031cd6d1b743c23eadc52
 DIST NVIDIA-FreeBSD-x86_64-390.87.tar.gz 63648591 BLAKE2B 88aa38b11b64b2ad91f723ec84a2adb6829571136aabb1441a9119418395d5f143736487902f0c60b49ebc1284f3100fbd089e4c941cdd3519ab8511cc1d3261 SHA512 0865fef8b8a3be8f6d9fc81908b162fd6062ba0ea81fd00200e7b2a1e3149ef62408b46bc4ccb7a77f1ac943557a22b13a10cfdde084f0b76cf2b23432e57540
 DIST NVIDIA-FreeBSD-x86_64-410.93.tar.gz 61977979 BLAKE2B a662fa13866cfb36ef61a0b9dd459519e26ea93a6ad6ae7bf34075fae8e7622a91707d88cec8de0660513cb959c3596e8b6169357891c83e847870ecffd72928 SHA512 ecdd5270f9d5f32117d83cd3e3cf0376f0b37c748fe164e702c4230d225c6b28bdbbea4334555b6928d05f1a7cfaf87caf20dd2e7e06e1259c526f6bd50e4d0e
-DIST NVIDIA-FreeBSD-x86_64-415.25.tar.gz 62373961 BLAKE2B 4c1ce36ad31933efdb7b9b3a5a530439cadb50c6ee29c0689a521308fbc213266a761765998c44643fd8511159ae96387a3a278accc4a0d00322b06b9b327232 SHA512 792f0cfafb1d6b2137db62c3a5a7e76217d89c3b18cee92ec8317d6c583fdc9676aa46efd55bc795aeaaf1532501f7b40d1d9609d782ffe63e55bb37d0d6db14
 DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe8b758a6f5d7eaca787231845fa4b4bff5f26aa770fb7c695bbd5585d919c934c65b9ed0cfe42f9674bcaabd796c9bd8b89cea87ee6 SHA512 857d1523bad2fca21c75b45c29066be0f530afa8ca124806bcaa36509ac5135df1c4037e6b09e5718c701f085b3608925e2b1fea45d0681e69a99ef709c307d0
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.87.run 29078256 BLAKE2B a7ce24bcaf82e6c2c95cd11a0d9e0e2aa69c717b8455d4ce0a79a9c03c92f5f6b84107dea6347dedc5c4f8fe076e616fc7a36053c6a5f571af9d794bada6cb1f SHA512 3f8ef4eabc7275685bd5d887c6b7dc20786baab1f4a89bfb23ae6c8d837188d93369c777915d3ea010b08e578c4fb7318d9428811971470e31a8b8b4f51e240f
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
@@ -24,16 +23,13 @@ DIST NVIDIA-Linux-x86-390.87.run 47959124 BLAKE2B bb799a53b6d25ecd0e6013cea54440
 DIST NVIDIA-Linux-x86_64-340.107.run 70233686 BLAKE2B 821a2672dcc3b546fbb3f826230fb06741503d75b06f72cb407dd3c9de4f2cbd150bff34e554dca8aa86e7f6bf64ce4f7f9b52976799a477c6c2659aaa5bb4d3 SHA512 51df9370526732db099a8a925d35cdf1317ae2b0ab2c130eaf82373f25186165b4af7d44f71e51e2a68f7d07c7ae3f441a6c6c4be8467003b15dc770c4f4e89b
 DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
 DIST NVIDIA-Linux-x86_64-410.93.run 107257681 BLAKE2B 56e9b6a17ab4d2fe2f18d90b4e209fe048c53dc43846ee9c8bd0960999a06ef9d9b6ba7e4c242f77cc35cfc5b9a0e2ae24aa5f07f68cb7662bd5010de41a9b36 SHA512 1132884210e447d20768c4ae84ff572c9f6886fb9a082da4d229a03c13932a5c6ccc518cad3311a9302b6a0d9e9675e3a53199e7183e07c81282d46883d26105
-DIST NVIDIA-Linux-x86_64-415.25.run 108599932 BLAKE2B 958a345f03157ebd8f8a84da91af78143ada75be4bf1d5abbbec9bc8b0ca11549891efb2f78c3ae89ed86fa94a4bf179834d1b229b2dc7d3587a138235a8ce7f SHA512 d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857
 DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70ed114c639ba7f0e5ac260d2f38cb5042a4d6052e40ada51cf2feff6bae0f394781d77cb70014f390873a715b7d9495b86918bf1 SHA512 5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.87.tar.bz2 1109274 BLAKE2B 20eb809ceeade932e89592ac91071e6d3311f4a075812225d68342806b7ab1f9f8ed0399ea7a47241b7974311794852fd932fd8e824065589de6c124a3c81ef3 SHA512 cafdf2bfefac187409dfcffd593ff23eaba5ab7ab8dd85a9f14a4b6a47ffb3649af770bd2615887af9d30de3ef8fedaad7afc2ebe9f60a8ba7355a9004702959
 DIST nvidia-settings-410.93.tar.bz2 1115704 BLAKE2B 1119181feb2704711593c19a43dce5feb58778d0251cb2dcb8647de7bfb1abe3a7f374bddd62e4c983b07a207bca7c1d99a7ac51cba3ae41f78fb97c4d1e9666 SHA512 4e5a5babae382dbe9f6899e51d3b1081fd7123f9ba5e147f7d5cc1899904892ea8d953983e43643ea4355d06348db40005755a02c7c0ff6ba104eac4a9d450f2
-DIST nvidia-settings-415.25.tar.bz2 1121689 BLAKE2B acd9dd12b4d9a3d76e08d1498fe2373327308d0764791c7e14c6471cf98e79f635a1073dfacdaa4fa60dd148c15803a18061b185cdea24676d851b3a1b695184 SHA512 8646e4eb8d491cbd20205766833fa9f0629a2567797fbb7ca085e07946f4698645cc134615bc20a42090d4f4fe826df48ab4be717b227ee59c17941d185e0b0b
 DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012d79bebfc14daff56fdaabb032856f5f78ce77cf4ce32d6eaee5fe4c1a18db63d5c69d6848517f025c711f133e28b3e509396 SHA512 5ac3b673c41194a1952ec10cd3c961aefd281bb044ecae5c9d11cb55d4555fed44e6056b5a2e97b5b87687743cd7f702f33ce7e0f841f04c8175d63693a24594
 EBUILD nvidia-drivers-340.107.ebuild 14336 BLAKE2B 9643ffca2bc0701291c4f652f130f45f78bbbe77006836de6ba0475174c8792f27046da39cc26b1b46fa46856c4b34cd9b8b0fc523b24e63cf13222d16176aac SHA512 595b0f9f702638ad458d20ab9e1d9515b24845d8c527463fc79dcdb3f910edea2a4fa3a0110d219c2b64e7782f55cf8e7c0701a3e3d5107c3f46f8f4630ad691
 EBUILD nvidia-drivers-390.87.ebuild 16042 BLAKE2B 25ad849c0268011ff406e40a59c37fcbf24463a829e5e92e769db0837bf6f15d5809f9bc43650e4930fcfa6b39935e3036200c241545823b0f967bd89b896ab5 SHA512 b28bbbb140c9b3f8133d8233a06c870df32597fe1046fd8a41452471b52dc1bd0db5c70859b2b7740719019576f591415be13ae8d0ced3ea7521673f81a19ab0
 EBUILD nvidia-drivers-410.93.ebuild 15931 BLAKE2B 64efd9c1954d0071877efc91cb4001f33131e21bc54c345f997f28d4b794e7d8ab080a97f806200be18e7e7adc7e00bfc39a4522c8653fe5a389459856a92f82 SHA512 8431d1807b47ab60de2ec80ff653e799fa79f47b829425c30bbfe4bd2effa9b81c422139aa27e19385e51c1d1bb7d0db54a9906b043f36b9f7b48e33410dc0ae
-EBUILD nvidia-drivers-415.25.ebuild 15939 BLAKE2B 5f3836bb7ccb8d63e2f8d01b5867463f30b9c3f775233ea20a004cac7aeea02cab323779322435ea53070e5290c55f255f9e6c005cb3e7428e0f608a63c7b6d5 SHA512 edb51b164c85a209d9ffb073c2a7ed5504a3fc054c46101164435000e539302f11619c114650069694f1cea074311feb1d2c301aca159e52029c3440695924e6
-EBUILD nvidia-drivers-415.27.ebuild 15940 BLAKE2B c92e53dd5237e8143a4ead9608f26884bbd9fa92a30b27fa84edd880a152e97a527e5ea57e9f87a37c26706d90efeb74b5f47cd3ad40509142c328148b379616 SHA512 492bb7c626252df85e6487ecac7bf35597924743651a1ccea068d9a1578502e349e58d6eeed4a071c982081e1657b32306bb63059bff63657917d4f4b810eec7
+EBUILD nvidia-drivers-415.27.ebuild 15939 BLAKE2B 5f3836bb7ccb8d63e2f8d01b5867463f30b9c3f775233ea20a004cac7aeea02cab323779322435ea53070e5290c55f255f9e6c005cb3e7428e0f608a63c7b6d5 SHA512 edb51b164c85a209d9ffb073c2a7ed5504a3fc054c46101164435000e539302f11619c114650069694f1cea074311feb1d2c301aca159e52029c3440695924e6
 MISC metadata.xml 1207 BLAKE2B 6fd00cf82a2940c84a3802484c9c752e5bd9786158f6f6e983cf5fe56f5018b7f1f90108525234bf8c98b0f63abba54a468509609f34b9e7647f7bfa7491bea1 SHA512 2a3274c9c81c05f1d722974a5f73dfec9ae778745092c4441e441d87f2554cb0c4822e8ce63c89a90e11d7237e6dc5a3a11ca12cdfd9813054e3abf75e7f9ba1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
deleted file mode 100644
index 60fea3075d37..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
+++ /dev/null
@@ -1,585 +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 linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 ~amd64-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 21; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.21"
-		ewarn "<sys-kernel/vanilla-sources-4.21"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			PREFIX=/usr \
-			DO_STRIP= \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.0"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
index ca38002944b9..60fea3075d37 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64 ~amd64-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index a336d5f517d1..a20bf5426b74 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-mga-1.6.5.tar.bz2 478350 BLAKE2B 6446da393214921fd35802df387f200856c0900d42a81b28bbde55dbc453752c06f3ed7abf936b5fa693833d8a5f56767e440a37cd4b7035db0abb5736cf4020 SHA512 e1a624cb5d98796e9138bfc512b62d5130885140b1751c01f29a8eff96f66a2b57cb5abe23c1fa2b55188acabd6554c5897190a4e1aee1ec09245d53b88f69d8
 DIST xf86-video-mga-2.0.0.tar.bz2 452486 BLAKE2B e3c0d3d6ee3c1651f96fa2353d94d5f9f19ebf97b121a87749fdb8ba6d8d3bf7066c39c454910a2b1ad9d7e3d44dd3c31bbd432490855df4676bd4fcdafe71c9 SHA512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540
 EBUILD xf86-video-mga-1.6.5.ebuild 369 BLAKE2B 69761d156a2eae4d4133f2d049db0e27ad42f1e184334a3e1d1736f9157981f2a1eeb7c85e1b4a4b23bc19bd9da83601933e74d36ee9418c8bf94824971dabcb SHA512 920a5a64c4e180aee22da1e7f1954c2d3a4acee22aca8dae1581f06187f2a45024ed5d5f5fc563df2c25422460fec2654385798a0d6272d592244d118f7ad285
-EBUILD xf86-video-mga-2.0.0.ebuild 369 BLAKE2B 6431f52bfa2659b68ae054c3a3874ed87427282f255c0c1c38c0a586e3b52e91de9fd022f7ea8e6273cfe0976f94ea7e7d572c66ebdc54eef29777ccd20186e4 SHA512 48c8dc129d6fa5048e60562dd42ff007d720b567b5c5a3b0cab63628293496e0d014490cb6b878cc181fb24f2697473fc91decbc136dbdd9d517c2372b9fda93
+EBUILD xf86-video-mga-2.0.0.ebuild 366 BLAKE2B efa27aa6b41ab1bb73d1973ea4cb9e35887690dcddb64015d182e4fc062237a57da4b2b3fdb19c1ac4049d487a3010da32af7b9befb83781b55a5e617e511ebd SHA512 4b8e7b04b4de4f2389433088e4b03cb9c577a480c7e96de26ba38c12ce3f1f3696604de872cd7574874ce0531e5fd8f2f271e3eff0f553b22f4dc4bb232c0d0f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
index b84a627f48fc..d8b008e7c875 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index c7598a1103ac..f2187d5d9d03 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,3 +1,5 @@
 DIST xf86-video-nouveau-1.0.15.tar.bz2 584998 BLAKE2B 474eb27d00351fff9b24438c317e2f18810fde76d866ace047beda6c6cc58276e9f6ce25b4690c1de321dbdcd2dd238dc6f473a273cd3b54123d2f8383d5e586 SHA512 69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285
+DIST xf86-video-nouveau-1.0.16.tar.bz2 629404 BLAKE2B 519ae2ddc6f895648274e10fc3b5052896734e40251dcaf35a948be051711c14054573a08192ccf15002f3a8d1e6079c982c32cf8c58e2a288c0f146155020e8 SHA512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
 EBUILD xf86-video-nouveau-1.0.15-r1.ebuild 563 BLAKE2B 959c018f721d1be2830d277c9baf299fe32f8a9a865f4e21eb7d986e43f551366c991a01b8e5d7cbd0edc55d79f5a72205ff0b7f4503f1dfa026474be45bc9f9 SHA512 7e2801b3f493db56492888077633046492f27bcc3aac7bb786cc91aefac09881eb1a4217f8834f963f6dd95b563ece50ba5090e244ad154effc6d8e978d30717
+EBUILD xf86-video-nouveau-1.0.16.ebuild 564 BLAKE2B 97aa0b7e6b828a1249136777ddd8538aef06b561615f026a566b82540f717d7f0d6fe165faaa69b433360526aff161031b9c230ac3004060a796e3512bbfa2b3 SHA512 372f10e0e17dd41be8f26378d34219d4052c3972fbf03b01dee730cf871189837dee9123d934731f9cde81f8b8031f1f53e3fe66d4fe30f7019881a23d638839
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild
new file mode 100644
index 000000000000..199676766bf9
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_DRI="always"
+inherit xorg-2
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="https://nouveau.freedesktop.org/wiki/"
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
+	>=x11-libs/libpciaccess-0.10
+	virtual/libudev:="
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a54e71748691..10cc7b3621e2 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index fdb8fac869af..bba2c496e759 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 EBUILD cairo-1.14.12.ebuild 3761 BLAKE2B f17fc603afc4bc9e29963742340ec1327d437c47d241e4311cffbf65018ee7acee099a3b921a0676abf2b712fd9f0f334f8906ea0a02125f00b330e08358b423 SHA512 da0960521e98184c23bb6d141c511f8de7ba01b42fac8634e18cc4ec32682188451f360fd1049a1097c3d0fa191021f6d346f20636fe2f7829e621bc68e3bad0
-EBUILD cairo-1.16.0-r2.ebuild 3637 BLAKE2B 82d0397fd73e28986b15e37ce2916bfc55cc470e71fc942de941c7f6804d57c34dcbdb188c61ad94399ddd3f46b392fb4398cac1b38deefc0681417c142f53b0 SHA512 56ef9d892048e006829a12c143026a4502199b92f69c063c2e78178bbc02cda84ab05f015c80aaaf1083423661f374fcb61edfa3f9769e4e8491efe18b3fdb4f
+EBUILD cairo-1.16.0-r2.ebuild 3633 BLAKE2B 8dd21187c7958ac7c0592352efabc156ec9b9f34275fd87cdfe81b4470ee25948b9c196f7767a1d28f81591ce97ff18e335c963b3bea443abb78f3ed1955be06 SHA512 44e5995559cd76295d65529074d5e6ba9ba1392dfd14e60e8ca1c9ff4e8805ab365159c7211c277484c08b18f79de99ec000dd15979c0747a2f014c45ac16585
 EBUILD cairo-9999.ebuild 3643 BLAKE2B ea2f2d7ff707c26ec1ed270013402aaf5812f858d7d88fa7ca1388920951f33b4c84f5b331c83535e92d981b2af92c69c341845559d35757b4828dd701ff8046 SHA512 085453031a155971d810e1e9b96abf50d52a16a1525c25116bdeffc46c22fa948d2323c1bbaa081f2bb95b77cbdd0f003df7e13eda79a0651ab74a52db58ad9e
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 68bdb8a0bce3..009282297c65 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index f046cf18dd9f..afb5ab44a2d8 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,6 @@
 DIST pixman-0.34.0.tar.bz2 739656 BLAKE2B 8e235ec6332125046ac952c32bb3d6d2adabae01f121a952f62aed66470c367f31268f7fc5d4387db5e3a6145cde4f013871f2d82d2d8765e5a41cb8247d4761 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418
 DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
 EBUILD pixman-0.34.0.ebuild 1009 BLAKE2B 8aac848a14d111e598f4ff5f8345658cfd54e8d155b97f367b8b55a133f60032500a2782b651ecfac2be84cd9ffc36d8bb7bb0a2be3e32abf02d9fd999968759 SHA512 fed8c4bb8983ad4d484099c1872b759383781633b834f560299e37a9eadc84a13352b414f18cd1827ef30e9da9fba38201368fc3481d30758304923dedf11e41
-EBUILD pixman-0.36.0.ebuild 1016 BLAKE2B d26d603a651704b8df6f3e73ec02cc796e012e0c8faaf3314440434850a9d4c70db2d1adfbed51e9d4287081c571d8069645b9a311b289467f5eda996ec46322 SHA512 1cb52d80a7b394117e3b94d5805a64c51fd0a278bd175001a5ebf7e0bc971049db2404287685b8ac3d215e39da6d560d339111f529f368e88704c9d55de8451c
+EBUILD pixman-0.36.0.ebuild 1012 BLAKE2B 8656a3c7fc52199b5eb3925bf8263376d287fd6fd9effde00a9b3f4f5fd1339eb4cb3422d0a870485de6d6b0f0f5fa264fb7a96074182bb3f3e29d493d93e8e5 SHA512 2d01a109cdb0c9e7d23df8cc93d858d3c8fd6780165674207a509e2ab153591e0b390667cf6c1f3d2e7bdd3ff7af9829d3a42b8b31eb66ebb4904ec229fd6ed7
 EBUILD pixman-9999.ebuild 1022 BLAKE2B 1876024bdba963fdc1f8fd2226099d75b8a4ef5c7918ef4967bc7ea24aa4dc59a08fc6d81acde1778308043a9f9fddb6b494607f265fad6b75ae2889142eb85c SHA512 ec76a5f65932b57d0d76f841a152646edeea44a3f2d3e8bdd4d078ba7de36b7ed264b0ee7221eb64c27206409e8ce66d7dc01c56d50e5214f55da267d1b7b08c
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.36.0.ebuild b/x11-libs/pixman/pixman-0.36.0.ebuild
index c0be981ce632..736ca932d6af 100644
--- a/x11-libs/pixman/pixman-0.36.0.ebuild
+++ b/x11-libs/pixman/pixman-0.36.0.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 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 ~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"
 fi
 
 IUSE="altivec loongson2f cpu_flags_arm_iwmmxt cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 94b3212a6380..06c4e65f2377 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 088f46aa1fbc..225eda846a24 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -3,5 +3,5 @@ DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e
 DIST xtermcontrol-3.6.tar.gz 151916 BLAKE2B d5ade1c89d0bb45b401b59e5e13586d54c55226e1c647cbb60d047bdd0e0a61e871b0c405adac8a4bb71d5addd5a8bb11d1ac45aff9cf456a17600f099e04d02 SHA512 f59e729a9bd6739604c0c687ca93fb9091d69d7c28624d514baecf6839db9897a919adeda6e6d02e368b5f8a980c3f616155da955d5581415625a5757df650c1
 EBUILD xtermcontrol-3.3.ebuild 374 BLAKE2B bf70633c9c4afb87202812152092510c5766ba2df6bbbf31ac7cdb1928ebdb81d4d55316638cb2d9fcf6cd616964cbce8765d3ec3336189d719556d3500b3ba1 SHA512 448e85ed7404095ca0ad64d75b4a713895fc1f2a168d0ed8fc668241c731615c2e7e825078011fede0720ac204dbab792bf8f1da8b91f5ff0af8dcb549c86e91
 EBUILD xtermcontrol-3.4.ebuild 373 BLAKE2B 836d55e50d4021a1d005c4b111cb88e11498b36ad837233e3dad2ac2424f1a4398647818674122c7ba39a5b79996e5e7ad2f650039bfc7c6e4abf46c7c55e61f SHA512 f02e93b2c590a6f4d9a70b896eeccaab5d42e383b64252baa1be51c6de53362f91704ca6491b16af3a6c4333d15920c20baaef20275319e28d35eae4637d22bc
-EBUILD xtermcontrol-3.6.ebuild 372 BLAKE2B dffe396373de91f6840491588acad9e3f0b2366eee3e24b8e4f26f5bf6ec6a897914b31b907b1afc1e1583d1bd91ea858d84f3c7c34defb3ff3a763fdd4cb3d1 SHA512 b873ea80f3a402be88635c50b4b7c75a194af54450a34bb7d7b5d4a99e0a69b8a8b34ea6cdd73252de045aa16e3b7c45e78b63816dc8643b39abb8f06e3f7c3c
+EBUILD xtermcontrol-3.6.ebuild 370 BLAKE2B 3887e3c1d10d8ade6ac8ccae6697cf61f971c9e3ea70a165c99e048b1a5ced4b989938a725e294fae7d813a7d9daf109e412224cd3fc8ee92c3f322f413a1eca SHA512 bc06f3c76354a529020800fc1d25e6796d8f3f2ee89aab13709f680ab910d1f6e8cc085aeba54c018b42756b26144993d192182b43bbb4d2ec41d31582a0f464
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
index 5fe0fde095e0..c52b89e79a50 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a33eeffddbe4..3767f7fa9500 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 536399c02751..6bff77878f1e 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -8,7 +8,7 @@ DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e3
 EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135
 EBUILD guake-3.3.0.ebuild 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280
-EBUILD guake-3.3.2.ebuild 1371 BLAKE2B 19f0127ecdca20c0af6a9a2e75f0a4183ad06ca04814369b01418b78e4c38c9f7dad0b798bc9951013173afef01d58d725ae0f5c511747a1def754e72c323c2b SHA512 1e0d25dff461afa96e97813c5203a4e9ab65cb5574dc6324b58286372d0ab24f023c9d719cd44c39bc7e9b92cd066e380b8722779363a6372cda62ba2515f76a
+EBUILD guake-3.3.2.ebuild 1370 BLAKE2B 68a2db98b9ac8aaa959a513d06612c4d7738626faa652e924c4047f4f924d09eda1c21a35d765af43a739930016504afe2cc4d3a649205c997b5728472aa5e9c SHA512 ab139233814d4535ca36022377964182d009dfbd636e759cea0e89180a900e56418030e27456ae645a1b210b3d8c89f46581d4bd31009277f051bb2193204bd8
 EBUILD guake-3.4.0-r1.ebuild 1471 BLAKE2B cc59b72a8adff828124411ce4cefb777ec5fa990fe549b60f36d5f406c777c3698fb7d5f785d061c742be4db504e644ec6bd27f64c8e93798eec674610770a83 SHA512 96db7b3cc5906166f8f2f463ffbf95e96d175af32ee865d57d90ec4ed9ce6397e454b84ddfaabcf506383d2b20461c84a51aaa3c943cbd05d045e70a834ef6fd
 EBUILD guake-9999.ebuild 1433 BLAKE2B fbb5bc1663b5b33ab401301457fad155209df4402b88eb4695c3b46b888c584073c1ee7b02c67570119e364e3c47856c0ac44a740d10134b7d6efe19eee184a0 SHA512 7f4d7330a5cb770c5a2a0e86e2630ff1b3088973f36981c9cde233ca57e6e2732abedaf33ecc035e89dcadfe6f2f8f104da05f527bdc4ded4b3d6c1e41e53316
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
index ab4c70893f9d..58cb9477d9e3 100644
--- a/x11-terms/guake/guake-3.3.2.ebuild
+++ b/x11-terms/guake/guake-3.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index aa5441a22687..7a2464ee7ec6 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,4 +1,5 @@
 AUX root-tail-1.2-kde.patch 3188 BLAKE2B 122e2ade46725c9e1dacaf5e68f283b3efe2c968407e48d7ee0567e10d5d360f479588ac1b9f6da74a5d0fec52e83ac51ddc6789d8b560c43a83aba5b1ba5ac4 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7
 DIST root-tail-1.2.tar.gz 20805 BLAKE2B 29891f0bbedc18d6b4e6e726234d7abaf107fa96b3da3a38a5a3aa91edd00403ae52166491cd5ec59f903b12c0edcddc92a3576db3127a837ae9ac3480823c40 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10
 EBUILD root-tail-1.2-r3.ebuild 1019 BLAKE2B 774c76402cf892e301ab37ce1239ae79559f1fbaebdbe42ba7fa3c33027df3b989fbe7ec61cfceffaff4f32b3c2dae9a5f81bbec4eb8601cbb03b48b6efc8dcb SHA512 4651e93ec7dc145b8b980eb727b2af7b9eca70070d8b2eb30d37b4d9a6462bd82ad092ff8ee7e4ebe40162448556a52db24fe5eb181c88d008ccf84619895e59
+EBUILD root-tail-1.2-r4.ebuild 965 BLAKE2B f3b8922dbc06b7b30b6b90a0733f09b6da019b94f4934cbf79eb28d87e3800d3b2e8272e686ca0bab9ba19f07a0525f9949e6781a99f4cda4c45b191208ff944 SHA512 2ae21cd0f0b1ea6c4a3ef91777b35c5dfb50cfae63200bbb56558782864fcbaa2fc060e5467a8280ae82247401135204ba9c026fda20b9799445e0f6fb286e9a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
new file mode 100644
index 000000000000..465304ebd74e
--- /dev/null
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -0,0 +1,46 @@
+# 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="Terminal to display (multiple) log files on the root window"
+HOMEPAGE="http://oldhome.schmorp.de/marc/root-tail.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="kde debug"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="x11-misc/imake
+	app-text/rman
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-misc/gccmakedep"
+
+src_prepare() {
+	use kde && eapply "${FILESDIR}"/${P}-kde.patch
+	default
+}
+
+src_configure() {
+	xmkmf -a
+}
+
+src_compile() {
+	sed -i 's:/usr/X11R6/bin:/usr/bin:' Makefile || die "sed Makefile failed"
+	use debug && append-flags -DDEBUG
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	dodoc Changes README
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index aaecc5c8ad5c..e319981aaa0c 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,5 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-337.ebuild 2648 BLAKE2B 739406d9ca6b49867c509c438f6e09a3d3d362c7b30f2a8e2030cef138b37be56da37a0e87adf35dd16a194ee914cd5743fd90de7071387ebd6a5681e5ae6e39 SHA512 1cc63d76e72d08fb687a9267ab05b83d3f7e97385946c052e91d5a7a3a4c8511823e9c1dfbce57f4168e3b48789fb10e532404f4315fc472c664985490e2124b
+EBUILD xterm-337.ebuild 2647 BLAKE2B 30cf426283cd664c59334146377927a44dd97972f4e78dcfcba5bc14a4e2cb0b658c56ff1d02ab77d81e3c5587f0fe699e0951afb8d9c581934e4a0c02678589 SHA512 b80dbca618e72b40e4725b441e36e919c01d653afe6e6da111e92d1ecf235c8aab12c1aad3cc62a67199cdd5f78bff41218fa968c763ec71ab39de87dd78052e
 MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index 88decd52ac7d..18febf91663d 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${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 ~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="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4ffa60c9c441..863530da8399 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index 8de48ce8f533..3a17edbb3e23 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST ubuntu-wallpapers_18.04.1.orig.tar.gz 167057924 BLAKE2B 0d1bd7dc96d3a1ddc3becaa775a6da47645d5962cbcc49e4cab8430adef6ff5c13248b7eb88b1394c80fa5e1b53f8aff94b15b3c7ba836fcc5d94ea86e02572e SHA512 ad46d79cc32315f67f244bfabb74188478c43374d3021e20d0f0d4182cff7f93920df2fae141257695148dc0d69d8e4e0fa486ac616e6256e9269c8b5d6e06d6
 DIST ubuntu-wallpapers_18.10.2.orig.tar.gz 186856866 BLAKE2B 4cc8f3f0e95bdc28d25d5b664678b60b924d2fbbd0876c260f45320bcb64bec4ddb3889c16b1bba1fc2506eba5ce579987a9cf8b25c3748a1c4529b52813c64c SHA512 dadd84e0b0d6be010254577239001d423b06730690cce44031ec90b1c7fe28312afb0720f8da7758f069b81556662f8a3c231c50255695090bc932d3ec9496db
-EBUILD ubuntu-wallpapers-18.04.1.ebuild 703 BLAKE2B 80ac7b517b943525fe10e57d8708b74e8d941ebac060bc59392fe86e75bb42bd22721b5a0c639ab3ed23de9250adda626914869a10c0a5d0f00bd1cbc1f2887e SHA512 74c8f2ec2d30c205415a3d1124e18e0f7f3679766ff1ce966c4f1a61e94cfcea27cc6f5831c31eb00941bcc03d0e319c5130bbb78613cc3d19ec052f49665f9d
-EBUILD ubuntu-wallpapers-18.10.2.ebuild 703 BLAKE2B 92553a04081523da62077ec7b7c3ca667d81479dfa6a92b4cd48c25c45b38e5dc2bb78e9928a695c126191b4471641b1fa6a3937ba4f4c4eb0918a04ebe1a712 SHA512 d0914b1fedfe886c25b216320425f4998087b013ccdeaa9b2fe261cf7226c5fe4c63ac4b3aaf17ce3779c2b2183e4e9d0fa1af420c8ff60cd6acf2ac1afc3f56
+EBUILD ubuntu-wallpapers-18.10.2.ebuild 700 BLAKE2B 6750412c5ff8a8d0cf9b1d49ebdbe86012ad8ecaa518fc4c930bfff8e9c264d27d6cd46a28a88eccd4840062eb5716fcd2017a2d8e08c6b6e06cbaf87a5a9ab4 SHA512 c8352dbde77bcaa73c1d9a31ecc39b359dab9559a2fc527c99b676f108fd946dee8dcec16137be205f5a0a2110418d6917ff09787c629461cae979700efb7352
 MISC metadata.xml 316 BLAKE2B a54db9a97a4e74453d251c1d1905bb0f1d0fdeff85fb9b3064c1efd259306ccbd5b895b269587c657d328358f18cc15dc8dbc737c490a1ad5fb829c72cc15808 SHA512 82eff3745d3cc9097b48d9c789f3754c96ac8b5921709bd1545f8380a2fed6abc274e60ff8dde614344731fe9759cc8e016e465b025555a20c1ec57d23119ab7
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild
deleted file mode 100644
index 9ff5a144f20e..000000000000
--- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.04.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Ubuntu wallpapers"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
-MY_P="${PN}_${PV}"
-SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
-LICENSE="CC-BY-SA-3.0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-SLOT="0"
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/backgrounds
-	doins *.jpg *.png
-
-	insinto /usr/share/backgrounds/contest
-	doins contest/*.xml
-
-	for i in *.xml.in; do
-		insinto /usr/share/gnome-background-properties
-		newins ${i} ${i/.in/}
-	done
-
-	einstalldocs
-}
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
index f302875b2504..127023f22931 100644
--- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-18.10.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
 MY_P="${PN}_${PV}"
 SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
 LICENSE="CC-BY-SA-3.0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 99a7f8ed4753..682b61a8668f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index b10f883aa739..5d1e424defe6 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -3,6 +3,6 @@ AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807
 AUX sawfish-1.9.1-firefox.patch 920 BLAKE2B 0ba7db2c91be76de52af3e07458b2a088e3cdee7147c64878a2429ce5a00c762bec55f46a8f8fedd622a8a8a6a30edbb51df74bc46a9b74fba8221f5a336443e SHA512 194b27a5674113b0820d5e03892973fb15b377cac9c43913b0f5698eb63cf6da556ff0edcee2b426fc218ea97f44bbbf5b21a4d6aa73af4a907cfc7944c53966
 DIST sawfish-1.9.1.tar.xz 2616612 BLAKE2B c81231723dbab4dcd994d838c2918e7af8415ccf0a2c8dd74031ab00adc29cf72563cca2d3ab7376fb88d42c4111e1460edc0789a9a07c00c3ebe93a57d941a4 SHA512 243a818e2cc2546c040f33fbc076bbcc4033b88f0b4be573f9daa80b2dcfd8d9dc97384d236b9b71d6efe08ad39bfd3f3f31b5c055b9b268418efb7668e27a42
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0.ebuild 2012 BLAKE2B 31886b09a130134407b51c1109f2e9f420c682225bca7272f162e26c832554c17c200179c22120a5ecb3b351a7ffe27f886b62ed679dc710514c17ea82cf7f92 SHA512 5e62f21e7fdbf1f0df9929c82f4506156d09f728a1cdc5987bc139d5628cc0bd9a9a5053401e25ad72211f26f33a754cdd1d981f607acfc79b1f105c41c741e1
+EBUILD sawfish-1.12.0.ebuild 2008 BLAKE2B 60b98546ac13c9076a291252be2d9560f6c45673e0b256c7476dc1612d75aff151bb35f84848405741cfc3be55ff3bd620e40c747bdbeaafe68a41cf90c2a503 SHA512 cc83263c51a88510c41f3481d4deb70a04599c0af834ffe461e61678027eee838d1bb4a38bb81461038c242d8713e1e6f7c93683a553607343d10e49c68dcf64
 EBUILD sawfish-1.9.1-r2.ebuild 1832 BLAKE2B 6723a40547880fdcc4b471068fd79c08a1e4beeb3b282c6956a691d9f8aeb3c8858b453c3e1f5ce11e8906c6d43b6e9b2017da6302107f2e914636c8ab833ed8 SHA512 970a02beb9306c21f68b789fc1924bfa389d01e8e2ad0c67bcb201b5a79c7623112eae9843e71c322ae5e9a861e423da1a996c5ab8808f5f070c2bd2469ce72d
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index 0c22bd469e35..2ca6ecfed8a7 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index 56b951cf4288..bb3bf36e2c29 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -2,6 +2,6 @@ AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 BLAKE2B 8cd466ad4d7effdfc6883
 AUX selectwm-0.4.1-glibc-2.10.patch 677 BLAKE2B 4048952ab652e87b1d2520c5e725cfead0a8e6904b75f5bbabcacc49c94eb5e51c10ce74e3a2ca568b902cffff7e9ef3239ebbd96d9f8f436143451948b6c3f4 SHA512 dd477395578142bfa89a36d3f9f8c669f2a40d4867ef8ba366333bb1c107da4d2286d7ed1e357c3b78653213de5938955f52aa6e275ebb9cf5db0acd3bdcfcf9
 AUX selectwm-0.4.1-nostrip.patch 397 BLAKE2B 457e901557d8229a7f36a7334d3b3fa94f58ff3dd73cb30102d3bae54d08939372052022635f1a262e0c0682d258d365d118c8b9e3b0bba3b30b573b75b9e720 SHA512 741872c826c8ba44da29eeb9701792beb13a0c0a45dd59162c718408a5286876686b02abe301d21d4839aaad28dd993a3c5cf66fdb0d722062fbc0df4f5374bc
 DIST selectwm-0.4.1.tar.bz2 151454 BLAKE2B 849775ff0b5f860256fde9fd69b4a309c856089a8fabe0c8e97bbcd2a010db2ed7adfdce26c88922adf668828d5ab8ef41c7e4732b184cc9ac247fde4e2bff24 SHA512 3ddc4c1560d317ecb6e8e041d63415d16d31b67b4651d9e33fbe3e76a63754b78a86d332077ec091317e985dbedd903c9fdca46eb7cb650ad693039b8f4ab1ea
-EBUILD selectwm-0.4.1-r1.ebuild 721 BLAKE2B 4a97a632d52a7242e7711946812d07eff153e7266811cae5f250e55a1c1969daf36e54d36e5fe75e217b51aa3fe3db2df2335aa4a11a7c2b2c3254016e0eee37 SHA512 8a26488140abfcc6ab5fa2ac13b3bf413c8fe9fb4d2821249fe8ff8a070a15b8fd6341cb36d49a086bf0c2509a0e57a05878ef8a402cefda0bab4d3fd994c3c6
+EBUILD selectwm-0.4.1-r1.ebuild 717 BLAKE2B 4626905a854f31e857b6a2034d54304d3b85651397fd417a532f0eeeb535b411631bffbfe96c4ff961239a5c4b7971bee88bb7069139b23b9a7f7211dd3bba2a SHA512 de4cc6aad711fe3501b7e66995fbfd40f50d59da6c7e17047a0844ebafb45631e38cde52ae0ef2c3de3f8c443d45fcdf5ed0a0ddb22b5ae54fddb790a9d984f6
 EBUILD selectwm-0.4.1.ebuild 761 BLAKE2B e6504d6269e4e30ae2f83f26889ef218622f6f22ba0b3958adc6c6fa62de6b9b2d3d066188c3ee3f19450959058a20ecbfe2ba1d3e55e0b52ecc83ce9cbc944c SHA512 419cdd361127f0758bdb0937ed83445ac4532a25df8e1ab09b8e04d26c4c695f4c70464830a17d8d3fe03a45c92352dd1685b60f35fe2813ae0c145e49798d80
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
index c5ee2b776caa..f206d2352022 100644
--- a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://ordiluc.net/selectwm/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 DOCS=( AUTHORS README sample.xinitrc )
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index bad263786983..fab554f8a9df 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -3,5 +3,5 @@ AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf
 DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B 15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395 SHA512 2500dfe50fae90cbceeee2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
 EBUILD vtwm-5.4.6a.ebuild 961 BLAKE2B 2d61bc4d825ad2437f3cacf56eb9e58d7ec78b73677cb82e44bfb4dd91d99d2c774d9c72d8c2066aff020185d587d053f4e4d1f10bb407acf74127a3ad23d0eb SHA512 c88fc5582e4067e16d4d447bbf4ca1c603014c198c13dc225a68c11743971f694680db6c96ffd06801faca94a0850e427f44339168fc9faffd445ee35374da93
-EBUILD vtwm-5.4.7-r1.ebuild 1599 BLAKE2B 2823d7eb3e35da76ed5a0f6c965d337e9639f6ed44618e3bb1f414956094e91ebdfa42d72ec664d4d1c2b2f3faf128ff2e4a99f73dec070daa8a06af9e8b89ed SHA512 7ebebb8bce9b391df99a557a6e990a4471190540013bd40a9887c4d204d98a9482576b4e3a1c26340e05e207878d8d16b3badef930537f83fa2ca0de893d7c6c
+EBUILD vtwm-5.4.7-r2.ebuild 1499 BLAKE2B d2cf69f4a2a59f7d0fe68ffe486efef3bef63bfe7c1302d8bfcd8b362255b7b9b731ef448b805e334ad00c9188395f7d2bf1705c7e0faf43a36bb2f8ef79d9b4 SHA512 78b32a43199954cc89670a5402ae3348d2fed59df1469dc2111c32b35f493924b1cd723e1bd3c6727550a55ff31854c96b90bc3c1a2e98fd877b7c8bfcbe231c
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
deleted file mode 100644
index 4fb624a7bec4..000000000000
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.vtwm.org/"
-SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE="rplay"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm
-	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
-	app-text/rman
-	sys-devel/bison
-	sys-devel/flex
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-do-not-rm.patch
-	sed -i Imakefile \
-		-e 's:-L/usr/local/lib::g' \
-		-e 's:-I/usr/local/include::g' \
-		|| die "sed Imakefile"
-	if ! use rplay ; then
-		sed -i Imakefile \
-			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
-			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
-			-e 's:sound\..::g' \
-			|| die "sed Imakefile"
-		epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
-	fi
-}
-
-src_configure() {
-	xmkmf || die "xmkmf failed"
-	emake depend || die "emake depend"
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake BINDIR=/usr/bin \
-		LIBDIR=/etc/X11 \
-		MANPATH=/usr/share/man \
-		DESTDIR="${D}" install || die "emake install failed"
-
-	echo "#!/bin/sh" > vtwm
-	echo "xsetroot -cursor_name left_ptr &" >> vtwm
-	echo "/usr/bin/vtwm" >> vtwm
-	exeinto /etc/X11/Sessions
-	doexe vtwm || die
-	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
-}
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
new file mode 100644
index 000000000000..449d88600609
--- /dev/null
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="TWM descendant that implements a Virtual Desktop"
+HOMEPAGE="http://www.vtwm.org/"
+SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="rplay"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm
+	rplay? ( media-sound/rplay )"
+DEPEND="${RDEPEND}
+	app-text/rman
+	sys-devel/bison
+	sys-devel/flex
+	x11-base/xorg-proto
+	x11-misc/imake"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-do-not-rm.patch
+	sed -i Imakefile \
+		-e 's:-L/usr/local/lib::g' \
+		-e 's:-I/usr/local/include::g' \
+		|| die "sed Imakefile"
+	if ! use rplay ; then
+		sed -i Imakefile \
+			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+			-e 's:sound\..::g' \
+			|| die "sed Imakefile"
+		eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+	fi
+	default
+}
+
+src_configure() {
+	xmkmf || die "xmkmf failed"
+	emake depend
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake BINDIR=/usr/bin \
+		LIBDIR=/etc/X11 \
+		MANPATH=/usr/share/man \
+		DESTDIR="${D}" install
+
+	echo "#!/bin/sh" > vtwm
+	echo "xsetroot -cursor_name left_ptr &" >> vtwm
+	echo "/usr/bin/vtwm" >> vtwm
+	exeinto /etc/X11/Sessions
+	doexe vtwm
+	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST}
+}
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 21eb58f6aec1..2ec5b5f2e866 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,6 +2,8 @@ AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbc
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
+DIST xpra-2.4.3.tar.xz 2434852 BLAKE2B 3d2dd4d8a64a20a88004a91f95d8e6165f45dac7a3d725f41c437d605f55bbd903284e7e829e02c1e94e33c3777ce660c55b469fb5b1f6c5025853b0cae1a6c3 SHA512 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54
 EBUILD xpra-2.2.2-r1.ebuild 4047 BLAKE2B 0188064f36f179c378a29c0eacb418177eac49ecbe9ea844cb7638ba1e8719b3b09dfa6d9afeaede8a82161b67051c152e9186994fadad421afbd3d6872cdeb7 SHA512 f075fca9a968d24c03136ccb90c059b7ba18ef84f9beb8916f65d5534c0ad804abffd648bf9549c4892a468b59d8277c2827e58b15664140497aa1617ea934c6
 EBUILD xpra-2.2.6-r2.ebuild 4095 BLAKE2B 0e1a4646024233f18422a27886d2da0816ddafccc625aa8a2aeea7aef9078e4e8c0abc4b680ecf1aff53f9bad88a2503709bf389fa43a53ff7b16c3c03708102 SHA512 ffa6e3a20e9f753cbe5f20af611b552f5eb605deda06d82b06642053b6fcffda1b806703763024e902be8007f8962773b39f9e9591ea1a9cb6e48592c2310f46
+EBUILD xpra-2.4.3.ebuild 4140 BLAKE2B 22d3d2f18393a099649df086406bac116c4c4df2a5cf796bb1fcaaad59ebd8add244123d46881a6c69f17e8ff09f8e8af6b5a3f06c82d8b62cb3a4ec0327881b SHA512 6e1ff086f04dc0c7bd061b8b2263384d8afc72d224c2ac924794b174298dc73ab43585143dcda7846ba1f4f8d6791f036a12f5f0d16c5008af34706d2c3fe26b
 MISC metadata.xml 1039 BLAKE2B 26cf74924d6c5e5a7c66d5fd08719f7be5c12f3c7cc51cdcf4fc63c302ba9ec655b972569245046fd92f69dbdd8715c1b9f31d8dd3875ede21c917ef4f1ab8c4 SHA512 09e49932a811b10b60a19401d556c1b7a677bd437b589b23c868d2e124f1a9bfc60e3aaa1a64666dc5c37a66785ef92aa8afa64121f45b7f138c9944188c4a5b
diff --git a/x11-wm/xpra/xpra-2.4.3.ebuild b/x11-wm/xpra/xpra-2.4.3.ebuild
new file mode 100644
index 000000000000..3bdbf24c78ec
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.4.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
+PYTHON_COMPAT=( python2_7 )
+inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
+SRC_URI="http://xpra.org/src/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	cups? ( dbus )
+	opengl? ( client )
+	|| ( client server )
+	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+		libav? ( media-video/libav:0=[x264,x265] )
+	)
+	enc_ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
+		libav? ( media-video/libav:0=[x264] )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
+		libav? ( media-video/libav:0=[x264] ) )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		dev-python/gst-python:1.0 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
+	pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+	)
+	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+		media-libs/opencv[python]
+		dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+python_prepare_all() {
+	hprefixify -w '/os.path/' setup.py
+	hprefixify tmpfiles.d/xpra.conf xpra/server/{server,socket}_util.py \
+		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+		-i setup.py || die
+
+	mydistutilsargs=(
+		--without-PIC
+		--without-Xdummy
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		--without-csc_libyuv
+		$(use_with cups printing)
+		--without-debug
+		$(use_with dbus)
+		$(use_with dec_avcodec2)
+		$(use_with enc_ffmpeg)
+		$(use_with enc_x264)
+		$(use_with enc_x265)
+		--with-gtk2
+		--without-gtk3
+		--without-html5
+		$(use_with jpeg jpeg_encoder)
+		$(use_with jpeg jpeg_decoder)
+		--without-mdns
+		--without-minify
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--with-x11
+	)
+
+	# see https://www.xpra.org/trac/ticket/1080
+	# and http://trac.cython.org/ticket/395
+	append-cflags -fno-strict-aliasing
+
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 86218ac6a477..f43abc3aee96 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 41e2da1a96ae..54558fa87215 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,11 +1,13 @@
 DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829979a98b573bdb6fd11b273cdc5e37f8e8c03556561b9f8730a70c7f7c34cbfbda76fe90f86cf2c443c3f426aabe SHA512 63287e35e71a6d1cb75a4d4db4d05f0fdf34d43b0ce7a2094e6aa9042d16f3eb60f7c5d755810bb0807112177e37954ba566b4f0ef701766205ed9e5561bd6e1
 DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd31f5434fb436a2772a9671673b4b124ac4363dd7c1267b0b51d42550735bbb733ada16f77a5b89176a353c84edbc SHA512 836d2d10347915b2e03be5501806e358af1c60786284c5e5afa11a6a79bc6a790966ea43bd9add6783fab91b08f06ae7852c21152f3aa0f29814325a16d65a7f
-DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
-DIST Thunar-1.8.1.tar.bz2 2289891 BLAKE2B 79ccb1408bcacba7ed50536f0a8e622d2e251fedf4b0ffef425f1e0926dbaa93ccef0fa751c8362cb420eef013f9f442de3fe58d411558dd7b9cb5751d2e89f4 SHA512 89aa29af5e272d58c7de02ba1c96d7f0c32eed49cda9621ef863dd679712cc653f58e729e49b9dc3d1626c9b8ebe2b18a2307e00c7ea1d1d2b42fa71272aced7
+DIST Thunar-1.6.16.tar.bz2 1977562 BLAKE2B efad6b45a64c5c80bff3d829207a1a0b45b4b48ab168c38bbcd263445a16dc230b0c5ea7515b65d686cbf256d294bcced19b248c252478a6a1cecb393d71a7f6 SHA512 6c7b8b88e01762e606bfd9e3848a98ae5825ff431f0686dd7bbcb987e448aa4c20d7cca3fb6b7c5d5dfde91ae6f8a16e674769d168f6f875e2efe519f4cdfd1b
 DIST Thunar-1.8.2.tar.bz2 2274521 BLAKE2B b5460a4bc5dd6547b8d620fd60a506899b4cfe6fdbadc46c9e7d259bed90ae5f98de2fa337762f8cbe5c7bdcb020ce3afd3d942763f0ea5aa84d1d9ceb47154f SHA512 c770fae8b6e5e0e42148ed2b9777afba5159783e5fc716eba1e0499b5390684f386eb575f1a608814bc118bbf05ede34c6737e28c06470c4d01717b579308ec9
+DIST Thunar-1.8.3.tar.bz2 2348196 BLAKE2B c89ad2a763b3aa6956e32777c7000fedbb8448704b11cfdb979e350a665b3ee3f43bc065af3fbd396c6810438ba5e49515204f40d68a2b2217fd4e18019140da SHA512 f584d4f8a474797bf422101c2eb21fe08e10c3ba0b842ac157b1016c49e164069181db9393c2c46c376e012bf0fd6ef693fd203175392368b5e30d5f44ee986f
+DIST Thunar-1.8.4.tar.bz2 2349249 BLAKE2B 4f1ac9c3177587b5ff2f3acd7220fb08921fc9db9711dd5925b65068db9bb14e7cf9d17834a96395c3fc27927030dbd2ba70d08c5b14d28e4aaf553493bce5f2 SHA512 886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec
 EBUILD thunar-1.6.14.ebuild 1970 BLAKE2B 83e3ce6a0c069817781c5f62d32cfe60c255aadce6686821e1bc42190089a57a05b86bb2d0aeac07a6877b97ae9aceaa2690628aa2bc620c810bde3289b5903d SHA512 5bdf24285de7371faf55ffae6a820c40af03a77aa5e4abdf2c1c359efb7bc8440ccec58075a70aade6689d1f2e63f7deb285635665882f93df4e347ae624f2b0
 EBUILD thunar-1.6.15.ebuild 1977 BLAKE2B 9776c8cf558e86c8945d2c6b7d3545a27fc3823703954370ed8eb3a6790ccdac2b1c5ef11ddb497b6ca166b602e0998a74b239be6a897b18ab094f39ebc29579 SHA512 db1fa4fbd51b6e6305026a669711b2e2854e0e077623a10fcf323f3746d64c87491146528714acfd9ab4a537100cb395ec6183227fe8fa92e091f06f07006397
-EBUILD thunar-1.7.2.ebuild 2004 BLAKE2B 8452b4a373125cf16c212c74af3b35a6d491d0f91a43e6120aa4aad685b2f702e69f74b9cd15d3c3de2e17e1b5aed90957ac5edff1ae8c2d805ffa4d455ad0b6 SHA512 0d18b2f25503c899e1ae9067350265e1a9e2f67a023b7855edacf821d81161e02589bdaa97f7169930218c159a5011ae42752321a82fadbe5753f10e7ecfcf35
-EBUILD thunar-1.8.1.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
+EBUILD thunar-1.6.16.ebuild 1976 BLAKE2B d612903d6ca877ebf8f845cb41a2095a5094e4b5d01010b0defaae9020678c3571a8b9825453cc59495d2d5a2272610b71d59477da90a0dfa648fca1b530ee26 SHA512 f85d298bd15bb7aeeecc3acd6dceb11672d2e489c9cd52a05f56a39852ecc45a670de2376181d046105356abe35f70bd2ca005e9ab74f8ebff2b1aa7e3e7853d
 EBUILD thunar-1.8.2.ebuild 2006 BLAKE2B 0b842d7d0bafeee107a849dfbc826dff698dcf9ca04f4f64f9b7fe6303ef16519f18be79c772288cdda44b14e288a2693fe842b3c392c873ac43e0e770563a90 SHA512 1f0e98c6e308f5fd982609e100f1383283f92a9f27dec8d3445ff9efbd1f269380b359f62e2662eccc7a658a4add1839c4e3f94abcf36d1b0c4f73e969fa3367
+EBUILD thunar-1.8.3.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
+EBUILD thunar-1.8.4.ebuild 2005 BLAKE2B ef10efa2bb1f33b302661ed8aae22d00eb0e9417adfde68d75804ae87bb607b3c0d8ef58c158cfb5cc52a60d7ed3d73dfc91119ff347d59285b6a399c4d4db46 SHA512 7a50c1fcea6fdf59c62d3a51ded1b1c5cf978b10cf306ee7111567541f7df254832346793374132201581383b7e7c006edf293d756575e773b4f72726cce682b
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.6.16.ebuild b/xfce-base/thunar/thunar-1.6.16.ebuild
new file mode 100644
index 000000000000..90a2f9ca2ebe
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.16.ebuild
@@ -0,0 +1,77 @@
+# 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-2.24:2=
+	>=xfce-base/exo-0.10:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10.1:=
+	>=xfce-base/xfconf-4.10:=
+	dbus? ( >=dev-libs/dbus-glib-0.100:= )
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	dbus? ( ${GVFS_DEPEND} )
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="trash-panel-plugin? ( dbus )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable dbus)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/thunar/thunar-1.7.2.ebuild b/xfce-base/thunar/thunar-1.7.2.ebuild
deleted file mode 100644
index 0246378c765b..000000000000
--- a/xfce-base/thunar/thunar-1.7.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils virtualx xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-COMMON_DEPEND=">=dev-lang/perl-5.6
-	>=dev-libs/glib-2.30:=
-	>=x11-libs/gdk-pixbuf-2.14:=
-	>=x11-libs/gtk+-3.22:3=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-1.8.1.ebuild b/xfce-base/thunar/thunar-1.8.1.ebuild
deleted file mode 100644
index dc5dc32391c8..000000000000
--- a/xfce-base/thunar/thunar-1.8.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils virtualx xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="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.3.ebuild b/xfce-base/thunar/thunar-1.8.3.ebuild
new file mode 100644
index 000000000000..9ce63186aa29
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.8.3.ebuild
@@ -0,0 +1,80 @@
+# 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.4.ebuild b/xfce-base/thunar/thunar-1.8.4.ebuild
new file mode 100644
index 000000000000..9ce63186aa29
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.8.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 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
+}